X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=d3a424dff003629c12e2e26a0bf47423b9d56fcc;hb=d23c030c9a8fd58807438245a004e4aa5b7288ba;hp=a1b483690469bc4c8cf4f00ba5f13e671b0f29f1;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index a1b483690..d3a424dff 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -1,136 +1,128 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 Craig Edwards + * Copyright (C) 2006 Robin Burchell * - * --------------------------------------------------- + * 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 . */ -using namespace std; - -/* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */ -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "configreader.h" #include "inspircd.h" +#include "modules/invite.h" - -extern InspIRCd* ServerInstance; - -class cmd_uninvite : public command_t +/** Handle /UNINVITE + */ +class CommandUninvite : public Command { + Invite::API invapi; public: - cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2) + CommandUninvite(Module* Creator) + : Command(Creator, "UNINVITE", 2) + , invapi(Creator) { - this->source = "m_uninvite.so"; syntax = " "; + TRANSLATE2(TR_NICK, TR_TEXT); } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - userrec* u = ServerInstance->FindNick(parameters[0]); - chanrec* c = ServerInstance->FindChan(parameters[1]); - - if ((!c) || (!u)) - { + 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->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]); + user->WriteNumeric(Numerics::NoSuchNick(parameters[1])); } else { - user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); } - - return; - } - if (c->modes[CM_INVITEONLY]) + return CMD_FAILURE; + } + + if (IS_LOCAL(user)) { - if (c->GetStatus(user) < STATUS_HOP) + if (c->GetPrefixValue(user) < HALFOP_VALUE) { - user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name); - return; + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator", c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-")); + return CMD_FAILURE; } } - irc::string xname(c->name); - - 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->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name); - return; - } - if (!c->HasUser(user)) - { - user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name); - return; - } + // XXX: The source of the numeric we send must be the server of the user doing the /UNINVITE, + // so they don't see where the target user is connected to + if (!invapi->Remove(lu, c)) + { + Numeric::Numeric n(505); + 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; + } - u->RemoveInvite(xname); - user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick); - u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick); - c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick); - } -}; + Numeric::Numeric n(494); + n.SetServer(user->server); + n.push(c->name).push(u->nick).push("Uninvited"); + user->WriteRemoteNumeric(n); -class ModuleUninvite : public Module -{ - cmd_uninvite *mycommand; + lu->WriteNumeric(493, InspIRCd::Format("You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str())); - public: + std::string msg = "*** " + user->nick + " uninvited " + u->nick + "."; + c->WriteNotice(msg); + ServerInstance->PI->SendChannelNotice(c, 0, msg); + } - ModuleUninvite(InspIRCd* Me) : Module::Module(Me) - { - - mycommand = new cmd_uninvite(ServerInstance); - ServerInstance->AddCommand(mycommand); + return CMD_SUCCESS; } - - virtual ~ModuleUninvite() - { - } - - virtual Version GetVersion() + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - /* Must be static, because we dont want to desync invite lists */ - return Version(1, 0, 0, 0, VF_VENDOR|VF_STATIC); + return ROUTE_OPT_UCAST(parameters[0]); } }; - -class ModuleUninviteFactory : public ModuleFactory +class ModuleUninvite : public Module { + CommandUninvite cmd; + public: - ModuleUninviteFactory() - { - } - - ~ModuleUninviteFactory() + + ModuleUninvite() : cmd(this) { } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleUninvite(Me); + return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleUninviteFactory; -} +MODULE_INIT(ModuleUninvite)