X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=e14530a92c889750860043d1cb00ecf0bcc58910;hb=d848034590bc402277da975b7efdbc78ce1722fc;hp=fdb7b8f2455fdcb8f8b5e913edaba0574f314705;hpb=0556720b559d7ec5d8badacf0ac9b11e9c864847;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index fdb7b8f24..e14530a92 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -1,13 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 A_D <A-UNDERSCORE-D@users.noreply.github.com>
+ *   Copyright (C) 2014 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   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>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *
  * 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
@@ -24,35 +27,92 @@
 
 
 #include "inspircd.h"
+#include "modules/invite.h"
 
-typedef std::map<std::string, time_t> delaylist;
+enum
+{
+	// From RFC 2182.
+	ERR_UNAVAILRESOURCE = 437
+};
 
-struct KickRejoinData
+
+class KickRejoinData
 {
-	delaylist kicked;
-	unsigned int delay;
+	struct KickedUser
+	{
+		std::string uuid;
+		time_t expire;
+
+		KickedUser(User* user, unsigned int Delay)
+			: uuid(user->uuid)
+			, expire(ServerInstance->Time() + Delay)
+		{
+		}
+	};
+
+	typedef std::vector<KickedUser> KickedList;
+
+	mutable KickedList kicked;
+
+ public:
+	const unsigned int delay;
 
 	KickRejoinData(unsigned int Delay) : delay(Delay) { }
+
+	bool canjoin(LocalUser* user) const
+	{
+		for (KickedList::iterator i = kicked.begin(); i != kicked.end(); )
+		{
+			KickedUser& rec = *i;
+			if (rec.expire > ServerInstance->Time())
+			{
+				if (rec.uuid == user->uuid)
+					return false;
+				++i;
+			}
+			else
+			{
+				// Expired record, remove.
+				stdalgo::vector::swaperase(kicked, i);
+				if (kicked.empty())
+					break;
+			}
+		}
+		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> >
 {
-	static const unsigned int max = 60;
+	const unsigned int max;
  public:
 	KickRejoin(Module* Creator)
 		: ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >(Creator, "kicknorejoin", 'J')
+		, max(60)
 	{
+		syntax = "<seconds>";
 	}
 
-	ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
 	{
-		int v = ConvToInt(parameter);
+		unsigned int v = ConvToNum<unsigned int>(parameter);
 		if (v <= 0)
+		{
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
+		}
 
-		if ((IS_LOCAL(source) && ((unsigned int)v > max)))
+		if (IS_LOCAL(source) && v > max)
 			v = max;
 
 		ext.set(channel, new KickRejoinData(v));
@@ -63,15 +123,22 @@ class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
 	{
 		out.append(ConvToStr(krd->delay));
 	}
+
+	std::string GetModuleSettings() const
+	{
+		return ConvToStr(max);
+	}
 };
 
 class ModuleKickNoRejoin : public Module
 {
 	KickRejoin kr;
+	Invite::API invapi;
 
 public:
 	ModuleKickNoRejoin()
 		: kr(this)
+		, invapi(this)
 	{
 	}
 
@@ -79,28 +146,11 @@ public:
 	{
 		if (chan)
 		{
-			KickRejoinData* data = kr.ext.get(chan);
-			if (data)
+			const KickRejoinData* data = kr.ext.get(chan);
+			if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user)))
 			{
-				delaylist& kicked = data->kicked;
-				for (delaylist::iterator iter = kicked.begin(); iter != kicked.end(); )
-				{
-					if (iter->second > ServerInstance->Time())
-					{
-						if (iter->first == user->uuid)
-						{
-							user->WriteNumeric(ERR_DELAYREJOIN, "%s :You must wait %u seconds after being kicked to rejoin (+J)",
-								chan->name.c_str(), data->delay);
-							return MOD_RES_DENY;
-						}
-						++iter;
-					}
-					else
-					{
-						// Expired record, remove.
-						kicked.erase(iter++);
-					}
-				}
+				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay));
+				return MOD_RES_DENY;
 			}
 		}
 		return MOD_RES_PASSTHRU;
@@ -114,13 +164,13 @@ public:
 		KickRejoinData* data = kr.ext.get(memb->chan);
 		if (data)
 		{
-			data->kicked[memb->user->uuid] = ServerInstance->Time() + data->delay;
+			data->add(memb->user);
 		}
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
+		return Version("Adds channel mode J (kicknorejoin) which prevents users from rejoining after being kicked from a channel.", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
 	}
 };