Add support for blocking tag messages with the deaf mode.

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

diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp
index 8998ea8b1c8bc3792216319f452502a7bfc7b622..0d29657d5fdf2e2ac8fe9dd1af3f1ec9668332dd 100644 (file)
--- a/src/modules/m_modenotice.cpp
+++ b/src/modules/m_modenotice.cpp
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@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
@@ -24,14 +27,16 @@ class CommandModeNotice : public Command
  public:
        CommandModeNotice(Module* parent) : Command(parent,"MODENOTICE",2,2)
        {
-               syntax = "<modes> <message>";
+               syntax = "<modeletters> :<message>";
                flags_needed = 'o';
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User *src)
+       CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE
        {
+               std::string msg = "*** From " + src->nick + ": " + parameters[1];
                int mlen = parameters[0].length();
-               for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
                {
                        User* user = *i;
                        for (int n = 0; n < mlen; n++)
@@ -39,14 +44,13 @@ class CommandModeNotice : public Command
                                if (!user->IsModeSet(parameters[0][n]))
                                        goto next_user;
                        }
-                       user->Write(":%s NOTICE %s :*** From %s: %s", ServerInstance->Config->ServerName.c_str(),
-                               user->nick.c_str(), src->nick.c_str(), parameters[1].c_str());
+                       user->WriteNotice(msg);
 next_user:     ;
                }
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_BCAST;
        }
@@ -64,7 +68,7 @@ class ModuleModeNotice : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the /MODENOTICE command", VF_VENDOR);
+               return Version("Adds the /MODENOTICE command which sends a message to all users with the specified user modes set.", VF_VENDOR);
        }
 };