From 385fc777718ab5d61494c897d3cea53e972c4d4f Mon Sep 17 00:00:00 2001
From: abhiram <abhithegamer2019@gmail.com>
Date: Mon, 12 Apr 2021 15:44:51 +0530
Subject: [PATCH] [+] Done all the requested changes!

---
 pom.xml                                       |  6 +++---
 .../totalfreedommod/discord/Discord.java      | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index efac5a86..99eb47d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,9 +296,9 @@
                 <version>3.8.1</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <compilerVersion>11</compilerVersion>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index b38160be..40f47ebf 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -62,7 +62,7 @@ public class Discord extends FreedomService
     public ScheduledThreadPoolExecutor RATELIMIT_EXECUTOR;
     public List<CompletableFuture<Message>> sentMessages = new ArrayList<>();
     public Boolean enabled = false;
-    private final Pattern discord_mention_pattern = Pattern.compile("(<@!?([0-9]{16,20})>)");
+    private final Pattern DISCORD_MENTION_PATTERN = Pattern.compile("(<@!?([0-9]{16,20})>)");
 
     public static String getMD5(String string)
     {
@@ -412,11 +412,11 @@ public class Discord extends FreedomService
         }
 
         // Patch FS-191 start
-        Matcher mention_matcher = this.discord_mention_pattern.matcher(message);
+        Matcher DISCORD_MENTION_MATCHER = this.DISCORD_MENTION_PATTERN.matcher(message);
 
-        while (mention_matcher.find()) {
-            String mention = mention_matcher.group(1);
-            message = message.replace(mention, "[UserMention-redacted]");
+        while (DISCORD_MENTION_MATCHER.find()) {
+            String mention = DISCORD_MENTION_MATCHER.group(1);
+            message = message.replace(mention, mention.replace('@',' '));
         }
         // Patch FS-191 end
 
@@ -445,6 +445,15 @@ public class Discord extends FreedomService
             message = StringUtils.remove(message, "§");
         }
 
+        // Patch FS-191 start
+        Matcher DISCORD_MENTION_MATCHER = this.DISCORD_MENTION_PATTERN.matcher(message);
+
+        while (DISCORD_MENTION_MATCHER.find()) {
+            String mention = DISCORD_MENTION_MATCHER.group(1);
+            message = message.replace(mention, mention.replace('@',' '));
+        }
+        // Patch FS-191 end
+        
         if (enabled && !chat_channel_id.isEmpty())
         {
             CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(deformat(message)).submit(true);