diff --git a/.gitignore b/.gitignore index 8310849..21af1ce 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ db.sqlite # Logs logs/* -logs +logs/ERROR.txt +logs/TEXT.txt *.log npm-debug.log* yarn-debug.log* diff --git a/commands/casino/top.js b/commands/casino/top.js index 117973e..56a0430 100644 --- a/commands/casino/top.js +++ b/commands/casino/top.js @@ -327,6 +327,12 @@ module.exports = { if (!interaction.isStringSelectMenu()) return; if (interaction.customId === "topLeaderboard") { + if (interaction.user.id !== message.author.id) { + return interaction.reply({ + content: "Vous n'avez pas la permission d'utiliser ce menu", + ephemeral: true, + }); + } const selected = interaction.values[0]; await interaction.deferUpdate(); diff --git a/commands/gestion/drop.js b/commands/gestion/drop.js index f94d7b4..1eb6e7a 100644 --- a/commands/gestion/drop.js +++ b/commands/gestion/drop.js @@ -10,39 +10,25 @@ module.exports = { async execute(message, args, client) { if (isNaN(args[0])) return message.reply("La somme dois etre un nombre..."); + const idAleatoir = Math.floor(Math.random() * 1000000); const btn = new ButtonBuilder() - .setCustomId("confirm") + .setCustomId(`confirm${idAleatoir}`) .setLabel("💰") .setStyle(ButtonStyle.Primary); const row = new ActionRowBuilder().addComponents(btn); - /*const sentMessage = message.channel.send('_ _') - let contage = 0 - while (contage == 100) { - setTimeout(() => { - sentMessage.edit(`> Chargement : **${contage}%**`) - contage = + 1 - }, 450); - } - - await sentMessage.edit({ - content: `Appuis vite sur le bouton pour gagner ${args[0]}coins`, - components: [row], - allowedMentions: { repliedUser: false }, - });*/ - - const sentMessage = message.reply({ - content: `Appuis vite sur le bouton pour gagner ${args[0]}coins`, + const sentMessage = await message.reply({ + content: `Appuis vite sur le bouton pour gagner ${args[0]} coins`, components: [row], allowedMentions: { repliedUser: false }, }); const filter = (i) => - i.customId === "confirm" && i.user.id !== message.author.id; - const collector = sentMessage.createMessageComponentCollector({ + i.customId === `confirm${idAleatoir}` && i.user.id !== message.author.id; + const collector = sentMessage.channel.createMessageComponentCollector ({ filter, - time: 45000, + time: 120000, }); collector.on("collect", async (interaction) => { sentMessage.edit({ diff --git a/events/messageCreate.js b/events/messageCreate.js index 2a10833..150ac05 100644 --- a/events/messageCreate.js +++ b/events/messageCreate.js @@ -38,15 +38,16 @@ module.exports = { message.guild.id, message.member, ); - if ( - (permissionLevel <= command.permission) && - (client.config.owners.includes(!message.author.id) /*|| - (!message.guild.ownerId == message.author.id)*/ - ) - ) { - return message.reply( - "Vous n'avez pas la permission d'utiliser cette commande.", - ); + + + if (!client.config.owners.includes(message.author.id)) { + if (message.guild.ownerId !== message.author.id) { + if (permissionLevel < command.permission) { + return message.reply( + "Vous n'avez pas la permission d'utiliser cette commande.", + ); + } + } } try { diff --git a/fonctions/getPermissionLevel.js b/fonctions/getPermissionLevel.js index 2b93f85..30cd756 100644 --- a/fonctions/getPermissionLevel.js +++ b/fonctions/getPermissionLevel.js @@ -14,6 +14,11 @@ module.exports = async function getPermissionLevel(serverId, user) { ); }); - const highestPermission = Math.max(...perms.map((perm) => perm.permission)); + let highestPermission; + if (perms.length === 0) { + highestPermission = 0 + } else { + highestPermission = Math.max(...perms.map((perm) => perm.permission)); + } return highestPermission; };