Remove UserManager::GarbageCollect()

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

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 13533808a9cff871945a15446e2ad885d658e6bf..9614203c350c04a8f3d9f950c9a8085c4d3bb405 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -53,7 +53,8 @@ class ModuleBlockAmsg : public Module
        SimpleExtItem<BlockedMessage> blockamsg;
 
  public:
-       ModuleBlockAmsg() : blockamsg("blockamsg", this)
+       ModuleBlockAmsg()
+               : blockamsg("blockamsg", ExtensionItem::EXT_USER, this)
        {
        }
 
@@ -68,13 +69,13 @@ class ModuleBlockAmsg : public Module
                ForgetDelay = tag->getInt("delay", -1);
                std::string act = tag->getString("action");
 
-               if(act == "notice")
+               if (act == "notice")
                        action = IBLOCK_NOTICE;
-               else if(act == "noticeopers")
+               else if (act == "noticeopers")
                        action = IBLOCK_NOTICEOPERS;
-               else if(act == "silent")
+               else if (act == "silent")
                        action = IBLOCK_SILENT;
-               else if(act == "kill")
+               else if (act == "kill")
                        action = IBLOCK_KILL;
                else
                        action = IBLOCK_KILLOPERS;
@@ -94,18 +95,18 @@ class ModuleBlockAmsg : public Module
                        if (*parameters[0].c_str() == '#')
                                targets = 1;
 
-                       for(const char* c = parameters[0].c_str(); *c; c++)
-                               if((*c == ',') && *(c+1) && (*(c+1) == '#'))
+                       for (const char* c = parameters[0].c_str(); *c; c++)
+                       {
+                               if ((*c == ',') && (*(c+1) == '#'))
                                        targets++;
+                       }
 
                        /* targets should now contain the number of channel targets the msg/notice was pointed at.
                         * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
                         * We don't want to block PMs so...
                         */
-                       if(targets == 0)
-                       {
+                       if (targets == 0)
                                return MOD_RES_PASSTHRU;
-                       }
 
                        // Check that this message wasn't already sent within a few seconds.
                        BlockedMessage* m = blockamsg.get(user);
@@ -118,18 +119,18 @@ class ModuleBlockAmsg : public Module
                        if ((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
                        {
                                // Block it...
-                               if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
+                               if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
                                        ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
 
-                               if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
+                               if (action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
                                        ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
-                               else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-                                       user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str());
+                               else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
+                                       user->WriteNotice("Global message (/amsg or /ame) denied");
 
                                return MOD_RES_DENY;
                        }
 
-                       if(m)
+                       if (m)
                        {
                                // If there's already a BlockedMessage allocated, use it.
                                m->message = parameters[1];