almost the last push for v2.1.0

2022-06-26 20:25:33 +02:00
parent a49b53e2d6
commit a6e107c12a
16 changed files with 225 additions and 30 deletions
@@ -11,7 +11,7 @@ module.exports = () => {
        var user = msg.mentions.users.first()
        if (!user) return msg.channel.send({embeds:[bot.errorLog.invalidArgsMessage(l.errors.missingArgsDescription+" `<user>`:\n`"+config.prefix+"remove <user>`")]})

-        if (!msg.member.permissions.has("MANAGE_CHANNELS") && !msg.member.permissions.has("ADMINISTRATOR")){
+        if (!msg.member.permissions.has("MANAGE_CHANNELS") && !msg.member.permissions.has("ADMINISTRATOR") && config.main_adminroles.some((item)=>{return msg.member.roles.cache.has(item)}) == false){
            return msg.channel.send({embeds:[bot.errorLog.noPermsMessage]})
        }

@@ -37,8 +37,8 @@ module.exports = () => {
        const user = interaction.options.getUser("user")

        const permsmember = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
-            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false && permsmember.permissions.has("ADMINISTRATOR")){
-                interaction.reply({embeds:[bot.errorLog.noPermsMessage]})
+            if (config.main_adminroles.some((item)=>{return permsmember.roles.cache.has(item)}) == false && !permsmember.permissions.has("ADMINISTRATOR") && !permsmember.permissions.has("MANAGE_GUILD")){
+                interaction.reply({embeds:[bot.errorLog.noPermsMessage],ephemeral:true})
                return
            }