Merge pull request #70 from Ayrox/dev

fixes
Ayrox · Jan 18, 2022 · 5964c31 · 5964c31
2 parents 74e3f0d + 5123b21
commit 5964c31
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Commands/music/skip.js b/src/Commands/music/skip.js
@@ -20,7 +20,7 @@ module.exports = {
 
             let skipNumber = (message.options.getNumber("how-many") === null) ? 1 : Math.floor(message.options.getNumber("how-many"));
             const queue = client.distube.getQueue(message)
-            if (!queue) return message.reply({ embeds: [errorEmbed().setDescription(`La file d'attente est actuellement vide !`)], ephemeral: true })
+            if (nextSong === undefined && queue.autoplay === false) return interaction.reply({ embeds: [errorEmbed().setDescription(`La file d'attente est actuellement vide !`)], ephemeral: true })
             if (queue.songs[skipNumber] === undefined) return message.reply({ embeds: [errorEmbed().setDescription(`La file d'attente est actuellement vide !`)], ephemeral: true })
 
             message.reply({

diff --git a/src/Events/Interaction/musicButtons.js b/src/Events/Interaction/musicButtons.js
@@ -1,7 +1,7 @@
 const { ButtonInteraction, Client } = require("discord.js");
 const { errorEmbed, musicEmbed } = require("../../util/Embeds");
 const {musicButtonRow } = require("../../util/buttonLayout")
-
+const { generateProgressBar } = require("../../util/functions")
 
 
 module.exports = {
@@ -148,7 +148,7 @@ module.exports = {
 
                         const nextSong = queue.songs[1] 
 
-                        if (nextSong === undefined) return interaction.reply({ embeds: [errorEmbed().setDescription(`La file d'attente est actuellement vide !`)], ephemeral: true })
+                        if (nextSong === undefined && queue.autoplay === false) return interaction.reply({ embeds: [errorEmbed().setDescription(`La file d'attente est actuellement vide !`)], ephemeral: true })
 
                         interaction.message.edit({
                         embeds: [