X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=33eefadb2e110a4e55824d7c05664f81842cefda;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=d1237a7e6eddf27eab6894984953c1ae0a8b4d02;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index d1237a7e6..33eefadb2 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,17 +1,21 @@ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.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; @@ -19,61 +23,51 @@ 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) { } - - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) - { - if (channel->IsModeSet('J')) - return std::make_pair(true, channel->GetModeParameter('J')); - else - return std::make_pair(false, parameter); - } + SimpleExtItem ext; + KickRejoin(Module* Creator) : ModeHandler(Creator, 'J', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("norejoinusers", Creator) { } - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); + 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; + ext.unset(channel); - if (channel->GetExt("norejoinusers", 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) { - ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str()); - 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 { - if (!adding) - { - channel->SetModeParam('J', parameter.c_str(), adding); - return MODEACTION_ALLOW; - } - std::string cur_param = channel->GetModeParameter('J'); if (cur_param == parameter) { @@ -84,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 @@ -108,136 +100,80 @@ class KickRejoin : public ModeHandler class ModuleKickNoRejoin : public Module { - - KickRejoin* kr; - + KickRejoin kr; + public: - - ModuleKickNoRejoin(InspIRCd* Me) - : Module::Module(Me) + + ModuleKickNoRejoin() + : kr(this) { - - kr = new KickRejoin(ServerInstance); - ServerInstance->AddMode(kr, 'J'); + 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, 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) { - ServerInstance->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++) { - ServerInstance->Log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second); - if (iter->second > time(NULL)) + if (iter->second > ServerInstance->Time()) { - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot"); - if (iter->first == user) + if (iter->first == user) { - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: and we have the right 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 { // Expired record, remove. - ServerInstance->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, const std::string &reason) + + 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); } - - ServerInstance->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; - - if (chan->GetExt("norejoinusers", 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) + ~ModuleKickNoRejoin() { - List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; + ServerInstance->Modes->DelMode(&kr); } - virtual ~ModuleKickNoRejoin() - { - ServerInstance->Modes->DelMode(kr); - DELETE(kr); - } - - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); } }; -class ModuleKickNoRejoinFactory : public ModuleFactory -{ - public: - ModuleKickNoRejoinFactory() - { - } - - ~ModuleKickNoRejoinFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleKickNoRejoin(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleKickNoRejoinFactory; -} - +MODULE_INIT(ModuleKickNoRejoin)