Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 becb02603ce1e47c2c0b156ea1eed243a36938cb..ff392edc31efb35c9ef6870192a836f390c38b3d 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   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>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
 
 #include "inspircd.h"
@@ -20,19 +29,23 @@
 class CommandUninvite : public Command
 {
  public:
-       CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
+       CommandUninvite(Module* Creator) : Command(Creator,"UNINVITE", 2)
        {
-               this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
        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))
+               if ((!c) || (!u) || (u->registered != REG_ALL))
                {
                        if (!c)
                        {
@@ -48,47 +61,59 @@ class CommandUninvite : public Command
 
                if (IS_LOCAL(user))
                {
-                       if (c->GetStatus(user) < STATUS_HOP)
+                       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->GetStatus(u) == STATUS_HOP ? "" : "half-");
+                               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-");
                                return CMD_FAILURE;
                        }
                }
 
-               irc::string xname(c->name.c_str());
-
-               if (!u->IsInvited(xname))
+               /* Servers remember invites only for their local users, so act
+                * only if the target is local. Otherwise the command will be
+                * passed to the target users server.
+                */
+               LocalUser* lu = IS_LOCAL(u);
+               if (lu)
                {
-                       user->WriteNumeric(491, "%s %s %s :Is not invited to channel %s", user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
-                       return CMD_FAILURE;
-               }
-               if (!c->HasUser(user))
-               {
-                       user->WriteNumeric(492, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
-                       return CMD_FAILURE;
-               }
+                       irc::string xname(c->name.c_str());
+                       if (!lu->IsInvited(xname))
+                       {
+                               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());
 
-               u->RemoveInvite(xname);
-               user->WriteNumeric(494, "%s %s %s :Uninvited", user->nick.c_str(), c->name.c_str(), u->nick.c_str());
-               u->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
-               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name.c_str(), user->nick.c_str(), u->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);
+               }
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               User* u = ServerInstance->FindNick(parameters[0]);
+               return u ? ROUTE_OPT_UCAST(u->server) : ROUTE_LOCALONLY;
+       }
 };
 
 class ModuleUninvite : public Module
 {
-       CommandUninvite *mycommand;
+       CommandUninvite cmd;
 
  public:
 
-       ModuleUninvite(InspIRCd* Me) : Module(Me)
+       ModuleUninvite() : cmd(this)
        {
+       }
 
-               mycommand = new CommandUninvite(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleUninvite()
@@ -97,7 +122,7 @@ class ModuleUninvite : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);
        }
 };