X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=9d5fe3b623434d831e456cebe20d87491bb21c7a;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=790e8f680e186d01db6617c883c2e2a1b874aae4;hpb=1d0dd686f0fb1ffd53a20da0b8227c5cd6aa6798;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 790e8f680..9d5fe3b62 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -12,14 +12,10 @@ */ #include "inspircd.h" -#include -#include "users.h" -#include "channels.h" -#include "modules.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; @@ -27,49 +23,38 @@ 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(InspIRCd* Instance) : ModeHandler(Instance, '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(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + 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); - } - - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) - { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); } - - 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; - - if (channel->GetExt("norejoinusers", dl)) - { - DELETE(dl); - channel->Shrink("norejoinusers"); - } - + ext.unset(channel); + if (!channel->IsModeSet('J')) { return MODEACTION_DENY; } else { - channel->SetMode('J', false); + channel->SetModeParam('J', ""); return MODEACTION_ALLOW; } } @@ -78,8 +63,7 @@ class KickRejoin : public ModeHandler if (!channel->IsModeSet('J')) { parameter = ConvToStr(atoi(parameter.c_str())); - channel->SetModeParam('J', parameter.c_str(), adding); - channel->SetMode('J', adding); + channel->SetModeParam('J', parameter); return MODEACTION_ALLOW; } else @@ -94,11 +78,9 @@ class KickRejoin : public ModeHandler { // new mode param, replace old with new parameter = ConvToStr(atoi(parameter.c_str())); - cur_param = ConvToStr(atoi(cur_param.c_str())); if (parameter != "0") { - channel->SetModeParam('J', cur_param.c_str(), false); - channel->SetModeParam('J', parameter.c_str(), adding); + channel->SetModeParam('J', parameter); return MODEACTION_ALLOW; } else @@ -118,37 +100,37 @@ class KickRejoin : public ModeHandler class ModuleKickNoRejoin : public Module { - - KickRejoin* kr; - + KickRejoin kr; + public: - - ModuleKickNoRejoin(InspIRCd* Me) - : Module(Me) + + ModuleKickNoRejoin() + : kr(this) { - - kr = new KickRejoin(ServerInstance); - if (!ServerInstance->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, std::string &privs) + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - delaylist* dl; - if (chan->GetExt("norejoinusers", dl)) + delaylist* dl = kr.ext.get(chan); + if (dl) { - std::vector itemstoremove; - + std::vector itemstoremove; + for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) { - if (iter->second > time(NULL)) + if (iter->second > ServerInstance->Time()) { - if (iter->first == user) + if (iter->first == user) { - user->WriteServ( "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 @@ -157,68 +139,40 @@ public: 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, const std::string &reason, bool &silent) + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if (chan->IsModeSet('J') && (source != user)) + if (memb->chan->IsModeSet('J') && (source != memb->user)) { - delaylist* dl; - if (!chan->GetExt("norejoinusers", dl)) + delaylist* dl = kr.ext.get(memb->chan); + if (dl) { dl = new delaylist; - chan->Extend("norejoinusers", dl); + kr.ext.set(memb->chan, dl); } - (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J')); + (*dl)[memb->user] = ServerInstance->Time() + strtoint(memb->chan->GetModeParameter('J')); } } - - virtual void OnChannelDelete(chanrec* chan) - { - delaylist* dl; - - if (chan->GetExt("norejoinusers", dl)) - { - DELETE(dl); - chan->Shrink("norejoinusers"); - } - } - - 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_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; } - virtual ~ModuleKickNoRejoin() - { - ServerInstance->Modes->DelMode(kr); - DELETE(kr); - } - - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); } }; -MODULE_INIT(ModuleKickNoRejoin); +MODULE_INIT(ModuleKickNoRejoin)