From d200e8ab92ab20c54050a7beb1190fa9a289ab3e Mon Sep 17 00:00:00 2001
From: RezzedUp <RezzedUp@users.noreply.github.com>
Date: Sun, 12 Dec 2021 20:52:49 -0600
Subject: [PATCH] Escape placeholder text. Update dependencies. Bump version.
 Fixes #31 and #32.

---
 pom.xml                                                    | 4 ++--
 .../discordsrv/staffchat/util/MappedPlaceholder.java       | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85590dc..1af2839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.rezzedup</groupId>
     <artifactId>discordsrv-staff-chat</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
 
     <name>DiscordSRV-Staff-Chat</name>
     <inceptionYear>2017</inceptionYear>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- DiscordSRV (via scarsz-nexus) -->
diff --git a/src/main/java/com/rezzedup/discordsrv/staffchat/util/MappedPlaceholder.java b/src/main/java/com/rezzedup/discordsrv/staffchat/util/MappedPlaceholder.java
index 43c18d1..9483264 100644
--- a/src/main/java/com/rezzedup/discordsrv/staffchat/util/MappedPlaceholder.java
+++ b/src/main/java/com/rezzedup/discordsrv/staffchat/util/MappedPlaceholder.java
@@ -51,11 +51,16 @@ public String get(@NullOr String placeholder)
         return (result == null) ? "" : String.valueOf(result);
     }
     
+    private static String escape(String literal)
+    {
+        return literal.replace("\\", "\\\\").replace("$", "\\$");
+    }
+    
     public String update(String message)
     {
         return PATTERN.matcher(message).replaceAll(mr -> {
             String value = get(mr.group(1));
-            return (value.isEmpty()) ? mr.group() : value;
+            return escape((value.isEmpty()) ? mr.group() : value);
         });
     }