-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
+#include "inspircd.h"
-inline int strtoint(const std::string &str)
+class KickRejoinData
{
- std::istringstream ss(str);
- int result;
- ss >> result;
- return result;
-}
+ struct KickedUser
+ {
+ std::string uuid;
+ time_t expire;
-typedef std::map<userrec*, time_t> delaylist;
+ KickedUser(User* user, unsigned int Delay)
+ : uuid(user->uuid)
+ , expire(ServerInstance->Time() + Delay)
+ {
+ }
+ };
+
+ typedef std::vector<KickedUser> KickedList;
+
+ mutable KickedList kicked;
-/** Handles channel mode +J
- */
-class KickRejoin : public ModeHandler
-{
public:
- KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
+ const unsigned int delay;
- 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);
- }
+ KickRejoinData(unsigned int Delay) : delay(Delay) { }
- bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+ bool canjoin(LocalUser* user) const
{
- /* 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)
- {
- 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;
- }
- }
- else if (atoi(parameter.c_str()) > 0)
+ for (KickedList::iterator i = kicked.begin(); i != kicked.end(); )
{
- if (!channel->IsModeSet('J'))
+ KickedUser& rec = *i;
+ if (rec.expire > ServerInstance->Time())
{
- parameter = ConvToStr(atoi(parameter.c_str()));
- channel->SetModeParam('J', parameter.c_str(), adding);
- channel->SetMode('J', adding);
- return MODEACTION_ALLOW;
+ if (rec.uuid == user->uuid)
+ return false;
+ ++i;
}
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;
- }
- }
+ // Expired record, remove.
+ stdalgo::vector::swaperase(kicked, i);
+ if (kicked.empty())
+ break;
}
}
- else
- {
+ return true;
+ }
+
+ void add(User* user)
+ {
+ // One user can be in the list multiple times if the user gets kicked, force joins
+ // (skipping OnUserPreJoin) and gets kicked again, but that's okay because canjoin()
+ // works correctly in this case as well
+ kicked.push_back(KickedUser(user, delay));
+ }
+};
+
+/** Handles channel mode +J
+ */
+class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
+{
+ const unsigned int max;
+ public:
+ KickRejoin(Module* Creator)
+ : ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >(Creator, "kicknorejoin", 'J')
+ , max(60)
+ {
+ }
+
+ ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+ {
+ int v = ConvToInt(parameter);
+ if (v <= 0)
return MODEACTION_DENY;
- }
+
+ if ((IS_LOCAL(source) && ((unsigned int)v > max)))
+ v = max;
+
+ ext.set(channel, new KickRejoinData(v));
+ return MODEACTION_ALLOW;
+ }
+
+ void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out)
+ {
+ out.append(ConvToStr(krd->delay));
+ }
+
+ std::string GetModuleSettings() const
+ {
+ return ConvToStr(max);
}
};
class ModuleKickNoRejoin : public Module
{
-
- KickRejoin* kr;
-
+ KickRejoin kr;
+
public:
-
- ModuleKickNoRejoin(InspIRCd* Me)
- : Module(Me)
+ ModuleKickNoRejoin()
+ : kr(this)
{
-
- kr = new KickRejoin(ServerInstance);
- if (!ServerInstance->AddMode(kr, 'J'))
- throw ModuleException("Could not add new modes!");
}
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
if (chan)
{
- delaylist* dl;
- if (chan->GetExt("norejoinusers", dl))
+ const KickRejoinData* data = kr.ext.get(chan);
+ if ((data) && (!data->canjoin(user)))
{
- std::vector<userrec*> itemstoremove;
-
- for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
- {
- if (iter->second > time(NULL))
- {
- if (iter->first == user)
- {
- 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.
- itemstoremove.push_back(iter->first);
- }
- }
-
- for (unsigned int i = 0; i < itemstoremove.size(); i++)
- dl->erase(itemstoremove[i]);
-
- if (!dl->size())
- {
- // Now it's empty..
- DELETE(dl);
- chan->Shrink("norejoinusers");
- }
+ user->WriteNumeric(ERR_DELAYREJOIN, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
+ return MOD_RES_DENY;
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
-
- virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
- {
- if (chan->IsModeSet('J') && (source != user))
- {
- delaylist* dl;
- if (!chan->GetExt("norejoinusers", dl))
- {
- dl = new delaylist;
- chan->Extend("norejoinusers", dl);
- }
- (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
- }
- }
-
- virtual void OnChannelDelete(chanrec* chan)
+
+ void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE
{
- delaylist* dl;
-
- if (chan->GetExt("norejoinusers", dl))
+ if ((!IS_LOCAL(memb->user)) || (source == memb->user))
+ return;
+
+ KickRejoinData* data = kr.ext.get(memb->chan);
+ if (data)
{
- DELETE(dl);
- chan->Shrink("norejoinusers");
+ data->add(memb->user);
}
}
-
- virtual void OnCleanup(int target_type, void* item)
- {
- if(target_type == TYPE_CHANNEL)
- OnChannelDelete((chanrec*)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);
- }
-
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
}
};
-
MODULE_INIT(ModuleKickNoRejoin)
projects / user / henk / code / inspircd.git / blobdiff