Some more text fixes and improvements (#1618).

[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 d9c75adf79d394520f8501acff5582ce400a723c..b1642e47085b9ce4b3a61b096ce9a37460a7b556 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,31 +20,69 @@
  */
 
 
-/* $ModDesc: Provides command SAMODE to allow opers to change modes on channels and users */
-
 #include "inspircd.h"
 
 /** Handle /SAMODE
  */
 class CommandSamode : public Command
 {
+       bool logged;
+
  public:
        bool active;
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
-               flags_needed = 'o'; Penalty = 0; syntax = "<target> <modes> {<mode-parameters>}";
+               allow_empty_last_param = false;
+               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] != '#')
+               {
+                       User* target = ServerInstance->FindNickOnly(parameters[0]);
+                       if ((!target) || (target->registered != REG_ALL))
+                       {
+                               user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+                               return CMD_FAILURE;
+                       }
+
+                       // Changing the modes of another user requires a special permission
+                       if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes")))
+                       {
+                               user->WriteNotice("*** You are not allowed to /SAMODE other users (the privilege users/samode-usermodes is needed to /SAMODE others).");
+                               return CMD_FAILURE;
+                       }
+               }
+
+               // XXX: Make ModeParser clear LastParse
+               Modes::ChangeList emptychangelist;
+               ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist);
+
+               logged = false;
                this->active = true;
-               ServerInstance->Parser->CallHandler("MODE", parameters, user);
-               if (ServerInstance->Modes->GetLastParse().length())
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
+               ServerInstance->Parser.CallHandler("MODE", parameters, user);
                this->active = false;
+
+               if (!logged)
+               {
+                       // 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 could also result in this, but
+                       // that is not possible with /SAMODE because we require at least 2 parameters.
+                       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
@@ -54,30 +92,46 @@ class ModuleSaMode : public Module
        ModuleSaMode()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Modules->Attach(I_OnPreMode, this);
        }
 
-       ~ModuleSaMode()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Provides the SAMODE command, allows opers to change modes on channels and users", VF_VENDOR);
        }
 
-       Version GetVersion()
-       {
-               return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
-       }
-
-       ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+       ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
        {
                if (cmd.active)
                        return MOD_RES_ALLOW;
                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* disable = ServerInstance->Modules->Find("m_disable.so");
+               ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
+
                Module *override = ServerInstance->Modules->Find("m_override.so");
-               ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, &override);
+               ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
        }
 };