Strip Discord Formatting & More Color Codes

Author: FireController1847

src/main/java/com/firecontroller1847/truediscordlink/DiscordManager.java

@@ -324,8 +324,8 @@ private void sendDiscordBotMessage(String content, boolean blocking, Player play
                 if (player != null) {
                     CompletableFuture<Message> future = channel.sendMessage(TrueDiscordLink.stripColorCodes(discordlink.getTranslation("messages.from_mc_bot_format", false,
                         new String[] { "%message%", content },
-                        new String[] { "%name%" , player.getName() },
-                        new String[] { "%displayName%", player.getDisplayName() },
+                        new String[] { "%name%" , TrueDiscordLink.escapeDiscordFormatting(player.getName()) },
+                        new String[] { "%displayName%", TrueDiscordLink.escapeDiscordFormatting(player.getDisplayName()) },
                         new String[] { "%uuid%", player.getUniqueId().toString() }
                     )));
                     if (blocking) {
@@ -362,8 +362,8 @@ private void sendDiscordWebhookMessage(String content, Player player) {
             if (player != null) {
                 this.makeWebhookRequest(url, TrueDiscordLink.stripColorCodes(discordlink.getTranslation("messages.from_mc_webhook_format", false,
                     new String[] { "%message%", content },
-                    new String[] { "%name%" , player.getName() },
-                    new String[] { "%displayName%", player.getDisplayName() },
+                    new String[] { "%name%" , TrueDiscordLink.escapeDiscordFormatting(player.getName()) },
+                    new String[] { "%displayName%", TrueDiscordLink.escapeDiscordFormatting(player.getDisplayName()) },
                     new String[] { "%uuid%", player.getUniqueId().toString() }
                 )), TrueDiscordLink.stripColorCodes(player.getDisplayName()), skin); // TODO: Why is the username not customizable
             } else {

src/main/java/com/firecontroller1847/truediscordlink/TrueDiscordLink.java

@@ -101,7 +101,7 @@ private void migrateConfigurations() throws IOException {
     }
 
     // Escapes formatting for Discord messages
-    public String escapeDiscordFormatting(String content) {
+    public static String escapeDiscordFormatting(String content) {
         return content.replace("*", "\\*").replace("_", "\\_").replace("~", "\\~");
     }
 

src/main/java/com/firecontroller1847/truediscordlink/listeners/discord/DiscordChatListener.java

@@ -120,7 +120,7 @@ public void onMessageCreate(MessageCreateEvent event) {
                             // Placeholder API
                             if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
                                 value = PlaceholderAPI.setPlaceholders(null, value);
-                                value = TrueDiscordLink.stripColorCodes(value);
+                                value = TrueDiscordLink.escapeDiscordFormatting(TrueDiscordLink.stripColorCodes(value));
                             }
 
                             // Send Message

src/main/java/com/firecontroller1847/truediscordlink/listeners/minecraft/PlayerDeathListener.java

@@ -26,8 +26,8 @@ public void onPlayerDeath(PlayerDeathEvent event) {
         discordlink.getDiscordManager().sendDiscordMessage(
             discordlink.getTranslation("events.player_death", false,
                 new String[] { "%message%", event.getDeathMessage() },
-                new String[] { "%name%", event.getEntity().getName() },
-                new String[] { "%displayName%", event.getEntity().getDisplayName() },
+                new String[] { "%name%", TrueDiscordLink.escapeDiscordFormatting(TrueDiscordLink.stripColorCodes(event.getEntity().getName())) },
+                new String[] { "%displayName%", TrueDiscordLink.escapeDiscordFormatting(TrueDiscordLink.stripColorCodes(event.getEntity().getDisplayName())) },
                 new String[] { "%uuid%", event.getEntity().getUniqueId().toString() }
             )
         );

src/main/java/com/firecontroller1847/truediscordlink/listeners/minecraft/PlayerJoinListener.java

@@ -25,8 +25,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
         // Send Discord Message
         discordlink.getDiscordManager().sendDiscordMessage(
             discordlink.getTranslation("events.player_join", false,
-                new String[] { "%name%", event.getPlayer().getName() },
-                new String[] { "%displayName%", event.getPlayer().getDisplayName() },
+                new String[] { "%name%", TrueDiscordLink.escapeDiscordFormatting(event.getPlayer().getName()) },
+                new String[] { "%displayName%", TrueDiscordLink.escapeDiscordFormatting(event.getPlayer().getDisplayName()) },
                 new String[] { "%uuid%", event.getPlayer().getUniqueId().toString() }
             )
         );

src/main/java/com/firecontroller1847/truediscordlink/listeners/minecraft/PlayerQuitListener.java

@@ -25,8 +25,8 @@ public void onPlayerQuit(PlayerQuitEvent event) {
         // Send Discord Message
         discordlink.getDiscordManager().sendDiscordMessage(
             discordlink.getTranslation("events.player_quit", false,
-                new String[] { "%name%", event.getPlayer().getName() },
-                new String[] { "%displayName%", event.getPlayer().getDisplayName() },
+                new String[] { "%name%", TrueDiscordLink.escapeDiscordFormatting(event.getPlayer().getName()) },
+                new String[] { "%displayName%", TrueDiscordLink.escapeDiscordFormatting(event.getPlayer().getDisplayName()) },
                 new String[] { "%uuid%", event.getPlayer().getUniqueId().toString() }
             )
         );