X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=02f452cbae2dcef5ec8c0cd81dca07056f8a654a;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=9bbb5f4569bc0b14c4d48034912be092536209a8;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 9bbb5f456..02f452cba 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -11,19 +11,10 @@ * --------------------------------------------------- */ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ - - inline int strtoint(const std::string &str) { std::istringstream ss(str); @@ -32,7 +23,7 @@ inline int strtoint(const std::string &str) return result; } -typedef std::map delaylist; +typedef std::map delaylist; /** Handles channel mode +J */ @@ -41,37 +32,45 @@ 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(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) + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* 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"); } + + 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) { - ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str()); - if (!channel->IsModeSet('J')) { parameter = ConvToStr(atoi(parameter.c_str())); @@ -81,12 +80,6 @@ class KickRejoin : public ModeHandler } else { - if (!adding) - { - channel->SetModeParam('J', parameter.c_str(), adding); - return MODEACTION_ALLOW; - } - std::string cur_param = channel->GetModeParameter('J'); if (cur_param == parameter) { @@ -127,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)) + throw ModuleException("Could not add new modes!"); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + virtual int OnUserPreJoin(User* user, Channel* 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; + 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; } @@ -160,7 +150,6 @@ public: else { // Expired record, remove. - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired"); itemstoremove.push_back(iter->first); } } @@ -179,7 +168,7 @@ public: return 0; } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { if (chan->IsModeSet('J') && (source != user)) { @@ -189,13 +178,11 @@ 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')); } } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { delaylist* dl; @@ -209,7 +196,7 @@ public: virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_CHANNEL) - OnChannelDelete((chanrec*)item); + OnChannelDelete((Channel*)item); } virtual void Implements(char* List) @@ -230,27 +217,4 @@ public: }; -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)