From 9499c365ea019d593187bd1db12ead9952c38a52 Mon Sep 17 00:00:00 2001
From: Sean Patiag <spatiag@uci.edu>
Date: Mon, 14 Sep 2020 20:33:08 -0700
Subject: [PATCH] chatfilter: Add option to filter game chat

---
 .../plugins/chatfilter/ChatFilterConfig.java       | 11 +++++++++++
 .../plugins/chatfilter/ChatFilterPlugin.java       | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

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 b5d7cf3f77..2b9a45c2e9 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
@@ -121,6 +121,17 @@ public interface ChatFilterConfig extends Config
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "filterGameChat",
+		name = "Filter Game Chat",
+		description = "Filter your game chat messages",
+		position = 8
+	)
+	default boolean filterGameChat()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "collapseGameChat",
 		name = "Collapse Game Chat",
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 1e413ea759..57be625ee4 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
@@ -179,6 +179,18 @@ public class ChatFilterPlugin extends Plugin
 					blockMessage = message == null;
 				}
 				break;
+			case GAMEMESSAGE:
+			case ENGINE:
+			case ITEM_EXAMINE:
+			case NPC_EXAMINE:
+			case OBJECT_EXAMINE:
+			case SPAM:
+				if (config.filterGameChat())
+				{
+					message = censorMessage(null, message);
+					blockMessage = message == null;
+				}
+				break;
 			case LOGINLOGOUTNOTIFICATION:
 				if (config.filterLogin())
 				{
@@ -269,7 +281,7 @@ public class ChatFilterPlugin extends Plugin
 	{
 		String strippedMessage = jagexPrintableCharMatcher.retainFrom(message)
 			.replace('\u00A0', ' ');
-		if (shouldFilterByName(username))
+		if (username != null && shouldFilterByName(username))
 		{
 			switch (config.filterType())
 			{