X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=a914f38693108b69d37a357d7131a92d72c6d43c;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=1c5333defeaf06ff896701d08ff94524e724a5c2;hpb=49ef1162a51906e7444bb7e38736bd816c317db6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 1c5333def..a914f3869 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,195 +1,159 @@ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 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) */ -inline int strtoint(const std::string &str) -{ - std::istringstream ss(str); - int result; - ss >> result; - return result; -} - -typedef std::map delaylist; +typedef std::map delaylist; +/** Handles channel mode +J + */ class KickRejoin : public ModeHandler { public: - KickRejoin() : ModeHandler('J', 1, 0, false, MODETYPE_CHANNEL, false) { } + unsigned int max; + SimpleExtItem ext; + KickRejoin(Module* Creator) + : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL) + , ext("norejoinusers", Creator) + { + } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) { - if (!adding) + if (adding) { - // Taking the mode off, we need to clean up. - delaylist* dl = (delaylist*)channel->GetExt("norejoinusers"); + int v = ConvToInt(parameter); + if (v <= 0) + return MODEACTION_DENY; + if (parameter == channel->GetModeParameter(this)) + return MODEACTION_DENY; - if (dl) - { - DELETE(dl); - channel->Shrink("norejoinusers"); - } - } - if ((!adding) || (atoi(parameter.c_str()) > 0)) - { - channel->SetModeParam('J', parameter.c_str(), adding); - channel->SetMode('J', adding); - return MODEACTION_ALLOW; + if ((IS_LOCAL(source) && ((unsigned int)v > max))) + v = max; + + parameter = ConvToStr(v); + channel->SetModeParam(this, parameter); } else { - return MODEACTION_DENY; + if (!channel->IsModeSet(this)) + return MODEACTION_DENY; + + ext.unset(channel); + channel->SetModeParam(this, ""); } + return MODEACTION_ALLOW; } }; class ModuleKickNoRejoin : public Module { - Server *Srv; - KickRejoin* kr; - + KickRejoin kr; + public: - - ModuleKickNoRejoin(Server* Me) - : Module::Module(Me) + + ModuleKickNoRejoin() + : kr(this) + { + } + + void init() + { + ServerInstance->Modules->AddService(kr); + ServerInstance->Modules->AddService(kr.ext); + Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); + } + + void OnRehash(User* user) { - Srv = Me; - kr = new KickRejoin(); - Srv->AddMode(kr, 'J'); + kr.max = ServerInstance->Duration(ServerInstance->Config->ConfValue("kicknorejoin")->getString("maxtime")); + if (!kr.max) + kr.max = 30*60; } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - log(DEBUG, "m_kicknorejoin.so: tried to grab delay list"); - + delaylist* dl = kr.ext.get(chan); if (dl) { - log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it"); - std::vector itemstoremove; - - for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) + for (delaylist::iterator iter = dl->begin(); iter != dl->end(); ) { - log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second); - if (iter->second > time(NULL)) + if (iter->second > ServerInstance->Time()) { - log(DEBUG, "m_kicknorejoin.so: still inside time slot"); - if (iter->first == user) + if (iter->first == user->uuid) { - log(DEBUG, "m_kicknorejoin.so: and we have the right user"); - WriteServ(user->fd, "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name); - return 1; + std::string modeparam = chan->GetModeParameter(&kr); + 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(), modeparam.c_str()); + return MOD_RES_DENY; } + ++iter; } else { // Expired record, remove. - log(DEBUG, "m_kicknorejoin.so: record expired"); - itemstoremove.push_back(iter->first); - } - } - - for (unsigned int i = 0; i < itemstoremove.size(); i++) - dl->erase(itemstoremove[i]); - - if (!dl->size()) - { - // Now it's empty.. - DELETE(dl); - chan->Shrink("norejoinusers"); + dl->erase(iter++); } } + + if (dl->empty()) + kr.ext.unset(chan); } - return 0; } - - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + return MOD_RES_PASSTHRU; + } + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) + { + if (memb->chan->IsModeSet(&kr) && (IS_LOCAL(memb->user)) && (source != memb->user)) { - if (chan->IsModeSet('J') && (source != user)) + delaylist* dl = kr.ext.get(memb->chan); + if (!dl) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if (!dl) - { - dl = new delaylist; - chan->Extend("norejoinusers", (char*)dl); - } - - log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J'))); - (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J')); + dl = new delaylist; + kr.ext.set(memb->chan, dl); } - } - - virtual void OnChannelDelete(chanrec* chan) - { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if (dl) - { - DELETE(dl); - chan->Shrink("norejoinusers"); + (*dl)[memb->user->uuid] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr)); } } - - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_CHANNEL) - OnChannelDelete((chanrec*)item); - } - virtual void Implements(char* List) + ~ModuleKickNoRejoin() { - List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; } - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "J", 3); - } - - virtual ~ModuleKickNoRejoin() - { - DELETE(kr); - } - - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); + return Version("Channel mode to delay rejoin after kick", VF_VENDOR); } }; -class ModuleKickNoRejoinFactory : public ModuleFactory -{ - public: - ModuleKickNoRejoinFactory() - { - } - - ~ModuleKickNoRejoinFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleKickNoRejoin(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleKickNoRejoinFactory; -} - +MODULE_INIT(ModuleKickNoRejoin)