X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=d1321947b2bb54979ecf8618a19556ae05581321;hb=0ec19b7ac91eedc83b31c3da733e237bfe28fc48;hp=2baecfc2265157d7bed672cf6c13a34bf1fff80c;hpb=364735e18b500f0a071fab4cc5c9e7bace1835fc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 2baecfc22..d1321947b 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -1,133 +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) 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 "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAJOIN command */ - /** Handle /SAJOIN */ -class cmd_sajoin : public command_t +class CommandSajoin : public Command { public: - cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2) + CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1) { - this->source = "m_sajoin.so"; - syntax = " "; + allow_empty_last_param = false; + flags_needed = 'o'; Penalty = 0; syntax = "[] [,]"; + TRANSLATE2(TR_NICK, 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]); - if (dest) + const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0; + if (CommandParser::LoopCall(user, this, parameters, channelindex)) + return CMD_FAILURE; + + const std::string& channel = parameters[channelindex]; + const std::string& nickname = parameters.size() > 1 ? parameters[0] : user->nick; + + User* dest = ServerInstance->FindNick(nickname); + if ((dest) && (dest->registered == REG_ALL)) { - if (ServerInstance->ULine(dest->server)) + if (user != dest && !user->HasPrivPermission("users/sajoin-others", false)) + { + user->WriteNotice("*** You are not allowed to /SAJOIN other users (the privilege users/sajoin-others is needed to /SAJOIN others)."); + return CMD_FAILURE; + } + + 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 (!ServerInstance->IsChannel(parameters[1])) + if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel)) { /* we didn't need to check this for each character ;) */ - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); + user->WriteNotice("*** Invalid characters in channel name or name too long"); return CMD_FAILURE; } - chanrec::JoinUser(ServerInstance, dest, parameters[1], true); + Channel* chan = ServerInstance->FindChan(channel); + if ((chan) && (chan->HasUser(dest))) + { + user->SendText(":" + user->server->GetName() + " NOTICE " + user->nick + " :*** " + dest->nick + " is already on " + channel); + return CMD_FAILURE; + } - /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */ - chanrec* n = ServerInstance->FindChan(parameters[1]); - if (n) + /* For local users, we call Channel::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 handle the command. + */ + LocalUser* localuser = IS_LOCAL(dest); + if (localuser) { - if (n->HasUser(dest)) + chan = Channel::JoinUser(localuser, channel, true); + if (chan) { - ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+channel); 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)"); + user->WriteNotice("*** Could not join "+dest->nick+" to "+channel); return CMD_FAILURE; } } else { - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]); - return CMD_FAILURE; + return CMD_SUCCESS; } } - - return CMD_SUCCESS; + else + { + user->WriteNotice("*** No such nickname "+nickname); + return CMD_FAILURE; + } } -}; -class ModuleSajoin : public Module -{ - cmd_sajoin* mycommand; - public: - ModuleSajoin(InspIRCd* Me) - : Module::Module(Me) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - - mycommand = new cmd_sajoin(ServerInstance); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleSajoin() - { - } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR,API_VERSION); + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; } - }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleSajoinFactory : public ModuleFactory +class ModuleSajoin : public Module { + CommandSajoin cmd; public: - ModuleSajoinFactory() - { - } - - ~ModuleSajoinFactory() + ModuleSajoin() + : cmd(this) { } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSajoin(Me); + return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSajoinFactory; -} - +MODULE_INIT(ModuleSajoin)