X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=33eefadb2e110a4e55824d7c05664f81842cefda;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=6638dc5bbf887cbb9341a072b8af663c787c35bf;hpb=99be179284329fd7cb7c3d9e21a9fe93fed2637e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 6638dc5bb..33eefadb2 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,15 +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; @@ -17,168 +23,157 @@ inline int strtoint(const std::string &str) return result; } -typedef std::map delaylist; +typedef std::map delaylist; -class ModuleKickNoRejoin : public Module +/** Handles channel mode +J + */ +class KickRejoin : public ModeHandler { - Server *Srv; - -public: - - ModuleKickNoRejoin(Server* Me) - : Module::Module(Me) + public: + SimpleExtItem ext; + KickRejoin(Module* Creator) : ModeHandler(Creator, 'J', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("norejoinusers", Creator) { } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - Srv = Me; - - Srv->AddExtendedMode('J', MT_CHANNEL, false, 1, 0); + if (channel->IsModeSet('J')) + return std::make_pair(true, channel->GetModeParameter('J')); + else + return std::make_pair(false, parameter); } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if ((modechar == 'J') && (type == MT_CHANNEL)) + if (!adding) { - if (!mode_on) + ext.unset(channel); + + if (!channel->IsModeSet('J')) + { + return MODEACTION_DENY; + } + else { - // Taking the mode off, we need to clean up. - chanrec* c = (chanrec*)target; - - delaylist* dl = (delaylist*)c->GetExt("norejoinusers"); - - if (dl) + channel->SetModeParam('J', ""); + return MODEACTION_ALLOW; + } + } + 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) { - delete dl; - c->Shrink("norejoinusers"); + // 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; + } } } - /* Don't allow negative or 0 +J value */ - return (atoi(params[0].c_str()) > 0); } - return 0; + else + { + return MODEACTION_DENY; + } + } +}; + +class ModuleKickNoRejoin : public Module +{ + KickRejoin kr; + +public: + + 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); } - 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"); - } + kr.ext.unset(chan); } } - return 0; + return MOD_RES_PASSTHRU; } - - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if (chan->IsCustomModeSet('J') && (source != user)) + if (memb->chan->IsModeSet('J') && (source != memb->user)) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if (!dl) + delaylist* dl = kr.ext.get(memb->chan); + if (dl) { dl = new delaylist; - chan->Extend("norejoinusers", (char*)dl); + kr.ext.set(memb->chan, 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')); - } - } - - virtual void OnChannelDelete(chanrec* chan) - { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if (dl) - { - delete dl; - chan->Shrink("norejoinusers"); + (*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_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; - } - virtual void On005Numeric(std::string &output) + ~ModuleKickNoRejoin() { - InsertMode(output, "J", 3); + ServerInstance->Modes->DelMode(&kr); } - virtual ~ModuleKickNoRejoin() + Version GetVersion() { + return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 0, VF_STATIC | 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)