X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=c828ade7b0098da7efd35b32539f971c8465cbda;hb=83137d5f9274832f152acc7d19de3cb0897f9630;hp=dab129cb2884d8fdc01a8f0e20abcb389d8aa9d8;hpb=46c4fd72f78cb9973a9d940b01790fcdbd3b5f54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index dab129cb2..c828ade7b 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,11 +1,17 @@ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 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) */ @@ -17,81 +23,143 @@ inline int strtoint(const std::string &str) return result; } -typedef std::map delaylist; +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(User* source, User* dest, Channel* channel, const std::string ¶meter) { - Srv = Me; - - Srv->AddExtendedMode('J', MT_CHANNEL, false, 1, 0); + 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, Channel* channel) + { + /* 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(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { - 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; + } } } - return 1; } - return 0; + else + { + return MODEACTION_DENY; + } } +}; - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) +class ModuleKickNoRejoin : public Module +{ + + KickRejoin* kr; + +public: + + ModuleKickNoRejoin(InspIRCd* Me) + : Module(Me) + { + + kr = new KickRejoin(ServerInstance); + if (!ServerInstance->Modes->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(User* user, Channel* chan, const char* cname, std::string &privs) { - if(chan) + 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; + std::vector itemstoremove; - for(delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) + 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)) + if (iter->second > time(NULL)) { - log(DEBUG, "m_kicknorejoin.so: still inside time slot"); - if(iter->first == user) + 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); } } - for(unsigned int i = 0; i < itemstoremove.size(); i++) + for (unsigned int i = 0; i < itemstoremove.size(); i++) dl->erase(itemstoremove[i]); - if(!dl->size()) + if (!dl->size()) { // Now it's empty.. delete dl; @@ -101,29 +169,26 @@ public: } return 0; } - - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) + + virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { - if(chan->IsCustomModeSet('J') && (source != user)) + if (chan->IsModeSet('J') && (source != user)) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if(!dl) + delaylist* dl; + if (!chan->GetExt("norejoinusers", dl)) { dl = new delaylist; - chan->Extend("norejoinusers", (char*)dl); + chan->Extend("norejoinusers", 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')); } } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { - delaylist* dl = (delaylist*)chan->GetExt("norejoinusers"); - - if(dl) + delaylist* dl; + + if (chan->GetExt("norejoinusers", dl)) { delete dl; chan->Shrink("norejoinusers"); @@ -133,51 +198,21 @@ 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_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1; - } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "J", 3); - } virtual ~ModuleKickNoRejoin() { + ServerInstance->Modes->DelMode(kr); + delete kr; } virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR); - } -}; - - -class ModuleKickNoRejoinFactory : public ModuleFactory -{ - public: - ModuleKickNoRejoinFactory() - { - } - - ~ModuleKickNoRejoinFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleKickNoRejoin(Me); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; -extern "C" void * init_module( void ) -{ - return new ModuleKickNoRejoinFactory; -} - +MODULE_INIT(ModuleKickNoRejoin)