X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=1949c8c96dc237b4362e66e29d95ecfbd3a8a038;hb=94afde43b086f092bf8128d76d418cb63840e8eb;hp=19cbc638fcaa3b76dc2cc022f67f2d99935988f9;hpb=b3e9ee509dcee7004162276147ace76795730167;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 19cbc638f..1949c8c96 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -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,21 +32,21 @@ 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) { @@ -64,7 +55,7 @@ class KickRejoin : public ModeHandler if (channel->GetExt("norejoinusers", dl)) { - DELETE(dl); + delete dl; channel->Shrink("norejoinusers"); } @@ -80,8 +71,6 @@ class KickRejoin : public ModeHandler } 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())); @@ -131,32 +120,31 @@ 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!"); + Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - 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; } @@ -164,7 +152,6 @@ public: else { // Expired record, remove. - ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired"); itemstoremove.push_back(iter->first); } } @@ -175,7 +162,7 @@ public: if (!dl->size()) { // Now it's empty.. - DELETE(dl); + delete dl; chan->Shrink("norejoinusers"); } } @@ -183,7 +170,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)) { @@ -193,19 +180,17 @@ 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; if (chan->GetExt("norejoinusers", dl)) { - DELETE(dl); + delete dl; chan->Shrink("norejoinusers"); } } @@ -213,18 +198,14 @@ 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) - { - List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; - } virtual ~ModuleKickNoRejoin() { ServerInstance->Modes->DelMode(kr); - DELETE(kr); + delete kr; } virtual Version GetVersion() @@ -234,27 +215,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)