Merge pull request #495 from SaberUK/master+fix-libcpp

[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 9287589bb7f8823bb95b07bd082858806c4be718..f429f75b934f749d90818b7aac4b4f301deb0156 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -40,7 +40,7 @@ class CommandUninvite : public Command
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
 
-               if ((!c) || (!u))
+               if ((!c) || (!u) || (u->registered != REG_ALL))
                {
                        if (!c)
                        {
@@ -70,15 +70,13 @@ class CommandUninvite : public Command
                LocalUser* lu = IS_LOCAL(u);
                if (lu)
                {
-                       irc::string xname(c->name.c_str());
-                       if (!lu->IsInvited(xname))
+                       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());
                                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->RemoveInvite(xname);
                        lu->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
 
                        std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
@@ -104,11 +102,11 @@ class ModuleUninvite : public Module
 
        ModuleUninvite() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
        }
 
-       virtual ~ModuleUninvite()
+       void init()
        {
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual Version GetVersion()
@@ -118,4 +116,3 @@ class ModuleUninvite : public Module
 };
 
 MODULE_INIT(ModuleUninvite)
-