From 56b4dc61e49e4218544f51ac9a25ab3ece60a782 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Wed, 13 Jan 2021 00:05:17 +0000
Subject: Add a shun option to only apply when users are fully connected.

Closes #1825.
---
 docs/conf/modules.conf.example | 4 ++++
 src/modules/m_shun.cpp         | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 1faec808c..0a85ef5ca 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -2185,6 +2185,9 @@
 #               option is deprecated; you should instead give exempt
 #               server operators the servers/ignore-shun privilege.
 #
+#  allowconnect: Whether to only apply shuns to users who are fully
+#                connected to the server.
+#
 #  allowtags: Whether to allow client tags to be attached to enabled
 #             commands.
 #
@@ -2201,6 +2204,7 @@
 #<shun enabledcommands="ADMIN OPER PING PONG QUIT PART JOIN"
 #      cleanedcommands="AWAY PART QUIT"
 #      affectopers="no"
+#      allowconnect="no"
 #      allowtags="no"
 #      notifyuser="yes">
 
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 1c64fd76c..d067d1523 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -156,11 +156,16 @@ class ModuleShun : public Module, public Stats::EventListener
 	insp::flat_set<std::string, irc::insensitive_swo> cleanedcommands;
 	insp::flat_set<std::string, irc::insensitive_swo> enabledcommands;
 	bool affectopers;
+	bool allowconnect;
 	bool allowtags;
 	bool notifyuser;
 
 	bool IsShunned(LocalUser* user)
 	{
+		// Exempt the user if they are not fully connected and allowconnect is enabled.
+		if (allowconnect && user->registered != REG_ALL)
+			return false;
+
 		// Exempt the user from shuns if they are an oper and affectopers is disabled.
 		if (!affectopers && user->IsOper())
 			return false;
@@ -222,6 +227,7 @@ class ModuleShun : public Module, public Stats::EventListener
 
 		affectopers = tag->getBool("affectopers", false);
 		allowtags = tag->getBool("allowtags");
+		allowconnect = tag->getBool("allowconnect");
 		notifyuser = tag->getBool("notifyuser", true);
 	}
 
-- 
cgit v1.2.3