From ebcce14b5f0c76a92e8143f7c92523342fa86eaf Mon Sep 17 00:00:00 2001
From: unilock <unilock@fennet.rentals>
Date: Sat, 6 Apr 2024 09:22:02 -0400
Subject: [PATCH] Treat Discord username, nickname, message as literal text

Prevents parsing tags unintentionally

Signed-off-by: unilock <unilock@fennet.rentals>
---
 .../cc/unilock/nilcord/util/TextUtils.java    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/unilock/nilcord/util/TextUtils.java b/src/main/java/cc/unilock/nilcord/util/TextUtils.java
index fd0c813..546c8e9 100644
--- a/src/main/java/cc/unilock/nilcord/util/TextUtils.java
+++ b/src/main/java/cc/unilock/nilcord/util/TextUtils.java
@@ -26,14 +26,14 @@ public static Text parseDiscordMessage(String template, String attachmentChunk,
         template = template
                 .replace("<attachment_format>", attachmentChunk)
                 .replace("<username_format>", usernameChunk)
-                .replace("<username>", author.getName())
-                .replace("<nickname>", member.getEffectiveName())
                 .replace("<role_color>", ColorUtils.getHexColor(member))
-                .replace("<message>", message.getContentDisplay())
                 .replace("<message_url>", message.getJumpUrl());
 
         Map<String, Text> placeholders = Map.of(
-                "reply_format", replyChunk
+                "reply_format", replyChunk,
+                "username", Text.literal(author.getName()),
+                "nickname", Text.literal(member.getEffectiveName()),
+                "message", Text.literal(message.getContentDisplay())
         );
 
         return Placeholders.parseText(parse(template), ANGLE_BRACKETS, placeholders);
@@ -44,13 +44,16 @@ public static Text parseDiscordReply(String template, Message refMessage) {
         Member refMember = refMessage.getMember();
 
         template = template
-                .replace("<reply_username>", refAuthor.getName())
-                .replace("<reply_nickname>", refMember == null ? refAuthor.getEffectiveName() : refMember.getEffectiveName())
                 .replace("<reply_role_color>", refMember == null ? ColorUtils.WHITE : ColorUtils.getHexColor(refMember))
-                .replace("<reply_message>", refMessage.getContentDisplay())
                 .replace("<reply_url>", refMessage.getJumpUrl());
 
-        return parse(template);
+        Map<String, Text> placeholders = Map.of(
+                "reply_username", Text.literal(refAuthor.getName()),
+                "reply_nickname", Text.literal(refMember == null ? refAuthor.getEffectiveName() : refMember.getEffectiveName()),
+                "reply_message", Text.literal(refMessage.getContentDisplay())
+        );
+
+        return Placeholders.parseText(parse(template), ANGLE_BRACKETS, placeholders);
     }
 
     public static Text parsePlayer(String template, ServerPlayerEntity player) {