fix(currentSong): use song.stream.song when possible

This patch allows supporting other plugins such as Spotify

Author: simonzsh

commands/info.js

@@ -10,12 +10,12 @@ module.exports = {
 		.setDMPermission(false),
 	run: async (client, interaction, guildData, queue, lang) => {
 		const member = interaction.member;
-		const currentSong = queue?.songs[0];
+		const currentSong = queue?.songs[0]?.stream?.song || queue?.songs[0];
 
 		if (!currentSong) return client.sendErrorNotification(interaction, `${lang.ERROR_SONG_NO_PLAYING}`);
 		if (!client.handleCooldown("infoCommand", member.id, 2000)) return client.sendErrorNotification(interaction, `${lang.ERROR_ACTION_NOT_POSSIBLE}`);
 		// Create duration bar
-		const durationBar = client.createDurationBar(queue);
+		const durationBar = client.createDurationBar(queue, currentSong);
 		// Create info embed
 		const infoEmbed = new EmbedBuilder().setAuthor({ name: `${currentSong.name}`, url: currentSong.url, iconURL: elements.ICON_FLOPY }).setThumbnail(currentSong.thumbnail).addFields({ name: `**${lang.MESSAGE_ITEM_AUTHOR}**`, value: `${currentSong.uploader?.name || "-"}`, inline: true }, { name: `**${lang.MESSAGE_ITEM_VIEWS}**`, value: `${currentSong.views.toString().replace(/(.)(?=(\d{3})+$)/g, "$1,")}`, inline: true }, { name: `**${lang.MESSAGE_ITEM_LIKES}**`, value: `${currentSong.likes.toString().replace(/(.)(?=(\d{3})+$)/g, "$1,")}`, inline: true }, { name: `**${lang.MESSAGE_ITEM_DURATION}**`, value: `${durationBar}` }).setColor(elements.COLOR_FLOPY);
 		// Send song informaton and then delete reply

commands/library.js

@@ -65,7 +65,7 @@ module.exports = {
 			case "add":
 				const type = options.getString("type") || "video";
 				const isPlaylist = type === "playlist";
-				const currentItem = isPlaylist ? queue?.songs[0]?.playlist : queue?.songs[0];
+				const currentItem = isPlaylist ? queue?.songs[0]?.playlist : queue?.songs[0]?.stream?.song || queue?.songs[0];
 				if (!currentItem) return client.sendErrorNotification(interaction, `${isPlaylist ? lang.ERROR_PLAYLIST_NO_PLAYING : lang.ERROR_SONG_NO_PLAYING}`);
 				if (library.find((item) => item.url === currentItem.url)) return client.sendErrorNotification(interaction, `${isPlaylist ? lang.ERROR_LIBRARY_PLAYLIST_ALREADY_ADDED : lang.ERROR_LIBRARY_SONG_ALREADY_ADDED}`);
 				if (library.length >= config.LIBRARY_MAX_LENGTH) return client.sendErrorNotification(interaction, `${lang.ERROR_LIBRARY_LIMIT_REACHED}`);

commands/replay.js

@@ -9,7 +9,7 @@ module.exports = {
 		.setDMPermission(false),
 	run: async (client, interaction, guildData, queue, lang) => {
 		const { guild, member } = interaction;
-		const currentSong = queue?.songs[0];
+		const currentSong = queue?.songs[0]?.stream?.song || queue?.songs[0];
 
 		if (!currentSong) return client.sendErrorNotification(interaction, `${lang.ERROR_SONG_NO_PLAYING}`);
 		if (!client.checkMemberIsInMyVoiceChannel(guild, member)) return client.sendErrorNotification(interaction, `${lang.ERROR_MEMBER_MUST_JOIN_MY_VOICE_CHANNEL}`);

commands/seek.js

@@ -16,7 +16,7 @@ module.exports = {
 		),
 	run: async (client, interaction, guildData, queue, lang) => {
 		const { guild, member, options } = interaction;
-		const currentSong = queue?.songs[0];
+		const currentSong = queue?.songs[0]?.stream?.song || queue?.songs[0];
 		const hhmmss = options.getInteger("hhmmss").toString();
 
 		if(!currentSong) return client.sendErrorNotification(interaction, `${lang.ERROR_SONG_NO_PLAYING}`);
@@ -35,7 +35,7 @@ module.exports = {
 				client.updateDashboardMessage(guild, queue, lang);
 			}
 			// Create duration bar
-			const durationBar = client.createDurationBar(queue);
+			const durationBar = client.createDurationBar(queue, currentSong);
 			// Send notification
 			client.sendNotification(interaction, `${durationBar}`, { editReply: true });
 		} catch (error) {

utils/functions.js

@@ -130,7 +130,7 @@ module.exports = (client) => {
 	// Create dashboard
 	client.createDashboard = (guild, queue, lang) => {
 		const songs = queue?.songs || [];
-		const currentSong = songs[0];
+		const currentSong = songs[0]?.stream?.song || songs[0];
 		const formattedSongs = songs.slice(1, config.QUEUE_MAX_LENGTH_DISPLAY + 1).map((song, i) => { return `**${i + 1}.** ${song.name.length > config.ITEM_NAME_MAX_LENGTH_DISPLAY ? song.name.substr(0, config.ITEM_NAME_MAX_LENGTH_DISPLAY).concat("...") : song.name}` }).reverse().join("\n");
 		const dashboardContent = `**__${lang.DASHBOARD_QUEUE}__**\n${currentSong ? `${songs.length - 1 > config.QUEUE_MAX_LENGTH_DISPLAY ? `**+${songs.length - 1 - config.QUEUE_MAX_LENGTH_DISPLAY}**\n` : ""}${formattedSongs || lang.DASHBOARD_QUEUE_NO_SONG}` : lang.DASHBOARD_QUEUE_NONE}`;
 		const dashboardEmbed = new EmbedBuilder().setTitle(currentSong ? `[${currentSong.formattedDuration}] ${currentSong.name}` : `${lang.DASHBOARD_SONG_NO_PLAYING}`).setDescription(!currentSong ? `[Flopy](${elements.INVITE_FLOPY}) | [Flopy 2](${elements.INVITE_FLOPY2}) | [Flopy 3](${elements.INVITE_FLOPY3}) | [Support](${elements.INVITE_SUPPORT})` : null).setImage(currentSong ? currentSong.thumbnail : elements.BANNER_DASHBOARD).setFooter(currentSong ? { text: `${lang.DASHBOARD_VOLUME} ${queue.volume}%${queue.repeatMode === 1 ? ` | ${lang.DASHBOARD_REPEAT_SONG}` : queue.repeatMode === 2 ? ` | ${lang.DASHBOARD_REPEAT_QUEUE}` : ""}${queue.autoplay ? ` | ${lang.DASHBOARD_AUTOPLAY_ON}` : ""}${queue.filters.size > 0 ? ` | ${lang.DASHBOARD_FILTERS} ${queue.filters.size}` : ""}` } : null).setColor(currentSong ? guild.members.me.displayHexColor.replace("#000000", elements.COLOR_WHITE) : elements.COLOR_FLOPY);
@@ -171,12 +171,11 @@ module.exports = (client) => {
 	}
 
 	// Create duration bar
-	client.createDurationBar = (queue) => {
-		const currentSong = queue.songs[0];
-		const progress = Math.min(Math.round((queue.currentTime / currentSong.duration) * config.DURATION_BAR_MAX_LENGTH_DISPLAY), config.DURATION_BAR_MAX_LENGTH_DISPLAY);
+	client.createDurationBar = (queue, song) => {
+		const progress = Math.min(Math.round((queue.currentTime / song.duration) * config.DURATION_BAR_MAX_LENGTH_DISPLAY), config.DURATION_BAR_MAX_LENGTH_DISPLAY);
 		const rest = config.DURATION_BAR_MAX_LENGTH_DISPLAY - progress;
 		const bar = new Array(progress).fill(elements.SYMBOL_LINE).concat(elements.SYMBOL_CIRCLE).concat(new Array(rest).fill(" ")).join("");
-		return `\`${queue.formattedCurrentTime} ${bar} ${currentSong.formattedDuration}\``;
+		return `\`${queue.formattedCurrentTime} ${bar} ${song.formattedDuration}\``;
 	}
 
 	// Convert HHMMSS to seconds