X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=9d5fe3b623434d831e456cebe20d87491bb21c7a;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;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..9d5fe3b62 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,16 +1,21 @@ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #include "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ -inline int strtoint(const std::string &str) +static inline int strtoint(const std::string &str) { std::istringstream ss(str); int result; @@ -18,31 +23,73 @@ inline int strtoint(const std::string &str) 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) { } + SimpleExtItem ext; + KickRejoin(Module* Creator) : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("norejoinusers", Creator) { } + + 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); + } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (!adding) { - // Taking the mode off, we need to clean up. - delaylist* dl = (delaylist*)channel->GetExt("norejoinusers"); + ext.unset(channel); - if (dl) + if (!channel->IsModeSet('J')) + { + return MODEACTION_DENY; + } + else { - DELETE(dl); - channel->Shrink("norejoinusers"); + channel->SetModeParam('J', ""); + return MODEACTION_ALLOW; } } - if ((!adding) || (atoi(parameter.c_str()) > 0)) + else if (atoi(parameter.c_str()) > 0) { - channel->SetModeParam('J', parameter.c_str(), adding); - channel->SetMode('J', adding); - return MODEACTION_ALLOW; + 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 { @@ -53,143 +100,79 @@ class KickRejoin : public ModeHandler class ModuleKickNoRejoin : public Module { - Server *Srv; - KickRejoin* kr; - + KickRejoin kr; + public: - - ModuleKickNoRejoin(Server* Me) - : Module::Module(Me) + + ModuleKickNoRejoin() + : kr(this) { - Srv = Me; - kr = new KickRejoin(); - Srv->AddMode(kr, 'J'); + 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); } - 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; - + std::vector itemstoremove; + for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) { - 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) { - 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; + 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. - 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"); - } - } - } - return 0; - } - - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) - { - if (chan->IsModeSet('J') && (source != user)) - { - 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')); + kr.ext.unset(chan); } } - - virtual void OnChannelDelete(chanrec* chan) + return MOD_RES_PASSTHRU; + } + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) + { + if (memb->chan->IsModeSet('J') && (source != memb->user)) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - + delaylist* dl = kr.ext.get(memb->chan); if (dl) { - DELETE(dl); - chan->Shrink("norejoinusers"); + dl = new delaylist; + kr.ext.set(memb->chan, dl); + } + (*dl)[memb->user] = ServerInstance->Time() + strtoint(memb->chan->GetModeParameter('J')); } } - - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_CHANNEL) - OnChannelDelete((chanrec*)item); - } - - virtual void Implements(char* List) - { - 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() + ~ModuleKickNoRejoin() { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); } -}; - -class ModuleKickNoRejoinFactory : public ModuleFactory -{ - public: - ModuleKickNoRejoinFactory() + Version GetVersion() { + return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); } - - ~ModuleKickNoRejoinFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleKickNoRejoin(Me); - } - }; -extern "C" void * init_module( void ) -{ - return new ModuleKickNoRejoinFactory; -} - +MODULE_INIT(ModuleKickNoRejoin)