X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=ad8bfdcb6d1c60b283f8f604d8c341cb0f288907;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=c151cb4e449552d6018a26f8e9b7cfb94b7f874a;hpb=b4be0c94ab5fb7e5a7a799a195c78de072a5e315;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index c151cb4e4..ad8bfdcb6 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,100 +1,117 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 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) */ +#include "inspircd.h" -static inline int strtoint(const std::string &str) +class KickRejoinData { - std::istringstream ss(str); - int result; - ss >> result; - return result; -} + struct KickedUser + { + std::string uuid; + time_t expire; -typedef std::map delaylist; + KickedUser(User* user, unsigned int Delay) + : uuid(user->uuid) + , expire(ServerInstance->Time() + Delay) + { + } + }; + + typedef std::vector KickedList; + + mutable KickedList kicked; -/** Handles channel mode +J - */ -class KickRejoin : public ModeHandler -{ public: - SimpleExtItem ext; - KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'J', 1, 0, false, MODETYPE_CHANNEL, false), - ext("norejoinusers", Creator) { } + const unsigned int delay; - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) - { - if (channel->IsModeSet('J')) - return std::make_pair(true, channel->GetModeParameter('J')); - else - return std::make_pair(false, parameter); - } + KickRejoinData(unsigned int Delay) : delay(Delay) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + bool canjoin(LocalUser* user) const { - if (!adding) + for (KickedList::iterator i = kicked.begin(); i != kicked.end(); ) { - ext.unset(channel); - - if (!channel->IsModeSet('J')) + KickedUser& rec = *i; + if (rec.expire > ServerInstance->Time()) { - return MODEACTION_DENY; + if (rec.uuid == user->uuid) + return false; + ++i; } else { - channel->SetModeParam('J', ""); - return MODEACTION_ALLOW; + // Expired record, remove. + stdalgo::vector::swaperase(kicked, i); + if (kicked.empty()) + break; } } - else if (atoi(parameter.c_str()) > 0) - { - if (!channel->IsModeSet('J')) - { - parameter = ConvToStr(atoi(parameter.c_str())); - channel->SetModeParam('J', parameter); - return MODEACTION_ALLOW; - } - else - { - std::string cur_param = channel->GetModeParameter('J'); - if (cur_param == parameter) - { - // mode params match, don't change mode - return MODEACTION_DENY; - } - else - { - // new mode param, replace old with new - parameter = ConvToStr(atoi(parameter.c_str())); - if (parameter != "0") - { - channel->SetModeParam('J', parameter); - return MODEACTION_ALLOW; - } - else - { - /* Fix to jamie's fix, dont allow +J 0 on the new value! */ - return MODEACTION_DENY; - } - } - } - } - else - { + return true; + } + + void add(User* user) + { + // One user can be in the list multiple times if the user gets kicked, force joins + // (skipping OnUserPreJoin) and gets kicked again, but that's okay because canjoin() + // works correctly in this case as well + kicked.push_back(KickedUser(user, delay)); + } +}; + +/** Handles channel mode +J + */ +class KickRejoin : public ParamMode > +{ + const unsigned int max; + public: + KickRejoin(Module* Creator) + : ParamMode >(Creator, "kicknorejoin", 'J') + , max(60) + { + } + + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) + { + int v = ConvToInt(parameter); + if (v <= 0) return MODEACTION_DENY; - } + + if ((IS_LOCAL(source) && ((unsigned int)v > max))) + v = max; + + ext.set(channel, new KickRejoinData(v)); + return MODEACTION_ALLOW; + } + + void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out) + { + out.append(ConvToStr(krd->delay)); + } + + std::string GetModuleSettings() const + { + return ConvToStr(max); } }; @@ -103,77 +120,41 @@ class ModuleKickNoRejoin : public Module KickRejoin kr; public: - - ModuleKickNoRejoin(InspIRCd* Me) - : Module(Me), kr(Me, this) + ModuleKickNoRejoin() + : kr(this) { - if (!ServerInstance->Modes->AddMode(&kr)) - throw ModuleException("Could not add new modes!"); - Extensible::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) + const KickRejoinData* data = kr.ext.get(chan); + if ((data) && (!data->canjoin(user))) { - std::vector itemstoremove; - - for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) - { - if (iter->second > ServerInstance->Time()) - { - if (iter->first == user) - { - 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('J').c_str()); - return MOD_RES_DENY; - } - } - else - { - // Expired record, remove. - itemstoremove.push_back(iter->first); - } - } - - for (unsigned int i = 0; i < itemstoremove.size(); i++) - dl->erase(itemstoremove[i]); - - if (!dl->size()) - kr.ext.unset(chan); + user->WriteNumeric(ERR_DELAYREJOIN, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay)); + return MOD_RES_DENY; } } 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('J') && (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() + strtoint(memb->chan->GetModeParameter('J')); + data->add(memb->user); } } - ~ModuleKickNoRejoin() - { - ServerInstance->Modes->DelMode(&kr); - } - - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); + return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings()); } }; - MODULE_INIT(ModuleKickNoRejoin)