m_operjoin Remove duplicated code

[user/henk/code/inspircd.git] / src / modules / m_ircv3.cpp

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 7e8a1a8ffaa8f7ec0f4d729fdb98e2e7704d9b9e..5cb2ab6b131bc6f3f51e6ccb02a8311406848f58 100644 (file)
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -33,10 +33,10 @@ class ModuleIRCv3 : public Module
 
        void WriteNeighboursWithExt(User* user, const std::string& line, const LocalIntExt& ext)
        {
-               UserChanList chans(user->chans);
+               IncludeChanList chans(user->chans.begin(), user->chans.end());
 
                std::map<User*, bool> exceptions;
-               FOREACH_MOD(I_OnBuildNeighborList, OnBuildNeighborList(user, chans, exceptions));
+               FOREACH_MOD(OnBuildNeighborList, (user, chans, exceptions));
 
                // Send it to all local users who were explicitly marked as neighbours by modules and have the required ext
                for (std::map<User*, bool>::const_iterator i = exceptions.begin(); i != exceptions.end(); ++i)
@@ -48,9 +48,9 @@ class ModuleIRCv3 : public Module
 
                // Now consider sending it to all other users who has at least a common channel with the user
                std::set<User*> already_sent;
-               for (UCListIter i = chans.begin(); i != chans.end(); ++i)
+               for (IncludeChanList::const_iterator i = chans.begin(); i != chans.end(); ++i)
                {
-                       const UserMembList* userlist = (*i)->GetUsers();
+                       const UserMembList* userlist = (*i)->chan->GetUsers();
                        for (UserMembList::const_iterator m = userlist->begin(); m != userlist->end(); ++m)
                        {
                                /*
@@ -76,17 +76,10 @@ class ModuleIRCv3 : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnUserJoin, I_OnPostJoin, I_OnSetAway, I_OnEvent, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* conf = ServerInstance->Config->ConfValue("ircv3");
-               accountnotify = conf->getBool("accoutnotify", true);
+               accountnotify = conf->getBool("accountnotify", true);
                awaynotify = conf->getBool("awaynotify", true);
                extendedjoin = conf->getBool("extendedjoin", true);
        }