fix(discord): fix bot not responding to mention prefixes in guilds

YappyBots · Feb 6, 2022 · 178e6ed · 178e6ed
1 parent 95d65fc
commit 178e6ed
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/Discord/Client.js b/lib/Discord/Client.js
@@ -190,19 +190,24 @@ class Client extends DiscordClient {
      */
     async execute(msg) {
         if (msg.author.equals(this.user) || msg.author.bot) return;
-        const prefix = msg.guild && Guild.getPrefix(msg.guild) || this.prefix;
+        const prefix = (msg.guild && Guild.getPrefix(msg.guild)) || this.prefix;
+
+        const userMention = this.user.toString();
+        const botMention = userMention.replace('@', '@!');
 
         if (
             msg.channel.type !== 'dm' &&
-            !msg.content.startsWith(this.user.toString()) &&
+            !msg.content.startsWith(userMention) &&
+            !msg.content.startsWith(botMention) &&
             !msg.content.startsWith(prefix) &&
             !msg.content.startsWith(this.prefix)
         )
             return false;
 
         const content =
             (msg.content.startsWith(prefix) && msg.content.replace(prefix, '')) ||
-            (msg.content.startsWith(this.user.toString()) && msg.content.replace(`${this.user.toString()} `, '')) ||
+            (msg.content.startsWith(userMention) && msg.content.replace(`${userMention} `, '')) ||
+            (msg.content.startsWith(botMention) && msg.content.replace(`${botMention} `, '')) ||
             (msg.content.startsWith(this.prefix) && msg.content.replace(this.prefix, '')) ||
             msg.content;
         const command = content.split(' ')[0].toLowerCase();