Merge pull request #984 from Renegade334/modules-exempt-uline

[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..b1c04cdf55359fce13df2fce2236f9a166b9818f 100644 (file)
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -20,6 +20,26 @@
 #include "modules/account.h"
 #include "modules/cap.h"
 
+class WriteNeighboursWithExt : public User::ForEachNeighborHandler
+{
+       const LocalIntExt& ext;
+       const std::string& msg;
+
+       void Execute(LocalUser* user) CXX11_OVERRIDE
+       {
+               if (ext.get(user))
+                       user->Write(msg);
+       }
+
+ public:
+       WriteNeighboursWithExt(User* user, const std::string& message, const LocalIntExt& extension)
+               : ext(extension)
+               , msg(message)
+       {
+               user->ForEachNeighbor(*this, false);
+       }
+};
+
 class ModuleIRCv3 : public Module
 {
        GenericCap cap_accountnotify;
@@ -31,44 +51,6 @@ class ModuleIRCv3 : public Module
 
        CUList last_excepts;
 
-       void WriteNeighboursWithExt(User* user, const std::string& line, const LocalIntExt& ext)
-       {
-               UserChanList chans(user->chans);
-
-               std::map<User*, bool> exceptions;
-               FOREACH_MOD(I_OnBuildNeighborList, 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)
-               {
-                       LocalUser* u = IS_LOCAL(i->first);
-                       if ((u) && (i->second) && (ext.get(u)))
-                               u->Write(line);
-               }
-
-               // 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)
-               {
-                       const UserMembList* userlist = (*i)->GetUsers();
-                       for (UserMembList::const_iterator m = userlist->begin(); m != userlist->end(); ++m)
-                       {
-                               /*
-                                * Send the line if the channel member in question meets all of the following criteria:
-                                * - local
-                                * - not the user who is doing the action (i.e. whose channels we're iterating)
-                                * - has the given extension
-                                * - not on the except list built by modules
-                                * - we haven't sent the line to the member yet
-                                *
-                                */
-                               LocalUser* member = IS_LOCAL(m->first);
-                               if ((member) && (member != user) && (ext.get(member)) && (exceptions.find(member) == exceptions.end()) && (already_sent.insert(member).second))
-                                       member->Write(line);
-                       }
-               }
-       }
-
  public:
        ModuleIRCv3() : cap_accountnotify(this, "account-notify"),
                                        cap_awaynotify(this, "away-notify"),
@@ -76,17 +58,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);
        }
@@ -141,8 +116,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);
@@ -215,8 +190,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);