Move the <disabled> tag out of the core to a new module.

[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 d3a424dff003629c12e2e26a0bf47423b9d56fcc..ae1553a230e0a781147768e49303aa526996a34d 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -23,6 +23,12 @@
 #include "inspircd.h"
 #include "modules/invite.h"
 
+enum
+{
+       // InspIRCd-specific.
+       RPL_UNINVITED = 653
+};
+
 /** Handle /UNINVITE
  */
 class CommandUninvite : public Command
@@ -37,7 +43,7 @@ class CommandUninvite : public Command
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                User* u;
                if (IS_LOCAL(user))
@@ -51,7 +57,7 @@ class CommandUninvite : public Command
                {
                        if (!c)
                        {
-                               user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
+                               user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
                        }
                        else
                        {
@@ -93,7 +99,7 @@ class CommandUninvite : public Command
                        n.push(c->name).push(u->nick).push("Uninvited");
                        user->WriteRemoteNumeric(n);
 
-                       lu->WriteNumeric(493, InspIRCd::Format("You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str()));
+                       lu->WriteNumeric(RPL_UNINVITED, InspIRCd::Format("You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str()));
 
                        std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
                        c->WriteNotice(msg);
@@ -103,7 +109,7 @@ class CommandUninvite : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_UCAST(parameters[0]);
        }