X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=730bf08234f4aba5c6e00d704355a1ab03ff08f9;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=b341b4c283f00c7e3713f9c8a54f57b816435860;hpb=8dba4b8122e228d6ba1ef1c475fc9500d06e1e56;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index b341b4c28..730bf0823 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -1,128 +1,106 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2004-2007 Craig Edwards * - * 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 . */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAPART command */ +#include "inspircd.h" /** Handle /SAPART */ -class cmd_sapart : public command_t +class CommandSapart : public Command { public: - cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2) + CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3) { - this->source = "m_sapart.so"; - syntax = " "; + flags_needed = 'o'; Penalty = 0; syntax = " [,] [reason]"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector& parameters, User *user) { - userrec* dest = ServerInstance->FindNick(parameters[0]); - chanrec* channel = ServerInstance->FindChan(parameters[1]); - if (dest && channel) + if (CommandParser::LoopCall(user, this, parameters, 1)) + return CMD_FAILURE; + + User* dest = ServerInstance->FindNick(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[1]); + std::string reason; + + if ((dest) && (dest->registered == REG_ALL) && (channel)) { - if (ServerInstance->ULine(dest->server)) + if (parameters.size() > 2) + reason = parameters[2]; + + if (dest->server->IsULine()) { - user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick); + user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client"); return CMD_FAILURE; } - if (!channel->PartUser(dest, dest->nick)) - delete channel; - chanrec* n = ServerInstance->FindChan(parameters[1]); - if (!n) + if (!channel->HasUser(dest)) { - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); - return CMD_SUCCESS; + user->WriteNotice("*** " + dest->nick + " is not on " + channel->name); + return CMD_FAILURE; } - else + + /* For local clients, directly part them generating a PART message. For remote clients, + * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users + * local server and that will generate the PART instead + */ + if (IS_LOCAL(dest)) { - if (!n->HasUser(dest)) - { - ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]); - return CMD_FAILURE; - } + channel->PartUser(dest, reason); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+channel->name); } return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick); + user->WriteNotice("*** Invalid nickname or channel"); } return CMD_FAILURE; } -}; - -class ModuleSapart : public Module -{ - cmd_sapart* mycommand; - public: - ModuleSapart(InspIRCd* Me) - : Module::Module(Me) - { - - mycommand = new cmd_sapart(ServerInstance); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleSapart() + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; } - - virtual Version GetVersion() - { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); - } - }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. -class ModuleSapartFactory : public ModuleFactory +class ModuleSapart : public Module { + CommandSapart cmd; public: - ModuleSapartFactory() + ModuleSapart() + : cmd(this) { } - - ~ModuleSapartFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSapart(Me); + return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSapartFactory; -} - +MODULE_INIT(ModuleSapart)