From 6ba8359c8cb39573557f2693b21cd477e50797b5 Mon Sep 17 00:00:00 2001
From: Blocks <51055767+Blocksnmore@users.noreply.github.com>
Date: Tue, 2 Jul 2024 21:43:08 -0500
Subject: [PATCH] Improve music

---
 commands/misc/help.ts               |   8 +-
 commands/music/play.tsx             | 157 ++++++++++++++--------------
 imports/queue.tsx                   |  86 +++++++--------
 imports/tools.ts                    |  11 --
 interactions/config/betas/index.tsx |   1 -
 5 files changed, 123 insertions(+), 140 deletions(-)

diff --git a/commands/misc/help.ts b/commands/misc/help.ts
index caba392..b7960f0 100644
--- a/commands/misc/help.ts
+++ b/commands/misc/help.ts
@@ -206,10 +206,16 @@ export default class Help extends Command {
 				const categorydata = choice.toLowerCase() === "uncategorized"
 					? uncategorizedCmds
 					: ctx.client.commands.category(choice).array();
-				const description = categorydata
+				let description = categorydata
 					.sort()
 					.map((cmd) => `${format(cmd.name)}`)
 					.join("\n - ");
+				
+				if (choice.toLowerCase() == "music") {
+					description += `\n - Shuffleplay`
+				}
+
+				description = description.split("\n").sort().join("\n");
 
 				await message.edit({
 					components: [],
diff --git a/commands/music/play.tsx b/commands/music/play.tsx
index b089937..326e600 100644
--- a/commands/music/play.tsx
+++ b/commands/music/play.tsx
@@ -11,15 +11,17 @@ import {
 import { doPermCheck, lavaCluster, queues, ServerQueue, Song } from "queue";
 import { Track } from "lavadeno";
 import { getEmojiByName } from "emoji";
-import { removeDiscordFormatting } from "tools";
+import { shuffleArray } from "tools";
 import { getEmote } from "i18n";
 
+const shuffleCommands = ["shuffleplay", "sp"];
+
 export default class Play extends Command {
 	name = "play";
-	aliases = ["p", "enqueue", "add"];
+	aliases = ["p", "enqueue", "add", ...shuffleCommands];
 	category = "music";
 	description = "Play a song";
-	usage = "play <song query or URL>";
+	usage = ["play <song query or URL>", "shuffleplay <playlist URL>"];
 
 	async execute(ctx: CommandContext) {
 		if (ctx.guild == undefined) return;
@@ -37,9 +39,7 @@ export default class Play extends Command {
 				],
 			});
 		} else {
-			const botState = await ctx.guild!.voiceStates.get(
-				ctx.client.user!.id,
-			);
+			const botState = await ctx.guild!.voiceStates.get(ctx.client.user!.id);
 			if (
 				queues.has(ctx.guild!.id) &&
 				(botState == undefined || botState.channel == undefined)
@@ -57,8 +57,7 @@ export default class Play extends Command {
 								icon_url: ctx.client.user!.avatarURL(),
 							},
 							title: "Unable to play",
-							description:
-								"Please join a voice channel before playing!",
+							description: "Please join a voice channel before playing!",
 						}).setColor("red"),
 					],
 				});
@@ -77,14 +76,13 @@ export default class Play extends Command {
 				});
 
 				const isLink =
-					/(https?:\/\/)?(www\.)?([a-zA-Z0-9][a-zA-Z0-9\-]{1,}[a-zA-Z0-9]\.?){1,}(\.[a-zA-Z]{2})?\.[a-zA-Z]{2,63}/i
-						.test(
-							ctx.argString,
-						);
+					/(https?:\/\/)?(www\.)?([a-zA-Z0-9][a-zA-Z0-9\-]{1,}[a-zA-Z0-9]\.?){1,}(\.[a-zA-Z]{2})?\.[a-zA-Z]{2,63}/i.test(
+						ctx.argString
+					);
 				const { data, loadType } = await lavaCluster.api.loadTracks(
 					isLink || /(yt|sc)search\:/i.test(ctx.argString)
 						? ctx.argString
-						: `ytsearch:${ctx.argString}`,
+						: `ytsearch:${ctx.argString}`
 				);
 
 				if (loadType == "error" || loadType == "empty") {
@@ -96,8 +94,7 @@ export default class Play extends Command {
 									icon_url: ctx.client.user!.avatarURL(),
 								},
 								title: "Unable to find songs!",
-								description:
-									"No songs were found for that result!",
+								description: "No songs were found for that result!",
 							}).setColor("red"),
 						],
 					});
