diff --git a/commands/admin.js b/commands/admin.js index 8df98a5..485a466 100644 --- a/commands/admin.js +++ b/commands/admin.js @@ -1,4 +1,4 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js'); +const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, PermissionsBitField } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const bitfieldCalculator = require('discord-bitfield-calculator'); const { Armbands } = require('../database/armbands.js'); @@ -125,10 +125,10 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); diff --git a/commands/alarm.js b/commands/alarm.js index 582fa75..ff0a4a9 100644 --- a/commands/alarm.js +++ b/commands/alarm.js @@ -1,4 +1,4 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js'); +const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, PermissionsBitField } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const bitfieldCalculator = require('discord-bitfield-calculator'); @@ -230,10 +230,10 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); diff --git a/commands/config.js b/commands/config.js index be472ee..3c2b5dd 100644 --- a/commands/config.js +++ b/commands/config.js @@ -1,6 +1,6 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); +const { PermissionsBitField, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; -const bitfieldCalculator = require('discord-bitfield-calculator'); +// const bitfieldCalculator = require('discord-bitfield-calculator'); const { getDefaultSettings } = require('../database/guild'); module.exports = { @@ -429,10 +429,11 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + // const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); diff --git a/commands/event.js b/commands/event.js index e6fd9c4..1f54772 100644 --- a/commands/event.js +++ b/commands/event.js @@ -1,4 +1,4 @@ -const { EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder } = require('discord.js'); +const { EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder, PermissionsBitField } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const bitfieldCalculator = require('discord-bitfield-calculator'); @@ -80,10 +80,10 @@ module.exports = { return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); } - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); diff --git a/commands/reset.js b/commands/reset.js index 7eb2858..0da5f99 100644 --- a/commands/reset.js +++ b/commands/reset.js @@ -1,4 +1,4 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); +const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionsBitField } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const { addUser } = require('../database/user'); const bitfieldCalculator = require('discord-bitfield-calculator'); @@ -29,10 +29,10 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (client.exists(GuildDB.botAdmin) && interaction.member.roles.includes(GuildDB.botAdmin)) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); diff --git a/commands/server.js b/commands/server.js index 3421326..7b29164 100644 --- a/commands/server.js +++ b/commands/server.js @@ -1,4 +1,4 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ModalBuilder, TextInputBuilder, TextInputStyle } = require('discord.js'); +const { PermissionsBitField, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ModalBuilder, TextInputBuilder, TextInputStyle } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const bitfieldCalculator = require('discord-bitfield-calculator'); const { BanPlayer, UnbanPlayer, RestartServer, CheckServerStatus, DisableBaseDamage, DisableContainerDamage, NitradoCredentialStatus } = require('../util/NitradoAPI'); @@ -108,10 +108,10 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { - const permissions = bitfieldCalculator.permissions(interaction.member.permissions); + const permissions = new PermissionsBitField(interaction.member.permissions).toArray(); let canUseCommand = false; - if (permissions.includes("MANAGE_GUILD")) canUseCommand = true; + if (permissions.includes("ManageGuild")) canUseCommand = true; if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' });