Fix single quotes in status breaking formatting

mattboy9921 · Jan 8, 2022 · 7e80665 · 7e80665
1 parent 576e46d
commit 7e80665
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/net/mattlabs/crewchat/messaging/Messages.java b/src/main/java/net/mattlabs/crewchat/messaging/Messages.java
@@ -1407,7 +1407,7 @@ public Component chatMessage(String prefix, String playerName, String time, Stri
         return Component.text()
                 .append(MessageUtil.reparse(MiniMessage.get().parse("<click:suggest_command:/msg " + playerName + " >" +
                         "<hover:show_text:'<white>" + time + "\n" +
-                        MessageUtil.sanitizeMessage(WordUtils.capitalize(this.status)) + ": " + status + "<reset>\n" +
+                        MessageUtil.sanitizeMessage(WordUtils.capitalize(this.status)) + ": " + MessageUtil.escapeSingleQuotes(status) + "<reset>\n" +
                         (isParty ? WordUtils.capitalize(MessageUtil.sanitizeMessage(party)) : MessageUtil.sanitizeMessage(WordUtils.capitalize(this.channel))) + ": " + "<" + textColor.asHexString() + ">" + activeChannel + "'>" +
                         (showChannelName ? "<gray>[</gray><" + textColor.asHexString() + ">" + activeChannel + "</color:" + textColor.asHexString() + "><gray>]</gray> " : "") +
                         chatMessageHeader + "<reset><" + textColor.asHexString() + ">",
@@ -1426,7 +1426,7 @@ public Component discordMessage(String discordHeader, String prefix, String play
         // [Discord] %prefix%%playerName%: %message%
         return Component.text()
                 .append(MessageUtil.reparse(MiniMessage.get().parse("<hover:show_text:'<white>" + time + "\n" +
-                        MessageUtil.sanitizeMessage(WordUtils.capitalize(this.status)) + ": " + status + "\n" +
+                        MessageUtil.sanitizeMessage(WordUtils.capitalize(this.status)) + ": " + MessageUtil.escapeSingleQuotes(status) + "\n" +
                         MessageUtil.sanitizeMessage(WordUtils.capitalize(this.channel)) + ": " + "<" + textColor.asHexString() + ">" + activeChannel + "'>" +
                         discordMessageHeader + "</hover>",
                 "discord", discordHeader,

diff --git a/src/main/java/net/mattlabs/crewchat/util/MessageUtil.java b/src/main/java/net/mattlabs/crewchat/util/MessageUtil.java
@@ -36,6 +36,11 @@ public static ArrayList<Player> getMentionedPlayers(String message, ArrayList<Pl
         return mentionedPlayers;
     }
 
+    // Parses strings for unescaped single quotes (') and escapes them
+    public static String escapeSingleQuotes(String message) {
+        return message.replaceAll("/(?<!\\\\)'/", "\\'");
+    }
+
     // Removes any legacy codes/MiniMessage tags
     public static String sanitizeMessage(String message) {
         message = MiniMessage.get().serialize(LegacyComponentSerializer.legacy('&').deserialize(message));