Merge pull request #23 from saiteja-madha/bug-fixes

warn context permissions, unmute command fix
saiteja-madha · Sep 24, 2021 · 2bfa33c · 2bfa33c
2 parents bc3365c + 097fcee
commit 2bfa33c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/src/commands/moderation/warn.js b/src/commands/moderation/warn.js
@@ -17,6 +17,7 @@ module.exports = class Warn extends Command {
       },
       contextMenu: {
         enabled: true,
+        userPermissions: ["KICK_MEMBERS"],
         type: "USER",
       },
     });
@@ -53,7 +54,7 @@ module.exports = class Warn extends Command {
   async contextRun(interaction) {
     const target = (await interaction.guild.members.fetch(interaction.targetId)) || interaction.member;
     if (!canInteract(interaction.member, target, "warn")) {
-      interaction.followUp("Missing permission to warn this member");
+      return interaction.followUp("Missing permission to warn this member");
     }
     let status = await addModAction(interaction.member, target, "", "WARN");
     if (status) interaction.followUp(`${target.user.tag} is warned by ${interaction.member.user.tag}`);

diff --git a/src/events/interactions/interactionCreate.js b/src/events/interactions/interactionCreate.js
@@ -16,6 +16,14 @@ module.exports = async (client, interaction) => {
     // get the slash command
     const command = client.slashCommands.get(interaction.commandName);
 
+    // Permission check
+    if (!interaction.member.permissions.has(command.slashCommand.userPermissions || [])) {
+      interaction.reply({
+        content: `You do not have enough permissions to use this command`,
+        ephemeral: true,
+      });
+    }
+
     // cooldown check
     if (command.cooldown > 0) {
       const remaining = command.getRemainingCooldown(interaction.member.id);
@@ -49,6 +57,14 @@ module.exports = async (client, interaction) => {
     // get the context menu
     const command = client.contextMenus.get(interaction.commandName);
 
+    // Permission check
+    if (!interaction.member.permissions.has(command.contextMenu.userPermissions || [])) {
+      return interaction.reply({
+        content: `You do not have enough permissions to use this command`,
+        ephemeral: true,
+      });
+    }
+
     // cooldown check
     if (command.cooldown > 0) {
       const remaining = command.getRemainingCooldown(interaction.user.id);

diff --git a/src/schemas/modlog-schema.js b/src/schemas/modlog-schema.js
@@ -70,10 +70,10 @@ module.exports = {
       member_id: targetId,
       type: "MUTE",
       "data.current": true,
-    }),
+    }).lean({ defaults: true }),
 
   removeMutes: async (guildId, targetId) =>
-    Model.updateOne(
+    Model.updateMany(
       {
         guild_id: guildId,
         member_id: targetId,

diff --git a/src/utils/modUtils.js b/src/utils/modUtils.js
@@ -198,21 +198,12 @@ async function muteTarget(issuer, target, reason) {
   const previousMute = await getMuteInfo(issuer.guild.id, target.id);
 
   if (previousMute) {
-    // maybe role was manually removed (so delete mute data)
-    if (!hasMutedRole(target)) await removeMutes(target.guild.id, target.id);
-    else {
-      if (previousMute.data?.isPermanent) {
-        return "ALREADY_MUTED"; // already muted
-      }
-
-      if (previousMute.data?.expires) {
-        await removeMutes(target.guild.id, target.id);
-      }
-    }
+    if (previousMute.data?.isPermanent && hasMutedRole(target)) return "ALREADY_MUTED"; // already muted
+    await removeMutes(target.guild.id, target.id); // remove existing tempmute data
   }
 
   try {
-    await target.roles.add(mutedRole);
+    if (!hasMutedRole(target)) await target.roles.add(mutedRole);
     await logModeration(issuer, target, reason, "Mute", { isPermanent: true });
     return true;
   } catch (ex) {
@@ -236,7 +227,7 @@ async function unmuteTarget(issuer, target, reason) {
   let mutedRole = getRoleByName(issuer.guild, "muted");
   try {
     await removeMutes(issuer.guild.id, target.id);
-    if (target.roles.cache.has(mutedRole)) await target.roles.remove(mutedRole);
+    if (hasMutedRole(target)) await target.roles.remove(mutedRole);
     await logModeration(issuer, target, reason, "Unmute");
     return true;
   } catch (ex) {
@@ -379,31 +370,23 @@ async function logModeration(issuer, target, reason, type, data = {}) {
 async function addModAction(issuer, target, reason, action) {
   switch (action) {
     case "WARN":
-      await warnTarget(issuer, target, reason);
-      break;
+      return await warnTarget(issuer, target, reason);
 
     case "MUTE":
-      await muteTarget(issuer, target, reason);
-      break;
+      return await muteTarget(issuer, target, reason);
 
     case "UNMUTE":
-      await unmuteTarget(issuer, target, reason);
-      break;
+      return await unmuteTarget(issuer, target, reason);
 
     case "KICK":
-      await kickTarget(issuer, target, reason);
-      break;
+      return await kickTarget(issuer, target, reason);
 
     case "SOFTBAN":
-      await softbanTarget(issuer, target, reason);
-      break;
+      return await softbanTarget(issuer, target, reason);
 
     case "BAN":
-      await banTarget(issuer, target, reason);
-      break;
+      return await banTarget(issuer, target, reason);
   }
-
-  return true;
 }
 
 module.exports = {