Move the <disabled> tag out of the core to a new module.

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index bcb876d5b41906c5ca20383517b807852cd210a7..db3345b98920f95f39bd21424c0b5f6ec3a55d48 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -26,16 +26,18 @@
  */
 class CommandSamode : public Command
 {
+       bool logged;
+
  public:
        bool active;
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+               flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}";
                active = false;
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (parameters[0].c_str()[0] != '#')
                {
@@ -55,24 +57,29 @@ class CommandSamode : public Command
                Modes::ChangeList emptychangelist;
                ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist);
 
+               logged = false;
                this->active = true;
-               CmdResult result = ServerInstance->Parser.CallHandler("MODE", parameters, user);
+               ServerInstance->Parser.CallHandler("MODE", parameters, user);
                this->active = false;
 
-               if (result == CMD_SUCCESS)
+               if (!logged)
                {
-                       // If lastparse is empty and the MODE command handler returned CMD_SUCCESS then
-                       // the client queried the list of a listmode (e.g. /SAMODE #chan b), which was
-                       // handled internally by the MODE command handler.
+                       // If we haven't logged anything yet then the client queried the list of a listmode
+                       // (e.g. /SAMODE #chan b), which was handled internally by the MODE command handler.
                        //
-                       // Viewing the modes of a user or a channel can also result in CMD_SUCCESS, but
+                       // Viewing the modes of a user or a channel could also result in this, but
                        // that is not possible with /SAMODE because we require at least 2 parameters.
-                       const std::string& lastparse = ServerInstance->Modes.GetLastParse();
-                       ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + (lastparse.empty() ? irc::stringjoiner(parameters) : lastparse));
+                       LogUsage(user, stdalgo::string::join(parameters));
                }
 
                return CMD_SUCCESS;
        }
+
+       void LogUsage(const User* user, const std::string& text)
+       {
+               logged = true;
+               ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + text);
+       }
 };
 
 class ModuleSaMode : public Module
@@ -96,8 +103,30 @@ class ModuleSaMode : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       void OnMode(User* user, User* destuser, Channel* destchan, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE
        {
+               if (!cmd.active)
+                       return;
+
+               std::string logtext = (destuser ? destuser->nick : destchan->name);
+               logtext.push_back(' ');
+               logtext += ClientProtocol::Messages::Mode::ToModeLetters(modes);
+
+               for (Modes::ChangeList::List::const_iterator i = modes.getlist().begin(); i != modes.getlist().end(); ++i)
+               {
+                       const Modes::Change& item = *i;
+                       if (!item.param.empty())
+                               logtext.append(1, ' ').append(item.param);
+               }
+
+               cmd.LogUsage(user, logtext);
+       }
+
+       void Prioritize() CXX11_OVERRIDE
+       {
+               Module* disabled = ServerInstance->Modules->Find("m_disabled.so");
+               ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disabled);
+
                Module *override = ServerInstance->Modules->Find("m_override.so");
                ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
        }