X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_join.cpp;h=ee479771616dc227d75d42eaf391d14b9325dd4a;hb=a30a0074edac353cb60e134b43fa8ff0ffb67f8b;hp=fdcf82dccdd3a6066350bb52a012fa1c4c42cfe6;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index fdcf82dcc..ee4797716 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2014 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Craig Edwards <brain@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
@@ -22,37 +27,94 @@
 
 #include "inspircd.h"
 
+static void JoinChannels(LocalUser* u, const std::string& chanlist)
+{
+	irc::commasepstream chans(chanlist);
+	std::string chan;
+
+	while (chans.GetToken(chan))
+	{
+		if (ServerInstance->IsChannel(chan))
+			Channel::JoinUser(u, chan);
+	}
+}
+
+class JoinTimer : public Timer
+{
+ private:
+	LocalUser* const user;
+	const std::string channels;
+	SimpleExtItem<JoinTimer>& ext;
+
+ public:
+	JoinTimer(LocalUser* u, SimpleExtItem<JoinTimer>& ex, const std::string& chans, unsigned int delay)
+		: Timer(delay, false)
+		, user(u), channels(chans), ext(ex)
+	{
+		ServerInstance->Timers.AddTimer(this);
+	}
+
+	bool Tick(time_t time) CXX11_OVERRIDE
+	{
+		if (user->chans.empty())
+			JoinChannels(user, channels);
+
+		ext.unset(user);
+		return false;
+	}
+};
+
 class ModuleConnJoin : public Module
 {
-	public:
-		void Prioritize()
-		{
-			ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
-		}
+	SimpleExtItem<JoinTimer> ext;
+	std::string defchans;
+	unsigned int defdelay;
 
-		Version GetVersion() CXX11_OVERRIDE
-		{
-			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
-		}
+ public:
+	ModuleConnJoin()
+		: ext("join_timer", ExtensionItem::EXT_USER, this)
+	{
+	}
 
-		void OnPostConnect(User* user) CXX11_OVERRIDE
-		{
-			LocalUser* localuser = IS_LOCAL(user);
-			if (!localuser)
-				return;
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin");
+		defchans = tag->getString("channel");
+		defdelay = tag->getDuration("delay", 0, 0, 60*15);
+	}
 
-			std::string chanlist = ServerInstance->Config->ConfValue("autojoin")->getString("channel");
-			chanlist = localuser->GetClass()->config->getString("autojoin", chanlist);
+	void Prioritize() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
+	}
 
-			irc::commasepstream chans(chanlist);
-			std::string chan;
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Allows the server administrator to force users to join one or more channels on connect.", VF_VENDOR);
+	}
 
-			while (chans.GetToken(chan))
-			{
-				if (ServerInstance->IsChannel(chan))
-					Channel::JoinUser(localuser, chan);
-			}
+	void OnPostConnect(User* user) CXX11_OVERRIDE
+	{
+		LocalUser* localuser = IS_LOCAL(user);
+		if (!localuser)
+			return;
+
+		std::string chanlist = localuser->GetClass()->config->getString("autojoin");
+		unsigned int chandelay = localuser->GetClass()->config->getDuration("autojoindelay", 0, 0, 60*15);
+
+		if (chanlist.empty())
+		{
+			if (defchans.empty())
+				return;
+			chanlist = defchans;
+			chandelay = defdelay;
 		}
+
+		if (!chandelay)
+			JoinChannels(localuser, chanlist);
+		else
+			ext.set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay));
+	}
 };
 
 MODULE_INIT(ModuleConnJoin)