X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=7abb9be7bbab4f09f123c06268d0d801e8876303;hb=6b929c6dbb3d36c3873ab9911ad4d8a46ddbdc99;hp=05deee417bc78f226797bf268805992112378c66;hpb=1524caf2f799cff54c2de330c9670a0b761ba3d8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 05deee417..7abb9be7b 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,100 +1,57 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006 John Brooks + * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ -static inline int strtoint(const std::string &str) -{ - std::istringstream ss(str); - int result; - ss >> result; - return result; -} - typedef std::map delaylist; /** Handles channel mode +J */ -class KickRejoin : public ModeHandler +class KickRejoin : public ParamChannelModeHandler { public: SimpleExtItem ext; - KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'J', PARAM_SETONLY, MODETYPE_CHANNEL), - ext("norejoinusers", Creator) { } + KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { } - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + bool ParamValidate(std::string& parameter) { - if (channel->IsModeSet('J')) - return std::make_pair(true, channel->GetModeParameter('J')); - else - return std::make_pair(false, parameter); + int v = atoi(parameter.c_str()); + if (v <= 0) + return false; + parameter = ConvToStr(v); + return true; } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (!adding) - { + ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding); + if (rv == MODEACTION_ALLOW && !adding) ext.unset(channel); - - if (!channel->IsModeSet('J')) - { - return MODEACTION_DENY; - } - else - { - channel->SetModeParam('J', ""); - return MODEACTION_ALLOW; - } - } - else if (atoi(parameter.c_str()) > 0) - { - if (!channel->IsModeSet('J')) - { - parameter = ConvToStr(atoi(parameter.c_str())); - channel->SetModeParam('J', parameter); - 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())); - if (parameter != "0") - { - channel->SetModeParam('J', parameter); - return MODEACTION_ALLOW; - } - else - { - /* Fix to jamie's fix, dont allow +J 0 on the new value! */ - return MODEACTION_DENY; - } - } - } - } - else - { - return MODEACTION_DENY; - } + return rv; } }; @@ -104,12 +61,12 @@ class ModuleKickNoRejoin : public Module public: - ModuleKickNoRejoin(InspIRCd* Me) - : Module(Me), kr(Me, this) + ModuleKickNoRejoin() + : kr(this) { if (!ServerInstance->Modes->AddMode(&kr)) throw ModuleException("Could not add new modes!"); - Extensible::Register(&kr.ext); + ServerInstance->Extensions.Register(&kr.ext); Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick }; ServerInstance->Modules->Attach(eventlist, this, 2); } @@ -129,7 +86,9 @@ public: { if (iter->first == user) { - user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter('J').c_str()); + std::string modeparam = chan->GetModeParameter(&kr); + user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", + user->nick.c_str(), chan->name.c_str(), modeparam.c_str()); return MOD_RES_DENY; } } @@ -152,26 +111,25 @@ public: void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if (memb->chan->IsModeSet('J') && (source != memb->user)) + if (memb->chan->IsModeSet(&kr) && (source != memb->user)) { delaylist* dl = kr.ext.get(memb->chan); - if (dl) + if (!dl) { dl = new delaylist; kr.ext.set(memb->chan, dl); } - (*dl)[memb->user] = ServerInstance->Time() + strtoint(memb->chan->GetModeParameter('J')); + (*dl)[memb->user] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr)); } } ~ModuleKickNoRejoin() { - ServerInstance->Modes->DelMode(&kr); } Version GetVersion() { - return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR); + return Version("Channel mode to delay rejoin after kick", VF_VENDOR); } };