fix up the feature

Polyfrost · Jun 18, 2024 · 4687cc7 · 4687cc7
1 parent b503bca
commit 4687cc7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java b/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java
@@ -172,19 +172,12 @@ public class HytilsConfig extends Config {
     public static boolean autoPartyWarpConfirm;
 
     @Switch(
-        name = "Auto Reply when AFK",
-        description = "Automatically sends a reply of your choosing when you are AFK in Limbo.",
+        name = "Auto Reply When AFK",
+        description = "Automatically sends a reply to anyone who PMs you when you are AFK in Limbo.",
         category = "Chat", subcategory = "Automatic"
     )
     public static boolean autoReplyAfk;
 
-    @Text(
-        name = "Auto Reply Message",
-        category = "Chat", subcategory = "Automatic",
-        size = 2
-    )
-    public static String autoReplyAfkMessage = "Hey, I am currently AFK!";
-
     @Switch(
         name = "Game Status Restyle",
         description = "Replace common game status messages with a new style.\n§eExamples:\n§a§l+ §bSteve §e(§b1§e/§b12§e)\n§c§l- §bSteve§r\n§e§l* §aGame starts in §b§l5 §aseconds.",

diff --git a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoAfkReply.java b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoAfkReply.java
@@ -27,13 +27,14 @@
 import java.util.regex.Matcher;
 
 public class AutoAfkReply implements ChatReceiveModule {
+    // TODO: maybe write a general afk checker for skyblock afkers, as they won't be in limbo
     @Override
     public void onMessageReceived(@NotNull ClientChatReceivedEvent event) {
         if (getLocraw() != null && !getLocraw().getServerId().equals("limbo")) return;
-        String message = event.message.getFormattedText();
+        String message = event.message.getUnformattedText();
         Matcher matcher = getLanguage().autoAfkReplyPatternRegex.matcher(message);
-        if (matcher.find(0)) {
-            UChat.say("/r " + HytilsConfig.autoReplyAfkMessage);
+        if (matcher.matches()) {
+            UChat.say("/msg " + matcher.group(2) + " Hey "  + matcher.group(2) + ", I am currently AFK!");
         }
     }
 

diff --git a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java
@@ -35,7 +35,7 @@ public class LanguageData {
     private String autoQueuePrefixGlobal = "^(?:You died! .+|YOU DIED! .+|You have been eliminated!|You won! .+|YOU WON! .+)$";
 
     private String autoFriendPattern = "Friend request from (?<name>.+)\\[ACCEPT] - \\[DENY] - \\[IGNORE].*";
-    private String autoAfkReplyPattern = "^§dFrom (?<prefix>.+): §r(?<message>§7.*)(?:§r)?$";
+    private String autoAfkReplyPattern = "^From (\\[.+?] )?(.+?): .+$";
 
     private String chatCleanerJoin = "(?:sled into|slid into|joined|spooked into) the lobby";
     private String chatCleanerTicketAnnouncer = "^(?<player>(?!You )\\w{1,16} )has found an? .+$";