From 5f9ccd253879f3b68a8d3695a0f971975c5faca5 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 26 May 2021 15:22:08 -0400
Subject: [PATCH] chat filter: add clan chat

---
 .../plugins/chatfilter/ChatFilterConfig.java  | 21 +++++++++++++----
 .../plugins/chatfilter/ChatFilterPlugin.java  | 23 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
index 0ad1071f9d..326e8652d0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
@@ -110,11 +110,22 @@ public interface ChatFilterConfig extends Config
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "filterClanChat",
+		name = "Filter clan Chat Members",
+		description = "Filter your clan chat members' messages",
+		position = 7
+	)
+	default boolean filterClanChat()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "filterLogin",
 		name = "Filter Logged In/Out Messages",
 		description = "Filter your private chat to remove logged in/out messages",
-		position = 7
+		position = 8
 	)
 	default boolean filterLogin()
 	{
@@ -125,7 +136,7 @@ public interface ChatFilterConfig extends Config
 		keyName = "filterGameChat",
 		name = "Filter Game Chat",
 		description = "Filter your game chat messages",
-		position = 8
+		position = 9
 	)
 	default boolean filterGameChat()
 	{
@@ -136,7 +147,7 @@ public interface ChatFilterConfig extends Config
 		keyName = "collapseGameChat",
 		name = "Collapse Game Chat",
 		description = "Collapse duplicate game chat messages into a single line",
-		position = 9
+		position = 10
 	)
 	default boolean collapseGameChat()
 	{
@@ -147,7 +158,7 @@ public interface ChatFilterConfig extends Config
 		keyName = "collapsePlayerChat",
 		name = "Collapse Player Chat",
 		description = "Collapse duplicate player chat messages into a single line",
-		position = 10
+		position = 11
 	)
 	default boolean collapsePlayerChat()
 	{
@@ -158,7 +169,7 @@ public interface ChatFilterConfig extends Config
 		keyName = "maxRepeatedPublicChats",
 		name = "Repeat filter",
 		description = "Block player chat message if repeated this many times. 0 is off",
-		position = 11
+		position = 12
 	)
 	default int maxRepeatedPublicChats()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
index c7252a46b3..4cdcc62404 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
@@ -53,6 +53,7 @@ import net.runelite.api.Client;
 import net.runelite.api.FriendsChatManager;
 import net.runelite.api.MessageNode;
 import net.runelite.api.Player;
+import net.runelite.api.clan.ClanChannel;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.OverheadTextChanged;
 import net.runelite.api.events.ScriptCallbackEvent;
@@ -170,6 +171,8 @@ public class ChatFilterPlugin extends Plugin
 			case PRIVATECHAT:
 			case MODPRIVATECHAT:
 			case FRIENDSCHAT:
+			case CLAN_CHAT:
+			case CLAN_GUEST_CHAT:
 				if (shouldFilterPlayerMessage(Text.removeTags(name)))
 				{
 					message = censorMessage(name, message);
@@ -271,7 +274,8 @@ public class ChatFilterPlugin extends Plugin
 		boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName());
 		return !isMessageFromSelf &&
 			(config.filterFriends() || !client.isFriended(playerName, false)) &&
-			(config.filterFriendsChat() || !isFriendsChatMember(playerName));
+			(config.filterFriendsChat() || !isFriendsChatMember(playerName)) &&
+			(config.filterClanChat() || !isClanChatMember(playerName));
 	}
 
 	private boolean isFriendsChatMember(String name)
@@ -280,6 +284,23 @@ public class ChatFilterPlugin extends Plugin
 		return friendsChatManager != null && friendsChatManager.findByName(name) != null;
 	}
 
+	private boolean isClanChatMember(String name)
+	{
+		ClanChannel clanChannel = client.getClanChannel();
+		if (clanChannel != null && clanChannel.findMember(name) != null)
+		{
+			return true;
+		}
+
+		clanChannel = client.getGuestClanChannel();
+		if (clanChannel != null && clanChannel.findMember(name) != null)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	String censorMessage(final String username, final String message)
 	{
 		String strippedMessage = jagexPrintableCharMatcher.retainFrom(message)