@@ -112,14 +109,9 @@ export default class Play extends Command {
 
 						let thumbnail: undefined | string = undefined;
 
-						if (
-							uri.toLowerCase().startsWith(
-								"https://www.youtube.com/",
-							)
-						) {
+						if (uri.toLowerCase().startsWith("https://www.youtube.com/")) {
 							const videoID = uri.substring(uri.indexOf("=") + 1);
-							thumbnail =
-								`https://img.youtube.com/vi/${videoID}/hqdefault.jpg`;
+							thumbnail = `https://img.youtube.com/vi/${videoID}/hqdefault.jpg`;
 						}
 
 						songsToAdd.push({
@@ -137,21 +129,55 @@ export default class Play extends Command {
 					if (isLink) {
 						switch (loadType) {
 							case "playlist": {
-								for (const track of data.tracks) {
-									addTrackData({
-										info: {
-											author: track.info.author,
-											identifier: track.info.identifier,
-											isSeekable: track.info.isSeekable,
-											isStream: track.info.isStream,
-											length: track.info.length,
-											position: track.info.position,
-											sourceName: track.info.sourceName,
-											title: track.info.title,
-											uri: track.info.uri!,
-										},
-										track: track.encoded,
-									});
+								if (
+									shuffleCommands.includes(
+										ctx.message.content
+											.substring(ctx.prefix.length)
+											.trim()
+											.split(" ")[0]
+									)
+								) {
+									const tracks: Track[] = [];
+
+									for (const track of data.tracks) {
+										tracks.push({
+											info: {
+												author: track.info.author,
+												identifier: track.info.identifier,
+												isSeekable: track.info.isSeekable,
+												isStream: track.info.isStream,
+												length: track.info.length,
+												position: track.info.position,
+												sourceName: track.info.sourceName,
+												title: track.info.title,
+												uri: track.info.uri!,
+											},
+											track: track.encoded,
+										});
+									}
+
+									const shuffledTracks = shuffleArray(tracks);
+
+									for (const track of shuffledTracks) {
+										addTrackData(track);
+									}
+								} else {
+									for (const track of data.tracks) {
+										addTrackData({
+											info: {
+												author: track.info.author,
+												identifier: track.info.identifier,
+												isSeekable: track.info.isSeekable,
+												isStream: track.info.isStream,
+												length: track.info.length,
+												position: track.info.position,
+												sourceName: track.info.sourceName,
+												title: track.info.title,
+												uri: track.info.uri!,
+											},
+											track: track.encoded,
+										});
+									}
 								}
 								break;
 							}
@@ -201,20 +227,13 @@ export default class Play extends Command {
 										.slice(0, 5)
 										.map(
 											(track, i) =>
-												`${
-													emojiMap[
-														i as 0 | 1 | 2 | 3 | 4
-													]
-												} - [${
-													removeDiscordFormatting(
-														track.info.title,
-													)
-												}](${track.info.uri})`,
+												`${emojiMap[i as 0 | 1 | 2 | 3 | 4]} - [${
+													track.info.title
+												}](${track.info.uri})`
 										)
 										.join("\n"),
 									footer: {
-										text:
-											"This message will time out in 30 seconds!",
+										text: "This message will time out in 30 seconds!",
 									},
 								}).setColor("red"),
 							],
@@ -225,14 +244,7 @@ export default class Play extends Command {
 											<Button
 												style={"blurple"}
 												emoji={{
-													name: emojiMap[
-														i as
-															| 0
-															| 1
-															| 2
-															| 3
-															| 4
-													],
+													name: emojiMap[i as 0 | 1 | 2 | 3 | 4],
 												}}
 												id={`${now}-${i.toString()}`}
 											/>
@@ -256,7 +268,7 @@ export default class Play extends Command {
 								i.user.id == ctx.author.id &&
 								i.channel!.id == ctx.channel.id &&
 								i.message.id == message.id,
-							30 * 1000,
+							30 * 1000
 						);
 
 						if (
@@ -269,8 +281,7 @@ export default class Play extends Command {
 									new Embed({
 										author: {
 											name: "Bidome bot",
-											icon_url: ctx.client.user!
-												.avatarURL(),
+											icon_url: ctx.client.user!.avatarURL(),
 										},
 										title: "Selection canceled",
 										description: "No songs were selected!",
@@ -303,11 +314,11 @@ export default class Play extends Command {
 					const queue: ServerQueue = isNewQueue
 						? queues.get(ctx.guild.id)!
 						: new ServerQueue(
-							vc.channel.id,
-							ctx.guild,
-							vc.channel,
-							await doPermCheck(ctx.member!, vc.channel),
-						);
+								vc.channel.id,
+								ctx.guild,
+								vc.channel,
+								await doPermCheck(ctx.member!, vc.channel)
+						  );
 
 					if (songsToAdd.length > 1) {
 						await message.edit(undefined, {
@@ -318,10 +329,9 @@ export default class Play extends Command {
 										icon_url: ctx.client.user!.avatarURL(),
 									},
 									title: "Enqueued songs",
-									description:
-										`Added ${songsToAdd.length} song${
-											songsToAdd.length > 1 ? "s" : ""
-										} to the queue!`,
+									description: `Added ${songsToAdd.length} song${
+										songsToAdd.length > 1 ? "s" : ""
+									} to the queue!`,
 									footer: {
 										text: `Songs in queue: ${
 											queue.queue.length +
@@ -342,15 +352,10 @@ export default class Play extends Command {
 										icon_url: ctx.client.user!.avatarURL(),
 									},
 									title: "Enqueued song",
-									description: `Added [${
-										removeDiscordFormatting(
-											songsToAdd[0].title,
-										)
-									}](${songsToAdd[0].url}) to the queue!`,
+									description: `Added [${songsToAdd[0].title}](${songsToAdd[0].url}) to the queue!`,
 									footer: {
 										text: `Songs in queue: ${
-											queue.queue.length + 1 +
-											queue.playedSongQueue.length
+											queue.queue.length + 1 + queue.playedSongQueue.length
 										}`,
 									},
 								}).setColor("random"),
@@ -363,7 +368,7 @@ export default class Play extends Command {
 
 					if (queue.queueMessage == undefined) {
 						queue.queueMessage = await ctx.channel.send(
-							queue.nowPlayingMessage,
+							queue.nowPlayingMessage
 						);
 					}
 				}
diff --git a/imports/queue.tsx b/imports/queue.tsx
index 8fdda28..ec12bf4 100644
--- a/imports/queue.tsx
+++ b/imports/queue.tsx
@@ -15,7 +15,7 @@ import {
 	VoiceState,
 } from "./harmony.ts";
 import { Cluster, Player, PlayerEvents } from "./lavadeno.ts";
-import { formatMs, removeDiscordFormatting, shuffleArray } from "./tools.ts";
+import { formatMs, shuffleArray } from "./tools.ts";
 import { nodes } from "./nodes.ts";
 import { getEmojiByName } from "./emoji.ts";
 import { supabase } from "supabase";
@@ -62,11 +62,12 @@ export class ServerQueue {
 		public channel: string,
 		private guild: Guild,
 		channelObject: VoiceChannel,
-		setAsSpeaker = false,
+		setAsSpeaker = false
 	) {
 		this.guildId = this.guild.id;
 
-		this.player = lavaCluster.players.resolve(this.guildId) ??
+		this.player =
+			lavaCluster.players.resolve(this.guildId) ??
 			lavaCluster.players.create(this.guildId);
 		this.player.voice.connect(this.channel, {
 			deafened: true,
@@ -79,8 +80,7 @@ export class ServerQueue {
 					started: new Date().toUTCString(),
 					name: this.queue[0].title,
 					author: this.queue[0].author,
-					thumbnail: this.queue[0].thumbnail ??
-						client.user!.avatarURL(),
+					thumbnail: this.queue[0].thumbnail ?? client.user!.avatarURL(),
 					requestedby: this.queue[0].requestedByString,
 					length: this.queue[0].msLength,
 				};
@@ -118,12 +118,10 @@ export class ServerQueue {
 			this.deleteQueue();
 		});
 
-		for (
-			const errorEvent of [
-				"trackException",
-				"trackStuck",
-			] as (keyof PlayerEvents)[]
-		) {
+		for (const errorEvent of [
+			"trackException",
+			"trackStuck",
+		] as (keyof PlayerEvents)[]) {
 			this.player.on(errorEvent, () => {
 				const song = this.queue.shift()!;
 
@@ -136,11 +134,8 @@ export class ServerQueue {
 									icon_url: client.user!.avatarURL(),
 								},
 								title: "Song removed",
-								description: `An error occured while playing [${
-									removeDiscordFormatting(
-										song.title,
-									)
-								}](${song.url}) so it has been removed from the queue!`,
+								description: `An error occured while playing [${song.title}
+									](${song.url}) so it has been removed from the queue!`,
 							}).setColor("random"),
 						],
 					});
@@ -210,18 +205,16 @@ export class ServerQueue {
 			});
 		}
 		queues.delete(this.guildId);
-		for (
-			const key of [
-				"trackStart",
-				"trackEnd",
-				"trackException",
-				"trackStuck",
-				"disconnected",
-				"channelJoin",
-				"channelLeave",
-				"channelMove",
-			] as (keyof PlayerEvents)[]
-		) {
+		for (const key of [
+			"trackStart",
+			"trackEnd",
+			"trackException",
+			"trackStuck",
+			"disconnected",
+			"channelJoin",
+			"channelLeave",
+			"channelMove",
+		] as (keyof PlayerEvents)[]) {
 			this.player.removeAllListeners(key);
 		}
 
@@ -239,7 +232,7 @@ export class ServerQueue {
 
 	private async makeBotSpeak(channelObject: VoiceChannel) {
 		const botVoiceState = await channelObject.guild.voiceStates.get(
-			client.user!.id,
+			client.user!.id
 		);
 		if (botVoiceState == undefined) return;
 		// Unimplemented methods my beloved
@@ -343,9 +336,7 @@ export class ServerQueue {
 					fields: [
 						{
 							name: "Song",
-							value: `[${
-								removeDiscordFormatting(song.title)
-							}](${song.url})`,
+							value: `[${song.title}](${song.url})`,
 							inline: true,
 						},
 						{
@@ -366,13 +357,11 @@ export class ServerQueue {
 						},
 						{
 							name: "Progress",
-							value: `${
-								formatMs(
-									(this.player.position ?? 0) < 1000
-										? 1000
-										: this.player.position!,
-								)
-							}/${formatMs(song.msLength)}`,
+							value: `${formatMs(
+								(this.player.position ?? 0) < 1000
+									? 1000
+									: this.player.position!
+							)}/${formatMs(song.msLength)}`,
 							inline: true,
 						},
 						{
@@ -414,9 +403,7 @@ export class ServerQueue {
 						<Button
 							style={"green"}
 							emoji={{
-								name: getEmojiByName(
-									"twisted_rightwards_arrows",
-								),
+								name: getEmojiByName("twisted_rightwards_arrows"),
 							}}
 							id={"shuffle-songs"}
 						/>
@@ -454,8 +441,7 @@ export const initLava = (bot: CommandClient) => {
 			userId: bot.user!.id,
 			sendGatewayCommand: (id, payload) => {
 				const shardID = Number(
-					(BigInt(id) << 22n) %
-						BigInt(bot.shards.cachedShardCount ?? 1),
+					(BigInt(id) << 22n) % BigInt(bot.shards.cachedShardCount ?? 1)
 				);
 				const shard = bot.shards.get(shardID) as Gateway;
 				// Harmony's JSR package doesn't export GatewayResponse so I need to use any - Bloxs
@@ -468,18 +454,16 @@ export const initLava = (bot: CommandClient) => {
 
 	cluster.on("nodeConnected", (node, ev) => {
 		console.log(
-			`[Lavalink] Connected to node ${node.identifier} in ${
-				formatMs(
-					ev.took < 1000 ? 1000 : ev.took,
-					true,
-				).toLowerCase()
-			} Reconnected: ${ev.reconnected ? "Yes" : "No"}`,
+			`[Lavalink] Connected to node ${node.identifier} in ${formatMs(
+				ev.took < 1000 ? 1000 : ev.took,
+				true
+			).toLowerCase()} Reconnected: ${ev.reconnected ? "Yes" : "No"}`
 		);
 	});
 
 	cluster.on("nodeDisconnected", (node, ev) => {
 		console.log(
-			`[Lavalink] Disconnected from node ${node.identifier} with code ${ev.code} and reason ${ev.reason}. Attempting to reconnect`,
+			`[Lavalink] Disconnected from node ${node.identifier} with code ${ev.code} and reason ${ev.reason}. Attempting to reconnect`
 		);
 	});
 
diff --git a/imports/tools.ts b/imports/tools.ts
index 9a1202c..31927ff 100644
--- a/imports/tools.ts
+++ b/imports/tools.ts
@@ -67,17 +67,6 @@ export const format = (name: string): string => {
 	}`;
 };
 
-export const removeDiscordFormatting = (text: string): string => {
-	return removeDiscordCodeBlocks(text)
-		.replace(/\_/, "\\_")
-		.replace(/\*/, "\\*")
-		.replace(/\[/, "\\[")
-		.replace(/\]/, "\\]")
-		.replace(/\)/, "\\)")
-		.replace(/\(/, "\\(")
-		.replace(/\~/, "\\~");
-};
-
 export const removeDiscordCodeBlocks = (text: string): string => {
 	return text.replace(/`/gi, "\\`");
 };
diff --git a/interactions/config/betas/index.tsx b/interactions/config/betas/index.tsx
index c060027..1a00453 100644
--- a/interactions/config/betas/index.tsx
+++ b/interactions/config/betas/index.tsx
@@ -8,7 +8,6 @@ import {
 	MessageComponentInteraction,
 } from "harmony";
 import { createEmbedFromLangData, getString, getUserLanguage } from "i18n";
-import { supabase } from "supabase";
 
 export async function button(i: MessageComponentInteraction) {
 	const lang = await getUserLanguage(i.user.id);