Merge branch 'master+listmode'

[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 59a69f6691ede180a2a43afa50e1ec8056618714..4eb54d2a6f7af6413999b3968868ff23740a6d0a 100644 (file)
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -33,7 +33,7 @@ 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(OnBuildNeighborList, (user, chans, exceptions));
@@ -48,10 +48,10 @@ 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();
-                       for (UserMembList::const_iterator m = userlist->begin(); m != userlist->end(); ++m)
+                       const Channel::MemberMap& userlist = (*i)->chan->GetUsers();
+                       for (Channel::MemberMap::const_iterator m = userlist.begin(); m != userlist.end(); ++m)
                        {
                                /*
                                 * Send the line if the channel member in question meets all of the following criteria:
@@ -76,15 +76,10 @@ class ModuleIRCv3 : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-       }
-
-       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);
        }
@@ -139,8 +134,8 @@ class ModuleIRCv3 : public Module
                std::string line;
                std::string mode;
 
-               const UserMembList* userlist = memb->chan->GetUsers();
-               for (UserMembCIter it = userlist->begin(); it != userlist->end(); ++it)
+               const Channel::MemberMap& userlist = memb->chan->GetUsers();
+               for (Channel::MemberMap::const_iterator it = userlist.begin(); it != userlist.end(); ++it)
                {
                        // Send the extended join line if the current member is local, has the extended-join cap and isn't excepted
                        User* member = IS_LOCAL(it->first);
@@ -213,8 +208,8 @@ class ModuleIRCv3 : public Module
 
                std::string line = ":" + memb->user->GetFullHost() + " AWAY :" + memb->user->awaymsg;
 
-               const UserMembList* userlist = memb->chan->GetUsers();
-               for (UserMembCIter it = userlist->begin(); it != userlist->end(); ++it)
+               const Channel::MemberMap& userlist = memb->chan->GetUsers();
+               for (Channel::MemberMap::const_iterator it = userlist.begin(); it != userlist.end(); ++it)
                {
                        // Send the away notify line if the current member is local, has the away-notify cap and isn't excepted
                        User* member = IS_LOCAL(it->first);