m_messageflood Ask to be the last to handle OnUserPreMessage/OnUserPreNotice

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

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 663a43f2fec560958eb6dea3180b0136ecc0894f..90e814a187d2af00c5e42e341fe16d6768593a6b 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -65,7 +65,7 @@ class CommandTban : public Command
                }
                if (!ServerInstance->IsValidMask(parameters[2]))
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
+                       user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
                        return CMD_FAILURE;
                }
                TimedBan T;
@@ -74,7 +74,7 @@ class CommandTban : public Command
                unsigned long expire = duration + ServerInstance->Time();
                if (duration < 1)
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
+                       user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
                        return CMD_FAILURE;
                }
                std::string mask = parameters[2];
@@ -82,9 +82,9 @@ class CommandTban : public Command
                setban.push_back(parameters[0]);
                setban.push_back("+b");
                setban.push_back(parameters[2]);
-               // use CallCommandHandler to make it so that the user sets the mode
+               // use CallHandler to make it so that the user sets the mode
                // themselves
-               ServerInstance->CallCommandHandler("MODE",setban,user);
+               ServerInstance->Parser->CallHandler("MODE",setban,user);
                for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
                        if (!strcasecmp(i->data.c_str(), mask.c_str()))
                                goto found;
@@ -112,15 +112,13 @@ class ModuleTimedBans : public Module
        ModuleTimedBans()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               TimedBanList.clear();
-               Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleTimedBans()
+       void init()
        {
-               TimedBanList.clear();
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ModResult OnDelBan(User* source, Channel* chan, const std::string &banmask)