Green-Sky/solanaceae_ircclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use sr

Browse Source
This commit is contained in:
Green Sky 2024-10-24 14:56:26 +02:00
parent 7973c7a320
commit e4eaf91a68
No known key found for this signature in database
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/solanaceae/ircclient_contacts/ircclient_contact_model.cpp
View File

@ -19,19 +19,21 @@ IRCClientContactModel::IRCClientContactModel(
Contact3Registry& cr, Contact3Registry& cr,
ConfigModelI& conf, ConfigModelI& conf,
IRCClient1& ircc IRCClient1& ircc
) : _cr(cr), _conf(conf), _ircc(ircc) { ) : _cr(cr), _conf(conf), _ircc(ircc), _ircc_sr(_ircc.newSubRef(this)) {
_ircc.subscribe(this, IRCClient_Event::CONNECT); _ircc_sr
.subscribe(IRCClient_Event::CONNECT)
_ircc.subscribe(this, IRCClient_Event::NUMERIC); .subscribe(IRCClient_Event::NUMERIC)
_ircc.subscribe(this, IRCClient_Event::JOIN); .subscribe(IRCClient_Event::JOIN)
_ircc.subscribe(this, IRCClient_Event::PART); .subscribe(IRCClient_Event::PART)
_ircc.subscribe(this, IRCClient_Event::TOPIC); .subscribe(IRCClient_Event::TOPIC)
_ircc.subscribe(this, IRCClient_Event::QUIT); .subscribe(IRCClient_Event::QUIT)
_ircc.subscribe(this, IRCClient_Event::CTCP_REQ); .subscribe(IRCClient_Event::CTCP_REQ)
_ircc.subscribe(this, IRCClient_Event::DISCONNECT); .subscribe(IRCClient_Event::DISCONNECT)
;
// dont create server self etc until connect event comes // dont create server self etc until connect event comes

1
src/solanaceae/ircclient_contacts/ircclient_contact_model.hpp
View File

@ -16,6 +16,7 @@ class IRCClientContactModel : public IRCClientEventI, public ContactModel3I {
Contact3Registry& _cr; Contact3Registry& _cr;
ConfigModelI& _conf; ConfigModelI& _conf;
IRCClient1& _ircc; IRCClient1& _ircc;
IRCClient1::SubscriptionReference _ircc_sr;
// cm needs the connect event to happen // cm needs the connect event to happen
bool _connected {false}; bool _connected {false};

16
src/solanaceae/ircclient_messages/ircclient_message_manager.cpp
View File

@ -22,14 +22,16 @@ IRCClientMessageManager::IRCClientMessageManager(
ConfigModelI& conf, ConfigModelI& conf,
IRCClient1& ircc, IRCClient1& ircc,
IRCClientContactModel& ircccm IRCClientContactModel& ircccm
) : _rmm(rmm), _cr(cr), _conf(conf), _ircc(ircc), _ircccm(ircccm) { ) : _rmm(rmm), _rmm_sr(_rmm.newSubRef(this)), _cr(cr), _conf(conf), _ircc(ircc), _ircc_sr(_ircc.newSubRef(this)), _ircccm(ircccm) {
_ircc.subscribe(this, IRCClient_Event::CHANNEL); _ircc_sr
_ircc.subscribe(this, IRCClient_Event::PRIVMSG); .subscribe(IRCClient_Event::CHANNEL)
_ircc.subscribe(this, IRCClient_Event::NOTICE); .subscribe(IRCClient_Event::PRIVMSG)
_ircc.subscribe(this, IRCClient_Event::CHANNELNOTICE); .subscribe(IRCClient_Event::NOTICE)
_ircc.subscribe(this, IRCClient_Event::CTCP_ACTION); .subscribe(IRCClient_Event::CHANNELNOTICE)
.subscribe(IRCClient_Event::CTCP_ACTION)
;
_rmm.subscribe(this, RegistryMessageModel_Event::send_text); _rmm_sr.subscribe(RegistryMessageModel_Event::send_text);
} }
IRCClientMessageManager::~IRCClientMessageManager(void) { IRCClientMessageManager::~IRCClientMessageManager(void) {

2
src/solanaceae/ircclient_messages/ircclient_message_manager.hpp
View File

@ -7,9 +7,11 @@
class IRCClientMessageManager : public IRCClientEventI, public RegistryMessageModelEventI { class IRCClientMessageManager : public IRCClientEventI, public RegistryMessageModelEventI {
protected: protected:
RegistryMessageModelI& _rmm; RegistryMessageModelI& _rmm;
RegistryMessageModelI::SubscriptionReference _rmm_sr;
Contact3Registry& _cr; Contact3Registry& _cr;
ConfigModelI& _conf; ConfigModelI& _conf;
IRCClient1& _ircc; IRCClient1& _ircc;
IRCClient1::SubscriptionReference _ircc_sr;
IRCClientContactModel& _ircccm; IRCClientContactModel& _ircccm;
public: public: