Rename User::nping to nextping for consistency with lastping.

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 97980112e7503113cabb532c7b0fc4aa51ed93c3..533c7e28150c942321e45676366cbdd95f208126 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -93,13 +93,14 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa
                                new_parameters[extra] = item;
                        }
 
-                       CmdResult result = handler->Handle(user, new_parameters);
+                       CommandBase::Params params(new_parameters, parameters.GetTags());
+                       CmdResult result = handler->Handle(user, params);
                        if (localuser)
                        {
-                               // Run the OnPostCommand hook with the last parameter (original line) being empty
-                               // to indicate that the command had more targets in its original form.
+                               // Run the OnPostCommand hook with the last parameter being true to indicate
+                               // that the event is being called in a loop.
                                item.clear();
-                               FOREACH_MOD(OnPostCommand, (handler, new_parameters, localuser, result));
+                               FOREACH_MOD(OnPostCommand, (handler, new_parameters, localuser, result, true));
                        }
                }
        }
@@ -152,33 +153,17 @@ CmdResult CommandParser::CallHandler(const std::string& commandname, const Comma
                        {
                                if (cmd)
                                        *cmd = n->second;
-                               return n->second->Handle(user, parameters);
+
+                               ClientProtocol::TagMap tags;
+                               return n->second->Handle(user, CommandBase::Params(parameters, tags));
                        }
                }
        }
        return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
+void CommandParser::ProcessCommand(LocalUser* user, std::string& command, CommandBase::Params& command_p)
 {
-       CommandBase::Params command_p;
-       irc::tokenstream tokens(cmd);
-       std::string command, token;
-       tokens.GetToken(command);
-
-       /* A client sent a nick prefix on their command (ick)
-        * rhapsody and some braindead bouncers do this --
-        * the rfc says they shouldnt but also says the ircd should
-        * discard it if they do.
-        */
-       if (command[0] == ':')
-               tokens.GetToken(command);
-
-       while (tokens.GetToken(token))
-               command_p.push_back(token);
-
-       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-
        /* find the command, check it exists */
        Command* handler = GetHandler(command);
 
@@ -261,7 +246,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                return;
 
        /* activity resets the ping pending timer */
-       user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+       user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
 
        if (handler->flags_needed)
        {
@@ -281,24 +266,6 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                }
        }
 
-       if ((user->registered == REG_ALL) && (!user->IsOper()) && (handler->IsDisabled()))
-       {
-               /* command is disabled! */
-               user->CommandFloodPenalty += failpenalty;
-               if (ServerInstance->Config->DisabledDontExist)
-               {
-                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command");
-               }
-               else
-               {
-                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "This command has been disabled.");
-               }
-
-               ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)",
-                               command.c_str(), user->nick.c_str(), user->ident.c_str(), user->GetRealHost().c_str());
-               return;
-       }
-
        if ((!command_p.empty()) && (command_p.back().empty()) && (!handler->allow_empty_last_param))
                command_p.pop_back();
 
@@ -331,7 +298,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                 */
                CmdResult result = handler->Handle(user, command_p);
 
-               FOREACH_MOD(OnPostCommand, (handler, command_p, user, result));
+               FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, false));
        }
 }
 
@@ -348,7 +315,6 @@ CommandBase::CommandBase(Module* mod, const std::string& cmd, unsigned int minpa
        , min_params(minpara)
        , max_params(maxpara)
        , use_count(0)
-       , disabled(false)
        , works_before_reg(false)
        , allow_empty_last_param(true)
        , Penalty(1)
@@ -385,13 +351,17 @@ void Command::RegisterService()
                throw ModuleException("Command already exists: " + name);
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
+void CommandParser::ProcessBuffer(LocalUser* user, const std::string& buffer)
 {
-       if (buffer.empty())
+       ClientProtocol::ParseOutput parseoutput;
+       if (!user->serializer->Parse(user, buffer, parseoutput))
                return;
 
-       ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I %s", user->uuid.c_str(), buffer.c_str());
-       ProcessCommand(user,buffer);
+       std::string& command = parseoutput.cmd;
+       std::transform(command.begin(), command.end(), command.begin(), ::toupper);
+
+       CommandBase::Params parameters(parseoutput.params, parseoutput.tags);
+       ProcessCommand(user, command, parameters);
 }
 
 bool CommandParser::AddCommand(Command *f)
@@ -409,7 +379,7 @@ CommandParser::CommandParser()
 {
 }
 
-std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final, CommandBase* custom_translator)
+std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const CommandBase::Params& source, bool prefix_final, CommandBase* custom_translator)
 {
        std::vector<TranslateType>::const_iterator types = to.begin();
        std::string dest;
@@ -463,7 +433,7 @@ void CommandParser::TranslateSingleParam(TranslateType to, const std::string& it
                        }
                        // If no custom translator was given, fall through
                }
-               case TR_TEXT:
+               /*@fallthrough@*/
                default:
                        /* Do nothing */
                        dest.append(item);