Merge branch 'develop' into refactor-logs

wtfnotavailable · Jan 12, 2024 · fcf9113 · fcf9113
2 parents 9737bda + dd185a2
commit fcf9113
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/djs-bot/commands/music/247.js b/djs-bot/commands/music/247.js
@@ -40,7 +40,7 @@ const command = new SlashCommand()
 		);
 		const twentyFourSeven = player.get("twentyFourSeven");
 
-		if (!twentyFourSeven || twentyFourSeven === false) {
+		if (!twentyFourSeven) {
 			player.set("twentyFourSeven", true);
 		} else {
 			player.set("twentyFourSeven", false);
@@ -66,7 +66,9 @@ const command = new SlashCommand()
 			player.destroy();
 		}
 
-		return interaction.reply({ embeds: [twentyFourSevenEmbed] });
+		const ret = await interaction.reply({ embeds: [twentyFourSevenEmbed], fetchReply: true });
+		if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+		return ret;
 	});
 
 module.exports = command;
diff --git a/djs-bot/commands/music/autoleave.js b/djs-bot/commands/music/autoleave.js
@@ -36,7 +36,7 @@ const command = new SlashCommand()
     const autoLeave = player.get("autoLeave");
     player.set("requester", interaction.guild.members.me);
 
-    if (!autoLeave || autoLeave === false) {
+    if (!autoLeave) {
       player.set("autoLeave", true);
     } else {
       player.set("autoLeave", false);
@@ -56,7 +56,9 @@ const command = new SlashCommand()
       }`
     );
 
-    return interaction.reply({ embeds: [autoLeaveEmbed] });
+    const ret = await interaction.reply({ embeds: [autoLeaveEmbed], fetchReply: true });
+    if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+    return ret;
   });
 
 module.exports = command;
diff --git a/djs-bot/commands/music/autopause.js b/djs-bot/commands/music/autopause.js
@@ -36,7 +36,7 @@ const command = new SlashCommand()
     const autoPause = player.get("autoPause");
     player.set("requester", interaction.guild.members.me);
 
-    if (!autoPause || autoPause === false) {
+    if (!autoPause) {
       player.set("autoPause", true);
     } else {
       player.set("autoPause", false);
@@ -56,7 +56,9 @@ const command = new SlashCommand()
       }`
     );
 
-    return interaction.reply({ embeds: [autoPauseEmbed] });
+    const ret = await interaction.reply({ embeds: [autoPauseEmbed], fetchReply: true });
+    if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+    return ret;
   });
 
 module.exports = command;
diff --git a/djs-bot/commands/music/autoqueue.js b/djs-bot/commands/music/autoqueue.js
@@ -39,7 +39,7 @@ const command = new SlashCommand()
 		const autoQueue = player.get("autoQueue");
 		player.set("requester", interaction.guild.members.me);
 
-		if (!autoQueue || autoQueue === false) {
+		if (!autoQueue) {
 			player.set("autoQueue", true);
 		} else {
 			player.set("autoQueue", false);
@@ -55,7 +55,9 @@ const command = new SlashCommand()
 			}`,
 		);
 
-		return interaction.reply({ embeds: [autoQueueEmbed({autoQueue})] });
+		const ret = await interaction.reply({ embeds: [autoQueueEmbed({autoQueue})], fetchReply: true });
+		if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+		return ret;
 	});
 
 module.exports = command;
diff --git a/djs-bot/commands/music/skip.js b/djs-bot/commands/music/skip.js
@@ -43,20 +43,23 @@ const command = new SlashCommand()
 		if (status === 1) {
 			return interaction.reply({
 				embeds: [
-					redEmbed(
-						`There is nothing after [${song.title}](${song.uri}) in the queue.`
-					),
+					redEmbed({
+						desc: `There is nothing after [${song.title}](${song.uri}) in the queue.`
+					}),
 				],
 			});
 		}
 
-		interaction.reply({
+		const ret = await interaction.reply({
 			embeds: [
 				new EmbedBuilder()
 					.setColor(client.config.embedColor)
 					.setDescription("✅ | **Skipped!**"),
 			],
+		 	fetchReply: true 
 		});
+		if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+		return ret;
 	});
 
 module.exports = command;
diff --git a/djs-bot/commands/music/stop.js b/djs-bot/commands/music/stop.js
@@ -38,13 +38,17 @@ const command = new SlashCommand()
 
 		const status = playerUtil.stop(player);
 
-		interaction.reply({
+		const ret = await interaction.reply({
 			embeds: [
 				new EmbedBuilder()
 					.setColor(client.config.embedColor)
 					.setDescription(`:wave: | **Bye Bye!**`),
 			],
+			fetchReply: true
 		});
+
+		if (ret) setTimeout(() => ret.delete().catch(client.warn), 20000);
+		return ret;
 	});
 
 module.exports = command;