Replace hardcoded mode letters, part 3

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

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 281c991e3a2b9c6a7d271fc5539ff717817b5cdb..3521bd89d1957c6398cd8cc6e8892da79d2ba775 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -1,19 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
+#include "inspircd.h"
 
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 /*     IBLOCK_NOTICE           - Send a notice to the user informing them of what happened.
@@ -27,7 +35,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
  */
 class BlockedMessage
 {
-public:
+ public:
        std::string message;
        irc::string target;
        time_t sent;
@@ -47,32 +55,26 @@ class ModuleBlockAmsg : public Module
  public:
        ModuleBlockAmsg() : blockamsg("blockamsg", this)
        {
-               this->OnRehash(NULL);
-               ServerInstance->Extensions.Register(&blockamsg);
-               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
-       virtual ~ModuleBlockAmsg()
+       void init() CXX11_OVERRIDE
        {
+               this->OnRehash(NULL);
+               ServerInstance->Modules->AddService(blockamsg);
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-
-               ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
-
-               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-                       ForgetDelay = -1;
-
-               std::string act = Conf.ReadValue("blockamsg", "action", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
+               ForgetDelay = tag->getInt("delay", -1);
+               std::string act = tag->getString("action");
 
                if(act == "notice")
                        action = IBLOCK_NOTICE;
@@ -86,17 +88,13 @@ class ModuleBlockAmsg : public Module
                        action = IBLOCK_KILLOPERS;
        }
 
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
        {
-               // Don't do anything with unregistered users, or remote ones.
-               if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
+               // Don't do anything with unregistered users
+               if (user->registered != REG_ALL)
                        return MOD_RES_PASSTHRU;
 
-               // We want case insensitive command comparison.
-               // Add std::string contructor for irc::string :x
-               irc::string cmd = command.c_str();
-
-               if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
+               if ((validated) && (parameters.size() >= 2) && ((command == "PRIVMSG") || (command == "NOTICE")))
                {
                        // parameters[0] should have the target(s) in it.
                        // I think it will be faster to first check if there are any commas, and if there are then try and parse it out.
@@ -165,5 +163,4 @@ class ModuleBlockAmsg : public Module
        }
 };
 
-
 MODULE_INIT(ModuleBlockAmsg)