From bf48c994bedb0ba60c10362ea39f8c294debd324 Mon Sep 17 00:00:00 2001
From: Anonymous <28690521+TheShadowGamer@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:56:39 -0400
Subject: [PATCH] v2.0.5

---
 commands/info/inviteinfo.js       |  2 +-
 commands/info/userinfo.js         |  2 +-
 commands/invites/addinvites.js    |  2 +-
 commands/invites/leaderboard.js   | 10 ++++++++--
 commands/invites/removeinvites.js |  2 +-
 commands/invites/resetinvites.js  |  2 +-
 package-lock.json                 |  2 +-
 package.json                      |  2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/commands/info/inviteinfo.js b/commands/info/inviteinfo.js
index 6b73ae0..4070e72 100644
--- a/commands/info/inviteinfo.js
+++ b/commands/info/inviteinfo.js
@@ -22,7 +22,7 @@ module.exports = class InviteInfoCommand extends Command {
                 }
             ],
             userPermissions(message) {
-                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites')) return 'Manage Invites';
+                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') && !message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
                 return null;
             }
         });
diff --git a/commands/info/userinfo.js b/commands/info/userinfo.js
index 034acbe..5107742 100644
--- a/commands/info/userinfo.js
+++ b/commands/info/userinfo.js
@@ -22,7 +22,7 @@ module.exports = class UserInfoCommand extends Command {
                 }
             ],
             userPermissions(message) {
-                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites')) return 'Manage Invites';
+                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') && !message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
                 return null;
             }
         });
diff --git a/commands/invites/addinvites.js b/commands/invites/addinvites.js
index 523ec7a..4f9a490 100644
--- a/commands/invites/addinvites.js
+++ b/commands/invites/addinvites.js
@@ -29,7 +29,7 @@ module.exports = class AddInvitesCommand extends Command {
                 }
             ],
             userPermissions(message) {
-                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') || message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
+                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') && !message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
                 return null;
             }
         });
diff --git a/commands/invites/leaderboard.js b/commands/invites/leaderboard.js
index f2c9dbe..081c4d9 100644
--- a/commands/invites/leaderboard.js
+++ b/commands/invites/leaderboard.js
@@ -22,9 +22,12 @@ module.exports = class LeaderboardCommand extends Command {
         .setColor(client.config.colors.main);
         const all = await invites.findAll({order: [['invites', 'DESC']], limit: 10, where: {guildID: message.guild.id}});
         let LB = [];
+        let i = 0
         await all.forEach(async entry => {
             if(!entry.invites) return;
-            LB.push(`${LB.length + 1}. ${(await (client.users.fetch(entry.discordUser))).tag} - ${entry.invites}`);
+            let user = await client.users.fetch(entry.discordUser)
+            i++
+            LB.push(`${i}. **${user.username}**#${user.discriminator} - ${entry.invites}`);
         });
         if(LB.length === 0) {embed.setDescription('No one in this server has any invites!')} else {embed.setDescription(`Here are the top ${LB.length} inviters!\n${LB.join('\n')}`)}
         message.channel.send(embed);
@@ -39,9 +42,12 @@ module.exports.slashCommand = async (client, interaction, args, respond) => {
     .setColor(client.config.colors.main);
     const all = await invites.findAll({order: [['invites', 'DESC']], limit: 10, where: {guildID: interaction.guild.id}});
     let LB = [];
+    let i = 0
     await all.forEach(async entry => {
         if(!entry.invites) return;
-        LB.push(`${LB.length + 1}. ${(await (client.users.fetch(entry.discordUser))).tag} - ${entry.invites}`);
+        let user = await client.users.fetch(entry.discordUser)
+        i++
+        LB.push(`${i}. **${user.username}**#${user.discriminator} - ${entry.invites}`);
     });
     if(LB.length === 0) {embed.setDescription('No one in this server has any invites!')} else {embed.setDescription(`Here are the top ${LB.length} inviters!\n${LB.join('\n')}`)}
     respond({embeds: [embed]});
diff --git a/commands/invites/removeinvites.js b/commands/invites/removeinvites.js
index 377145b..18430ee 100644
--- a/commands/invites/removeinvites.js
+++ b/commands/invites/removeinvites.js
@@ -29,7 +29,7 @@ module.exports = class RemoveInvitesCommand extends Command {
                 }
             ],
             userPermissions(message) {
-                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') || message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
+                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') && !message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
                 return null;
             }
         });
diff --git a/commands/invites/resetinvites.js b/commands/invites/resetinvites.js
index 966aab0..2bb49f8 100644
--- a/commands/invites/resetinvites.js
+++ b/commands/invites/resetinvites.js
@@ -21,7 +21,7 @@ module.exports = class ResetInvitesCommand extends Command {
                 }
             ],
             userPermissions(message) {
-                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') || message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
+                if(!message.member.roles.cache.some(role => role.name === 'Manage Invites') && !message.member.permissions.has(['BAN_MEMBERS', 'KICK_MEMBERS', 'MANAGE_GUILD', 'MANAGE_CHANNELS'])) return 'Manage Invites';
                 return null;
             }
         });
diff --git a/package-lock.json b/package-lock.json
index 9e7e7d7..eb3c068 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "invite-manager",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cdff550..44a3b7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "invite-manager",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Invite manager is an open source bot that allows you to track people's invites. You can join the support server here if you need help with anything: https://discord.gg/xNks8jb",
   "main": "index.js",
   "dependencies": {