X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=4bb9f9dc1adfdc6353d6af0ef1aa4dfc4a1bf959;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=3910bc0307aac3abc9304d109ee6b9f9a38bcd74;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 3910bc030..4bb9f9dc1 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,3 +1,16 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #include #include #include @@ -5,10 +18,12 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ + + inline int strtoint(const std::string &str) { std::istringstream ss(str); @@ -19,72 +34,131 @@ inline int strtoint(const std::string &str) 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: + 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); + } + + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) { - Srv = Me; - - Srv->AddExtendedMode('J', MT_CHANNEL, false, 1, 0); + /* When TS is equal, the alphabetically later one wins */ + return (their_param < our_param); } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if ((modechar == 'J') && (type == MT_CHANNEL)) + if (!adding) { - if (!mode_on) + // Taking the mode off, we need to clean up. + delaylist* dl; + + if (channel->GetExt("norejoinusers", dl)) { - // Taking the mode off, we need to clean up. - chanrec* c = (chanrec*)target; - - delaylist* dl = (delaylist*)c->GetExt("norejoinusers"); - - if (dl) + DELETE(dl); + channel->Shrink("norejoinusers"); + } + + if (!channel->IsModeSet('J')) + { + return MODEACTION_DENY; + } + else + { + channel->SetMode('J', false); + return MODEACTION_ALLOW; + } + } + else if (atoi(parameter.c_str()) > 0) + { + if (!channel->IsModeSet('J')) + { + parameter = ConvToStr(atoi(parameter.c_str())); + channel->SetModeParam('J', parameter.c_str(), adding); + channel->SetMode('J', adding); + 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())); + 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); + 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 ((!mode_on) || (atoi(params[0].c_str()) > 0)); } - return 0; + else + { + return MODEACTION_DENY; + } + } +}; + +class ModuleKickNoRejoin : public Module +{ + + KickRejoin* kr; + +public: + + ModuleKickNoRejoin(InspIRCd* Me) + : Module::Module(Me) + { + + kr = new KickRejoin(ServerInstance); + if (!ServerInstance->AddMode(kr, 'J')) + throw ModuleException("Could not add new modes!"); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { if (chan) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - log(DEBUG, "m_kicknorejoin.so: tried to grab delay list"); - - if (dl) + delaylist* dl; + if (chan->GetExt("norejoinusers", 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++) { - log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second); if (iter->second > time(NULL)) { - log(DEBUG, "m_kicknorejoin.so: still inside time slot"); 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); + user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name); return 1; } } else { // Expired record, remove. - log(DEBUG, "m_kicknorejoin.so: record expired"); itemstoremove.push_back(iter->first); } } @@ -95,38 +169,35 @@ public: if (!dl->size()) { // Now it's empty.. - DELETE(dl); - chan->Shrink("norejoinusers"); - } + DELETE(dl); + chan->Shrink("norejoinusers"); } } - return 0; } + return 0; + } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + { + if (chan->IsModeSet('J') && (source != user)) { - if (chan->IsModeSet('J') && (source != user)) + delaylist* dl; + if (!chan->GetExt("norejoinusers", 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; + chan->Extend("norejoinusers", dl); } + (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J')); } - - virtual void OnChannelDelete(chanrec* chan) - { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); + } + + virtual void OnChannelDelete(chanrec* chan) + { + delaylist* dl; - if (dl) - { - DELETE(dl); + if (chan->GetExt("norejoinusers", dl)) + { + DELETE(dl); chan->Shrink("norejoinusers"); } } @@ -139,21 +210,18 @@ public: 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) - { - InsertMode(output, "J", 3); + List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; } virtual ~ModuleKickNoRejoin() { + ServerInstance->Modes->DelMode(kr); + DELETE(kr); } virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; @@ -169,7 +237,7 @@ class ModuleKickNoRejoinFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleKickNoRejoin(Me); }