Make all User::IsModeSet() methods const, accept const ModeHandler

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 514394a572e2ec3a0f2cd5ad37b53ef4ab03d659..f3511b05b0c7c36aa4c0f41ffea961e7056b54a2 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -60,7 +60,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std
         *
         * Only check for duplicates if there is one list (allow them in JOIN).
         */
-       insp::flat_set<irc::string> dupes;
+       insp::flat_set<std::string, irc::insensitive_swo> dupes;
        bool check_dupes = (extra < 0);
 
        /* Create two sepstreams, if we have only one list, then initialize the second sepstream with
@@ -80,7 +80,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std
         */
        while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
        {
-               if ((!check_dupes) || (dupes.insert(item.c_str()).second))
+               if ((!check_dupes) || (dupes.insert(item).second))
                {
                        std::vector<std::string> new_parameters(parameters);
                        new_parameters[splithere] = item;
@@ -390,8 +390,7 @@ void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
        if (buffer.empty())
                return;
 
-       ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
-               user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
+       ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I %s", user->uuid.c_str(), buffer.c_str());
        ProcessCommand(user,buffer);
 }