X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=fdb7b8f2455fdcb8f8b5e913edaba0574f314705;hb=3ccf0065d43db80f31c6404aeac4d65551481508;hp=037dc5678ee09fe11732d255cd2c17e94aa1bbec;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 037dc5678..fdb7b8f24 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,45 +1,67 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006 John Brooks + * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 "inspircd.h" -/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ +typedef std::map delaylist; -typedef std::map delaylist; +struct KickRejoinData +{ + delaylist kicked; + unsigned int delay; + + KickRejoinData(unsigned int Delay) : delay(Delay) { } +}; /** Handles channel mode +J */ -class KickRejoin : public ParamChannelModeHandler +class KickRejoin : public ParamMode > { + static const unsigned int max = 60; public: - SimpleExtItem ext; - KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { } + KickRejoin(Module* Creator) + : ParamMode >(Creator, "kicknorejoin", 'J') + { + } - bool ParamValidate(std::string& parameter) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) { - int v = atoi(parameter.c_str()); + int v = ConvToInt(parameter); if (v <= 0) - return false; - parameter = ConvToStr(v); - return true; + return MODEACTION_DENY; + + if ((IS_LOCAL(source) && ((unsigned int)v > max))) + v = max; + + ext.set(channel, new KickRejoinData(v)); + return MODEACTION_ALLOW; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out) { - ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding); - if (rv == MODEACTION_ALLOW && !adding) - ext.unset(channel); - return rv; + out.append(ConvToStr(krd->delay)); } }; @@ -48,77 +70,58 @@ class ModuleKickNoRejoin : public Module KickRejoin kr; public: - ModuleKickNoRejoin() : kr(this) { - if (!ServerInstance->Modes->AddMode(&kr)) - throw ModuleException("Could not add new modes!"); - ServerInstance->Extensions.Register(&kr.ext); - Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick }; - ServerInstance->Modules->Attach(eventlist, this, 2); } - ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { if (chan) { - delaylist* dl = kr.ext.get(chan); - if (dl) + KickRejoinData* data = kr.ext.get(chan); + if (data) { - std::vector itemstoremove; - - for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) + delaylist& kicked = data->kicked; + for (delaylist::iterator iter = kicked.begin(); iter != kicked.end(); ) { if (iter->second > ServerInstance->Time()) { - if (iter->first == user) + if (iter->first == user->uuid) { - user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", - user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter(&kr).c_str()); + user->WriteNumeric(ERR_DELAYREJOIN, "%s :You must wait %u seconds after being kicked to rejoin (+J)", + chan->name.c_str(), data->delay); return MOD_RES_DENY; } + ++iter; } else { // Expired record, remove. - itemstoremove.push_back(iter->first); + kicked.erase(iter++); } } - - for (unsigned int i = 0; i < itemstoremove.size(); i++) - dl->erase(itemstoremove[i]); - - if (!dl->size()) - kr.ext.unset(chan); } } return MOD_RES_PASSTHRU; } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE { - if (memb->chan->IsModeSet(&kr) && (source != memb->user)) + if ((!IS_LOCAL(memb->user)) || (source == memb->user)) + return; + + KickRejoinData* data = kr.ext.get(memb->chan); + if (data) { - delaylist* dl = kr.ext.get(memb->chan); - if (dl) - { - dl = new delaylist; - kr.ext.set(memb->chan, dl); - } - (*dl)[memb->user] = ServerInstance->Time() + atoi(memb->chan->GetModeParameter(&kr).c_str()); + data->kicked[memb->user->uuid] = ServerInstance->Time() + data->delay; } } - ~ModuleKickNoRejoin() + Version GetVersion() CXX11_OVERRIDE { - } - - Version GetVersion() - { - return Version("Channel mode to delay rejoin after kick", VF_COMMON | VF_VENDOR); + return Version("Channel mode to delay rejoin after kick", VF_VENDOR); } }; - MODULE_INIT(ModuleKickNoRejoin)