Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f8c88a9f06c677995671d7d5455fd5adcb374342..f4d8f377c57827729814e8739d8636900db427d2 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -1,13 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005-2008, 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
@@ -39,7 +39,7 @@ bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::s
                return false;
 
        /* We dont handle any hash types except for plaintext - Thanks tra26 */
-       if (!hashtype.empty() && hashtype != "plaintext")
+       if (!hashtype.empty() && !stdalgo::string::equalsci(hashtype, "plaintext"))
                return false;
 
        return TimingSafeCompare(data, input);
@@ -231,7 +231,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
                // Iterator to the first excess parameter
                const CommandBase::Params::iterator firstexcess = lastkeep + 1;
 
-               // Append all excess parameter(s) to the last parameter, seperated by spaces
+               // Append all excess parameter(s) to the last parameter, separated by spaces
                for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i)
                {
                        lastkeep->push_back(' ');
@@ -243,7 +243,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        }
 
        /*
-        * We call OnPreCommand here seperately if the command exists, so the magic above can
+        * We call OnPreCommand here separately if the command exists, so the magic above can
         * truncate to max_params if necessary. -- w00t
         */
        ModResult MOD_RESULT;
@@ -283,9 +283,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if (command_p.size() < handler->min_params)
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
-               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-                       user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax);
+               handler->TellNotEnoughParameters(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
                return;
        }
@@ -293,7 +291,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if ((user->registered != REG_ALL) && (!handler->works_before_reg))
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered");
+               handler->TellNotRegistered(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
        }
        else
@@ -325,48 +323,6 @@ void CommandParser::RemoveCommand(Command* x)
                cmdlist.erase(n);
 }
 
-CommandBase::CommandBase(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
-       : ServiceProvider(mod, cmd, SERVICE_COMMAND)
-       , min_params(minpara)
-       , max_params(maxpara)
-       , allow_empty_last_param(true)
-{
-}
-
-CommandBase::~CommandBase()
-{
-}
-
-void CommandBase::EncodeParameter(std::string& parameter, unsigned int index)
-{
-}
-
-RouteDescriptor CommandBase::GetRouting(User* user, const Params& parameters)
-{
-       return ROUTE_LOCALONLY;
-}
-
-Command::Command(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
-       : CommandBase(mod, cmd, minpara, maxpara)
-       , flags_needed(0)
-       , force_manual_route(false)
-       , Penalty(1)
-       , use_count(0)
-       , works_before_reg(false)
-{
-}
-
-Command::~Command()
-{
-       ServerInstance->Parser.RemoveCommand(this);
-}
-
-void Command::RegisterService()
-{
-       if (!ServerInstance->Parser.AddCommand(this))
-               throw ModuleException("Command already exists: " + name);
-}
-
 void CommandParser::ProcessBuffer(LocalUser* user, const std::string& buffer)
 {
        ClientProtocol::ParseOutput parseoutput;