X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=1627f945f81a9e0eaadce581814200d647455064;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=e687e474d2f8f2c6c9275ac8fa08127454767503;hpb=4cbb91509431fa68069c8f76202b85290f9f3b87;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index e687e474d..39ebb28cc 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -1,80 +1,125 @@ -// Sajoin and +g support module by C.J.Edwards +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 . + */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -/* $ModDesc: Provides support for unreal-style SAJOIN command */ +#include "inspircd.h" -Server *Srv; - -void handle_sajoin(char **parameters, int pcnt, userrec *user) +/** Handle /SAJOIN + */ +class CommandSajoin : public Command { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - if (dest) + public: + CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1) + { + allow_empty_last_param = false; + flags_needed = 'o'; syntax = "[] [,]+"; + TRANSLATE2(TR_NICK, TR_TEXT); + } + + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { + const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0; + if (CommandParser::LoopCall(user, this, parameters, channelindex)) + return CMD_FAILURE; - for (int x = 0; x < strlen(parameters[0]); x++) + 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 ((parameters[0][0] != '#') || (parameters[0][x] == ' ') || (parameters[0][x]> ',')) + if (user != dest && !user->HasPrivPermission("users/sajoin-others")) + { + 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->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); + return CMD_FAILURE; + } + if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel)) + { + /* we didn't need to check this for each character ;) */ + user->WriteNotice("*** Invalid characters in channel name or name too long"); + return CMD_FAILURE; + } + + Channel* chan = ServerInstance->FindChan(channel); + if ((chan) && (chan->HasUser(dest))) + { + user->WriteRemoteNotice("*** " + dest->nick + " is already on " + channel); + return CMD_FAILURE; + } + + /* 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) + { + chan = Channel::JoinUser(localuser, channel, true); + if (chan) { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); - return; + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+channel); + return CMD_SUCCESS; } + else + { + user->WriteNotice("*** Could not join "+dest->nick+" to "+channel); + return CMD_FAILURE; + } + } + else + { + return CMD_SUCCESS; + } + } + else + { + user->WriteNotice("*** No such nickname: '" + nickname + "'"); + return CMD_FAILURE; } - - Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); - Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick)); } -} - -class ModuleSajoin : public Module -{ - public: - ModuleSajoin() - { - Srv = new Server; - Srv->AddCommand("SAJOIN",handle_sajoin,'o',2); - } - - virtual ~ModuleSajoin() + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { - delete Srv; + return ROUTE_OPT_UCAST(parameters[0]); } - - virtual Version GetVersion() - { - return Version(1,0,0,1); - } - }; -// 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() + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSajoin; + return Version("Provides the SAJOIN command, allows opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSajoinFactory; -} - +MODULE_INIT(ModuleSajoin)