Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 9e3a035838ea1db03fd71978324ed64e548093a7..c3cd3a80d2641b552bdde681897af294bb110ff9 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -87,9 +87,9 @@ class ShunFactory : public XLineFactory
 class CommandShun : public Command
 {
  public:
-       CommandShun(InspIRCd* Me, Module* Creator) : Command(Me, Creator, "SHUN", "o", 1, 3)
+       CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3)
        {
-               this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
+               flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
        }
 
        CmdResult Handle(const std::vector<std::string>& parameters, User *user)
@@ -107,7 +107,7 @@ class CommandShun : public Command
                {
                        if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),target.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s",user->nick.c_str(),target.c_str());
                        }
                        else
                        {
@@ -149,13 +149,13 @@ class CommandShun : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s",
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s",
                                                        user->nick.c_str(), target.c_str(), expr.c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s",
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s",
                                                        user->nick.c_str(), target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str());
                                        }
 
@@ -171,6 +171,11 @@ class CommandShun : public Command
 
                return CMD_FAILURE;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleShun : public Module
@@ -182,7 +187,7 @@ class ModuleShun : public Module
        bool affectopers;
 
  public:
-       ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me, this), f(Me)
+       ModuleShun(InspIRCd* Me) : Module(Me), cmd(this), f(Me)
        {
                ServerInstance->XLines->RegisterFactory(&f);
                ServerInstance->AddCommand(&cmd);
@@ -198,13 +203,13 @@ class ModuleShun : public Module
                ServerInstance->XLines->UnregisterFactory(&f);
        }
 
-       virtual int OnStats(char symbol, User* user, string_list& out)
+       virtual ModResult OnStats(char symbol, User* user, string_list& out)
        {
                if (symbol != 'S')
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
-               return 1;
+               return MOD_RES_DENY;
        }
 
        virtual void OnRehash(User* user)
@@ -246,21 +251,21 @@ class ModuleShun : public Module
                }
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
        {
                if (validated)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (!ServerInstance->XLines->MatchesLine("SHUN", user))
                {
                        /* Not shunned, don't touch. */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                if (!affectopers && IS_OPER(user))
                {
                        /* Don't do anything if the user is an operator and affectopers isn't set */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
                std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
@@ -269,7 +274,7 @@ class ModuleShun : public Module
                {
                        if (NotifyOfShun)
                                user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
-                       return 1;
+                       return MOD_RES_DENY;
                }
 
                if (command == "QUIT")
@@ -284,7 +289,7 @@ class ModuleShun : public Module
                }
 
                /* if we're here, allow the command. */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()