X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=05229efb9257e017b748ca3ebcbda0a9ff15a4e5;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=54f9ad0669fb94f75280a33c09d616254552b1d4;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 54f9ad066..05229efb9 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -1,111 +1,132 @@ -/* +------------------------------------+ - * | 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) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 jamie + * Copyright (C) 2005, 2007 Robin Burchell + * Copyright (C) 2004, 2007, 2010 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 */ - -static Server *Srv; - -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", 1) { - this->source = "m_sajoin.so"; - syntax = " "; + allow_empty_last_param = false; + flags_needed = 'o'; + syntax = "[] [,]+"; + TRANSLATE2(TR_NICK, TR_TEXT); } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - userrec* dest = Srv->FindNick(std::string(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 (Srv->IsUlined(dest->server)) + 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->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick); - return; + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); + return CMD_FAILURE; } - if (!IsValidChannelName(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"); - return; + user->WriteNotice("*** Invalid characters in channel name or name too long"); + return CMD_FAILURE; } - Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); - chanrec::JoinUser(dest, parameters[1], true); + 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) + { + 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; } } -}; -class ModuleSajoin : public Module -{ - cmd_sajoin* mycommand; - public: - ModuleSajoin(Server* Me) - : Module::Module(Me) - { - Srv = Me; - mycommand = new cmd_sajoin(); - Srv->AddCommand(mycommand); - } - - virtual ~ModuleSajoin() - { - } - - virtual Version GetVersion() + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { - return Version(1,0,0,1,VF_VENDOR); + return ROUTE_OPT_UCAST(parameters[0]); } - }; -// 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(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSajoin(Me); + return Version("Adds the /SAJOIN command which allows server operators to force users to join one or more channels.", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSajoinFactory; -} - +MODULE_INIT(ModuleSajoin)