Add support for blocking tag messages with the deaf mode.

[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 394cea722011205736235c6dcef676970a5674d3..1344c7c2740a74db3b4822a936a67894f4b2be82 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -26,16 +30,19 @@
  */
 class CommandSamode : public Command
 {
+       bool logged;
+
  public:
        bool active;
        CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2)
        {
                allow_empty_last_param = false;
-               flags_needed = 'o'; 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] != '#')
                {
@@ -47,32 +54,40 @@ class CommandSamode : public Command
                        }
 
                        // Changing the modes of another user requires a special permission
-                       if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes", true)))
+                       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;
-               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
@@ -86,7 +101,7 @@ class ModuleSaMode : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
+               return Version("Adds the /SAMODE command which allows server operators to change the modes of a target (channel, user) that they would not otherwise have the privileges to change.", VF_VENDOR);
        }
 
        ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
@@ -96,8 +111,30 @@ class ModuleSaMode : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       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);
        }