X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=46732b6a67bf36a0f34da7a88def06495c44d62b;hb=9c5629085ae4914f9db514ca6fbd94e8d58c6f31;hp=8851a54efbcbec2fe247d2aa307966d050d7eec9;hpb=23a4885701cba4a87a5ae027257fb4207c917572;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 8851a54ef..46732b6a6 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -1,112 +1,125 @@ -/* +------------------------------------+ - * | 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) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2004-2005, 2007 Craig Edwards * - * --------------------------------------------------- + * 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; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" #include "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAJOIN command */ +/* $ModDesc: Provides command SAJOIN to allow opers to force-join users to channels */ -static Server *Srv; -extern InspIRCd* ServerInstance; - -class cmd_sajoin : public command_t +/** Handle /SAJOIN + */ +class CommandSajoin : public Command { public: - cmd_sajoin() : command_t("SAJOIN", 'o', 2) + CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2) { - this->source = "m_sajoin.so"; - syntax = " "; + flags_needed = 'o'; Penalty = 0; syntax = " "; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector& parameters, User *user) { - userrec* dest = ServerInstance->FindNick(parameters[0]); + User* dest = ServerInstance->FindNick(parameters[0]); if (dest) { - if (Srv->IsUlined(dest->server)) + if (ServerInstance->ULine(dest->server)) { - user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick); - return; + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str()); + return CMD_FAILURE; } - if (!ServerInstance->IsChannel(parameters[1])) + if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax)) { /* we didn't need to check this for each character ;) */ - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); - return; + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long"); + return CMD_FAILURE; } - ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); - chanrec::JoinUser(ServerInstance, dest, parameters[1], true); + /* For local users, we send the JoinUser which may create a channel and set its TS. + * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be + * and then that server will generate the users JOIN or FJOIN instead. + */ + if (IS_LOCAL(dest)) + { + Channel::JoinUser(dest, parameters[1].c_str(), true, "", false, ServerInstance->Time()); + /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */ + Channel* n = ServerInstance->FindChan(parameters[1]); + if (n) + { + if (n->HasUser(dest)) + { + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + return CMD_SUCCESS; + } + else + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)"); + return CMD_FAILURE; + } + } + else + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]); + return CMD_FAILURE; + } + } + else + { + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + return CMD_SUCCESS; + } + } + else + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]); + return CMD_FAILURE; } } + + 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; + } }; class ModuleSajoin : public Module { - cmd_sajoin* mycommand; + CommandSajoin cmd; public: - ModuleSajoin(Server* Me) - : Module::Module(Me) + ModuleSajoin() + : cmd(this) { - Srv = Me; - mycommand = new cmd_sajoin(); - Srv->AddCommand(mycommand); + ServerInstance->AddCommand(&cmd); } - + virtual ~ModuleSajoin() { } - + virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR); } - -}; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleSajoinFactory : public ModuleFactory -{ - public: - ModuleSajoinFactory() - { - } - - ~ModuleSajoinFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleSajoin(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSajoinFactory; -} - +MODULE_INIT(ModuleSajoin)