Fix the cloaking module on C++98 compilers.

[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 d3045eadca806bbe4ef6fb396606382423d717df..d6b42c242c261b55ad10ed5370a0103ef0c7b687 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -23,6 +27,14 @@
 #include "inspircd.h"
 #include "modules/invite.h"
 
+enum
+{
+       // InspIRCd-specific.
+       ERR_INVITEREMOVED = 494,
+       ERR_NOTINVITED = 505,
+       RPL_UNINVITED = 653
+};
+
 /** Handle /UNINVITE
  */
 class CommandUninvite : public Command
@@ -37,7 +49,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 +63,7 @@ class CommandUninvite : public Command
                {
                        if (!c)
                        {
-                               user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
+                               user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
                        }
                        else
                        {
@@ -81,32 +93,28 @@ class CommandUninvite : public Command
                        // so they don't see where the target user is connected to
                        if (!invapi->Remove(lu, c))
                        {
-                               Numeric::Numeric n(505);
+                               Numeric::Numeric n(ERR_NOTINVITED);
                                n.SetServer(user->server);
                                n.push(u->nick).push(c->name).push(InspIRCd::Format("Is not invited to channel %s", c->name.c_str()));
                                user->WriteRemoteNumeric(n);
                                return CMD_FAILURE;
                        }
 
-                       Numeric::Numeric n(494);
+                       Numeric::Numeric n(ERR_INVITEREMOVED);
                        n.SetServer(user->server);
                        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()));
-
-                       std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE " + c->name + " :" + msg);
-                       ServerInstance->PI->SendChannelNotice(c, 0, msg);
+                       lu->WriteNumeric(RPL_UNINVITED, InspIRCd::Format("You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str()));
+                       c->WriteRemoteNotice(InspIRCd::Format("*** %s uninvited %s.", user->nick.c_str(), u->nick.c_str()));
                }
 
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               User* u = ServerInstance->FindNick(parameters[0]);
-               return u ? ROUTE_OPT_UCAST(u->server) : ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };
 
@@ -122,7 +130,7 @@ class ModuleUninvite : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);
+               return Version("Adds the /UNINVITE command which allows users who have invited another user to a channel to withdraw their invite.", VF_VENDOR | VF_OPTCOMMON);
        }
 };