Merge pull request #1093 from SaberUK/master+tsc

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

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 3ee23c95a7fa17a0194b8209a50bf654c6eb1de5..97ad841f12e37e09f4c2ae6619f5adb5387ed527 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -35,18 +35,23 @@ class CommandUninvite : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               User* u = ServerInstance->FindNick(parameters[0]);
+               User* u;
+               if (IS_LOCAL(user))
+                       u = ServerInstance->FindNickOnly(parameters[0]);
+               else
+                       u = ServerInstance->FindNick(parameters[0]);
+
                Channel* c = ServerInstance->FindChan(parameters[1]);
 
                if ((!c) || (!u) || (u->registered != REG_ALL))
                {
                        if (!c)
                        {
-                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
+                               user->WriteNumeric(401, "%s :No such nick/channel", parameters[1].c_str());
                        }
                        else
                        {
-                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
+                               user->WriteNumeric(401, "%s :No such nick/channel", parameters[0].c_str());
                        }
 
                        return CMD_FAILURE;
@@ -56,7 +61,7 @@ class CommandUninvite : public Command
                {
                        if (c->GetPrefixValue(user) < HALFOP_VALUE)
                        {
-                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-");
+                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator", c->name.c_str(), c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-");
                                return CMD_FAILURE;
                        }
                }
@@ -70,12 +75,12 @@ class CommandUninvite : public Command
                {
                        if (!lu->RemoveInvite(c))
                        {
-                               user->SendText(":%s 505 %s %s %s :Is not invited to channel %s", user->server.c_str(), user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
+                               user->SendText(":%s 505 %s %s %s :Is not invited to channel %s", user->server->GetName().c_str(), user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
                                return CMD_FAILURE;
                        }
 
-                       user->SendText(":%s 494 %s %s %s :Uninvited", user->server.c_str(), user->nick.c_str(), c->name.c_str(), u->nick.c_str());
-                       lu->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
+                       user->SendText(":%s 494 %s %s %s :Uninvited", user->server->GetName().c_str(), user->nick.c_str(), c->name.c_str(), u->nick.c_str());
+                       lu->WriteNumeric(493, ":You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str());
 
                        std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
                        c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE " + c->name + " :" + msg);
@@ -102,11 +107,6 @@ class ModuleUninvite : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);