Add support for blocking tag messages with the deaf mode.

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

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index 7d1f68cb60fc0419397594f1612e2793484bb2b6..e07548c09983a8d1ca1d458a5b954d4819596971 100644 (file)
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 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
@@ -19,49 +23,43 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the ability to abbreviate commands a-la BBC BASIC keywords. */
+enum
+{
+       // InspIRCd-specific.
+       ERR_AMBIGUOUSCOMMAND = 420
+};
 
 class ModuleAbbreviation : public Module
 {
  public:
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->Attach(I_OnPreCommand, this);
-       }
-
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR);
+               return Version("Allows commands to be abbreviated by appending a full stop.", VF_VENDOR);
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* Command is already validated, has a length of 0, or last character is not a . */
                if (validated || command.empty() || *command.rbegin() != '.')
                        return MOD_RES_PASSTHRU;
 
-               /* Whack the . off the end */
-               command.erase(command.end() - 1);
-
                /* Look for any command that starts with the same characters, if it does, replace the command string with it */
-               size_t clen = command.length();
+               size_t clen = command.length() - 1;
                std::string foundcommand, matchlist;
                bool foundmatch = false;
-               for (Commandtable::iterator n = ServerInstance->Parser->cmdlist.begin(); n != ServerInstance->Parser->cmdlist.end(); ++n)
+               const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
+               for (CommandParser::CommandMap::const_iterator n = commands.begin(); n != commands.end(); ++n)
                {
-                       if (n->first.length() < clen)
-                               continue;
-
-                       if (command == n->first.substr(0, clen))
+                       if (!command.compare(0, clen, n->first, 0, clen))
                        {
                                if (matchlist.length() > 450)
                                {
-                                       user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
+                                       user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, "Ambiguous abbreviation and too many possible matches.");
                                        return MOD_RES_DENY;
                                }
 
@@ -79,16 +77,11 @@ class ModuleAbbreviation : public Module
                /* Ambiguous command, list the matches */
                if (!matchlist.empty())
                {
-                       user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
+                       user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, InspIRCd::Format("Ambiguous abbreviation, possible matches: %s%s", foundcommand.c_str(), matchlist.c_str()));
                        return MOD_RES_DENY;
                }
 
-               if (foundcommand.empty())
-               {
-                       /* No match, we have to put the . back again so that the invalid command numeric looks correct. */
-                       command += '.';
-               }
-               else
+               if (!foundcommand.empty())
                {
                        command = foundcommand;
                }