m_mlock Remove unnecessary iteration

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 44fe5f9e6983442ae8d140f052b47434bc44818e..f24c38b653acbfa074eee188a393497e84dd25e8 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -22,7 +22,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
+/* $ModDesc: Implementation of callerid, usermode +g, /accept */
 
 class callerid_data
 {
@@ -54,11 +54,8 @@ class callerid_data
                        }
 
                        User *u = ServerInstance->FindNick(tok);
-                       if (!u)
-                       {
-                               continue;
-                       }
-                       accepting.insert(u);
+                       if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u)))
+                               accepting.insert(u);
                }
        }
 
@@ -165,18 +162,12 @@ public:
                                tok.erase(0, 1); // Remove the dash.
                        }
                        User* u = ServerInstance->FindNick(tok);
-                       if (u)
-                       {
-                               if (dash)
-                                       out.append("-");
-                               out.append(u->uuid);
-                       }
-                       else
-                       {
-                               if (dash)
-                                       out.append("-");
-                               out.append(tok);
-                       }
+                       if ((!u) || (u->registered != REG_ALL) || (u->quitting) || (IS_SERVER(u)))
+                               continue;
+
+                       if (dash)
+                               out.append("-");
+                       out.append(u->uuid);
                }
                parameter = out;
        }
@@ -205,15 +196,15 @@ public:
                {
                        User* whotoremove = ServerInstance->FindNick(tok.substr(1));
                        if (whotoremove)
-                               return (RemoveAccept(user, whotoremove, false) ? CMD_SUCCESS : CMD_FAILURE);
+                               return (RemoveAccept(user, whotoremove) ? CMD_SUCCESS : CMD_FAILURE);
                        else
                                return CMD_FAILURE;
                }
                else
                {
                        User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok);
-                       if (whotoadd)
-                               return (AddAccept(user, whotoadd, false) ? CMD_SUCCESS : CMD_FAILURE);
+                       if ((whotoadd) && (whotoadd->registered == REG_ALL) && (!whotoadd->quitting) && (!IS_SERVER(whotoadd)))
+                               return (AddAccept(user, whotoadd) ? CMD_SUCCESS : CMD_FAILURE);
                        else
                        {
                                user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), tok.c_str());
@@ -238,22 +229,18 @@ public:
                user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick.c_str());
        }
 
-       bool AddAccept(User* user, User* whotoadd, bool quiet)
+       bool AddAccept(User* user, User* whotoadd)
        {
                // Add this user to my accept list first, so look me up..
                callerid_data* dat = extInfo.get(user, true);
                if (dat->accepting.size() >= maxaccepts)
                {
-                       if (!quiet)
-                               user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick.c_str(), maxaccepts);
-
+                       user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick.c_str(), maxaccepts);
                        return false;
                }
                if (!dat->accepting.insert(whotoadd).second)
                {
-                       if (!quiet)
-                               user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick.c_str(), whotoadd->nick.c_str());
-
+                       user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick.c_str(), whotoadd->nick.c_str());
                        return false;
                }
 
@@ -265,23 +252,19 @@ public:
                return true;
        }
 
-       bool RemoveAccept(User* user, User* whotoremove, bool quiet)
+       bool RemoveAccept(User* user, User* whotoremove)
        {
                // Remove them from my list, so look up my list..
                callerid_data* dat = extInfo.get(user, false);
                if (!dat)
                {
-                       if (!quiet)
-                               user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
-
+                       user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
                        return false;
                }
                std::set<User*>::iterator i = dat->accepting.find(whotoremove);
                if (i == dat->accepting.end())
                {
-                       if (!quiet)
-                               user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
-
+                       user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
                        return false;
                }
 
@@ -354,7 +337,7 @@ public:
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.extInfo);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 6);
        }
 
@@ -364,7 +347,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR);
+               return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
        }
 
        virtual void On005Numeric(std::string& output)
@@ -372,7 +355,7 @@ public:
                output += " CALLERID=g";
        }
 
-       ModResult PreText(User* user, User* dest, std::string& text, bool notice)
+       ModResult PreText(User* user, User* dest, std::string& text)
        {
                if (!dest->IsModeSet('g'))
                        return MOD_RES_PASSTHRU;
@@ -403,7 +386,7 @@ public:
        virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list)
        {
                if (IS_LOCAL(user) && target_type == TYPE_USER)
-                       return PreText(user, (User*)dest, text, true);
+                       return PreText(user, (User*)dest, text);
 
                return MOD_RES_PASSTHRU;
        }
@@ -411,16 +394,15 @@ public:
        virtual ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list)
        {
                if (IS_LOCAL(user) && target_type == TYPE_USER)
-                       return PreText(user, (User*)dest, text, true);
+                       return PreText(user, (User*)dest, text);
 
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreNick(User* user, const std::string& newnick)
+       void OnUserPostNick(User* user, const std::string& oldnick)
        {
                if (!tracknick)
                        RemoveFromAllAccepts(user);
-               return MOD_RES_PASSTHRU;
        }
 
        void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)