Merge pull request #289 from Kathund/fix-blacklist

Fix blacklist
DuckySoLucky · Dec 25, 2024 · ec88d00 · ec88d00
2 parents 095f002 + 640a4eb
commit ec88d00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/discord/commands/blacklistCommand.js b/src/discord/commands/blacklistCommand.js
@@ -1,4 +1,5 @@
 const HypixelDiscordChatBridgeError = require("../../contracts/errorHandler.js");
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 const { SuccessEmbed } = require("../../contracts/embedHandler.js");
 
 module.exports = {
@@ -35,13 +36,17 @@ module.exports = {
     const name = interaction.options.getString("username");
     const arg = interaction.options.getString("arg").toLowerCase();
 
+    bot.chat("/lobby megawalls");
+    await delay(250);
     if (arg == "add") {
       bot.chat(`/ignore add ${name}`);
     } else if (arg == "remove") {
       bot.chat(`/ignore remove ${name}`);
     } else {
       throw new HypixelDiscordChatBridgeError("Invalid Usage: `/ignore [add/remove] [name]`.");
     }
+    await delay(250);
+    bot.chat("/limbo");
 
     const embed = new SuccessEmbed(
       `Successfully ${arg == "add" ? "added" : "removed"} \`${name}\` ${arg == "add" ? "to" : "from"} the blacklist.`,

diff --git a/src/minecraft/handlers/ChatHandler.js b/src/minecraft/handlers/ChatHandler.js
@@ -848,16 +848,17 @@ class StateHandler extends eventHandler {
 
   isAlreadyBlacklistedMessage(message) {
     return (
-      message.includes(`You've already ignored that player! /ignore remove Player to unignore them!`) &&
+      message.includes(`You've already blocked that player! /block remove <player> to unblock them!`) &&
       !message.includes(":")
     );
   }
+
   isBlacklistRemovedMessage(message) {
-    return message.startsWith("Removed") && message.includes("from your ignore list.") && !message.includes(":");
+    return message.startsWith("Unblocked") && message.endsWith(".") && !message.includes(":");
   }
 
   isBlacklistMessage(message) {
-    return message.startsWith("Added") && message.includes("to your ignore list.") && !message.includes(":");
+    return message.startsWith("Blocked") && message.endsWith(".") && !message.includes(":");
   }
 
   isGuildMessage(message) {
@@ -1082,7 +1083,7 @@ class StateHandler extends eventHandler {
         return;
       }
 
-      const linkedUser = Object.values(linked).find((u) => player)
+      const linkedUser = Object.values(linked).find((u) => player);
       if (linkedUser === undefined) {
         return;
       }