Make User:: nick/ident/dhost/fullname and some other things std::string instead of...

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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 014bee2762d9eb13610e4bbb875b81ffcebe89ba..ac986b1ec82542bf271c7f68ab869d5dbb5c66cc 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -27,7 +27,7 @@ class CommandSaquit : public Command
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
@@ -38,20 +38,18 @@ class CommandSaquit : public Command
                                return CMD_FAILURE;
                        }
                        
-                       irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
-                       std::string line = reason_join.GetJoined();
-                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]);
                        
                        // Pass the command on, so the client's server can quit it properly.
                        if (!IS_LOCAL(dest))
                                return CMD_SUCCESS;
                        
-                       User::QuitUser(ServerInstance, dest, line);
-                       return CMD_SUCCESS;
+                       ServerInstance->Users->QuitUser(dest, parameters[1]);
+                       return CMD_LOCALONLY;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0].c_str());
                }
 
                return CMD_FAILURE;
@@ -77,7 +75,7 @@ class ModuleSaquit : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };