X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=6a684206f2bede7928c32a90d82527e4b1347201;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=d64c60d5608d182c48a216f8af5d9ff76907880a;hpb=1afe959c7574b479e4a49a62885d2ac2757025ab;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index d64c60d56..6a684206f 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,16 +1,20 @@ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +/* +------------------------------------+ + * | 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 "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ - - inline int strtoint(const std::string &str) { std::istringstream ss(str); @@ -21,20 +25,22 @@ inline int strtoint(const std::string &str) 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); - } + 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) + 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); @@ -46,19 +52,58 @@ class KickRejoin : public ModeHandler { // Taking the mode off, we need to clean up. delaylist* dl; - + if (channel->GetExt("norejoinusers", dl)) { DELETE(dl); channel->Shrink("norejoinusers"); } + + if (!channel->IsModeSet('J')) + { + return MODEACTION_DENY; + } + else + { + channel->SetMode('J', false); + return MODEACTION_ALLOW; + } } - if ((!adding) || (atoi(parameter.c_str()) > 0)) + else if (atoi(parameter.c_str()) > 0) { - parameter = ConvToStr(atoi(parameter.c_str())); - 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.c_str(), adding); + channel->SetMode('J', adding); + 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())); + 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; + } + } + } } else { @@ -75,32 +120,29 @@ class ModuleKickNoRejoin : public Module public: ModuleKickNoRejoin(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { kr = new KickRejoin(ServerInstance); - ServerInstance->AddMode(kr, 'J'); + 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; if (chan->GetExt("norejoinusers", dl)) { - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it"); 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)) { - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot"); 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; } @@ -108,7 +150,6 @@ public: else { // Expired record, remove. - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired"); itemstoremove.push_back(iter->first); } } @@ -119,15 +160,15 @@ public: if (!dl->size()) { // Now it's empty.. - DELETE(dl); - chan->Shrink("norejoinusers"); + DELETE(dl); + chan->Shrink("norejoinusers"); } } } 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, bool &silent) { if (chan->IsModeSet('J') && (source != user)) { @@ -137,8 +178,6 @@ public: dl = new delaylist; chan->Extend("norejoinusers", 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')); } } @@ -167,37 +206,15 @@ public: 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); } }; -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)