nyx

commit 49e5bee0d4466684b45add71b28dbf9137f31323
parent a0f9dff2bf7b2a19ee220b6754a684432f5e5bd3
Author: night0721 <[email protected]>
Date:   Sun, 13 Jun 2021 00:53:58 +0800

ban&unban bug fix, err embed now del after 15s

Diffstat:
M
commands/Moderation/ban.js
 | 
66
+++++++++++++++++++++++++++++++++++++++++++-----------------------
M
commands/Moderation/unban.js
 | 
2
+-
M
util/err.js
 | 
2
+-

3 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js
@@ -18,7 +18,26 @@ module.exports = {
     let reason = args.slice(1).join(" ") || "No reason provided";
     if (!target) {
       try {
-        target = await client.users.fetch(args[0]);
+        const one = await client.users.fetch(args[0]);
+        if (one.id === message.author.id)
+          return client.err(message, "Moderation", "ban", 2);
+        if (reason.length > 1024) reason = reason.slice(0, 1021) + "...";
+        const embed = new MessageEmbed()
+          .setTitle("User Banned")
+          .addField("**Moderator**", message.author.tag, true)
+          .addField("**User**", one.tag, true)
+          .addField("**Reason**", reason, true)
+          .setFooter(
+            message.member.displayName || message.author.username,
+            message.author.displayAvatarURL({ dynamic: true })
+          )
+          .setThumbnail(client.user.displayAvatarURL())
+          .setColor(client.color)
+          .setTimestamp();
+        message.inlineReply(embed);
+        await message.guild.members.ban(one.id, {
+          reason: reason,
+        });
       } catch (e) {
         console.log(e);
         return client.err(message, "Moderation", "ban", 1);
@@ -32,28 +51,29 @@ module.exports = {
         message.guild.me.roles.highest.position < target.roles.highest.position
       )
         return client.err(message, "Moderation", "ban", 9);
-    }
-    if (reason.length > 1024) reason = reason.slice(0, 1021) + "...";
-    try {
-      const embed = new MessageEmbed()
-        .setTitle("User Banned")
-        .addField("**Moderator**", message.author.tag, true)
-        .addField("**User**", target.user.tag, true)
-        .addField("**Reason**", reason, true)
-        .setFooter(
-          message.member.displayName || message.author.username,
-          message.author.displayAvatarURL({ dynamic: true })
-        )
-        .setThumbnail(client.user.displayAvatarURL())
-        .setColor(client.color)
-        .setTimestamp();
-      message.inlineReply(embed);
-      await message.guild.members.ban(target.id, {
-        reason: reason,
-      });
-    } catch (e) {
-      console.log(e);
-      return client.err(message, "Moderation", "ban", 999);
+
+      if (reason.length > 1024) reason = reason.slice(0, 1021) + "...";
+      try {
+        const embed = new MessageEmbed()
+          .setTitle("User Banned")
+          .addField("**Moderator**", message.author.tag, true)
+          .addField("**User**", target.user.tag, true)
+          .addField("**Reason**", reason, true)
+          .setFooter(
+            message.member.displayName || message.author.username,
+            message.author.displayAvatarURL({ dynamic: true })
+          )
+          .setThumbnail(client.user.displayAvatarURL())
+          .setColor(client.color)
+          .setTimestamp();
+        message.inlineReply(embed);
+        await message.guild.members.ban(target.id, {
+          reason: reason,
+        });
+      } catch (e) {
+        console.log(e);
+        return client.err(message, "Moderation", "ban", 999);
+      }
     }
   },
 };
diff --git a/commands/Moderation/unban.js b/commands/Moderation/unban.js
@@ -18,7 +18,7 @@ module.exports = {
       const embed = new MessageEmbed()
         .setTitle("User Unbanned")
         .addField("**Moderator**", message.author.tag, true)
-        .addField("**User**", user.user.tag, true)
+        .addField("**User**", user.tag, true)
         .setFooter(
           message.member.displayName || message.author.username,
           message.author.displayAvatarURL({ dynamic: true })
diff --git a/util/err.js b/util/err.js
@@ -203,5 +203,5 @@ module.exports = async (message, dir, file, err) => {
     .setThumbnail(client.user.displayAvatarURL({ dynamic: false }))
     .setURL(client.web)
     .setFooter(`Made by ${client.author}`);
-  message.inlineReply(embed).then(msg => msg.delete({ timeout: 10000 }));
+  message.inlineReply(embed).then(msg => msg.delete({ timeout: 15000 }));
 };