✨ feat!: Switched to NekoMelody for music

src/discord/MusicPlayer/Join.ts

@@ -29,12 +29,13 @@ import DiscordMusicPlayer, {
     DiscordMusicPlayerInstance,
     DiscordMusicPlayerLoopMode,
     TrackUtils
-} from '../../providers/DiscordMusicPlayerTempFix';
+} from '../../providers/DiscordMusicPlayer';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
 import Locale from '../../services/Locale';
 import { SpotifyTrack, YouTubeVideo } from 'play-dl';
 import { checkBotPermissionsInChannel } from '../../utils/DiscordPermission';
+import { AudioInformation } from '../../../NekoMelody/src/providers/base';
 
 const EMBEDS = {
     VOICECHANNEL_JOINED: (data: HybridInteractionMessage, locale: I18n) => {
@@ -79,9 +80,9 @@ const EMBEDS = {
             user: data.getUser()
         });
     },
-    NOW_PLAYING: async (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
-        const title = TrackUtils.getTitle(track);
-        const thumbnails = await TrackUtils.getThumbnails(track);
+    NOW_PLAYING: async (data: HybridInteractionMessage, locale: I18n, track: AudioInformation) => {
+        const title = track.metadata.title;
+        const thumbnails = track.metadata.thumbnail;
 
         const embed = makeInfoEmbed({
             title: locale.__('musicplayer.now_playing'),
@@ -90,14 +91,13 @@ const EMBEDS = {
             user: DiscordProvider.client.user
         });
 
-        if (TrackUtils.getHighestResolutionThumbnail(thumbnails))
-            embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);
+        if (track.metadata.thumbnail) embed.setImage(track.metadata.thumbnail);
 
         return embed;
     },
-    NOW_REPEATING: async (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
-        const title = TrackUtils.getTitle(track);
-        const thumbnails = await TrackUtils.getThumbnails(track);
+    NOW_REPEATING: async (data: HybridInteractionMessage, locale: I18n, track: AudioInformation) => {
+        const title = track.metadata.title;
+        const thumbnails = track.metadata.thumbnail;
 
         const embed = makeInfoEmbed({
             title: locale.__('musicplayer.now_playing_repeating'),
@@ -106,8 +106,7 @@ const EMBEDS = {
             user: DiscordProvider.client.user
         });
 
-        if (TrackUtils.getHighestResolutionThumbnail(thumbnails))
-            embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);
+        if (track.metadata.thumbnail) embed.setImage(track.metadata.thumbnail);
 
         return embed;
     }
@@ -230,51 +229,43 @@ export async function joinVoiceChannelProcedure(
 
     // Register Event Listeners
     instance.events.on('playing', async (event: PlayerPlayingEvent) => {
+        const current = event.instance.nekoPlayer.getCurrentAudioInformation();
+        if (!current) return;
+
         const locale = await Locale.getGuildLocale(guild.id);
-        if (!event.instance.queue || !event.instance.queue.track || event.instance.queue.track.length === 0) return;
         previousTrack = event.instance.getPreviousTrack();
 
-        if (event.instance.queue.track[0] !== previousTrack) isLoopMessageSent = false;
-        else if (event.instance.queue.track[0] === previousTrack && isLoopMessageSent) return;
+        //if (current !== previousTrack) isLoopMessageSent = false;
+        //else if (current === previousTrack && isLoopMessageSent) return;
 
         const row = new ActionRowBuilder<ButtonBuilder>();
-        if (event.instance.queue.track[0] instanceof SpotifyTrack)
-            row.addComponents([
-                new ButtonBuilder()
-                    .setEmoji('🟢')
-                    .setLabel(' Open in Spotify')
-                    .setURL(encodeURI(`https://open.spotify.com/track/${event.instance.queue.track[0].id}`))
-                    .setStyle(ButtonStyle.Link)
-            ]);
-        if (
-            event.instance.queue.track[0] instanceof YouTubeVideo ||
-            event.instance.queue.track[0] instanceof SpotifyTrack
-        ) {
-            const actualPlaybackURL = event.instance.getActualPlaybackURL();
-            if (event.instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return;
-            row.addComponents([
-                new ButtonBuilder()
-                    .setEmoji('🔴')
-                    .setLabel(' Open in YouTube')
-                    .setURL(
-                        event.instance.queue.track[0] instanceof YouTubeVideo
-                            ? encodeURI(`https://www.youtube.com/watch?v=${event.instance.queue.track[0].id}`)
-                            : encodeURI(event.instance.getActualPlaybackURL()!)
-                    )
-                    .setStyle(ButtonStyle.Link)
-            ]);
-        }
+        // if (event.instance.queue.track[0] instanceof SpotifyTrack)
+        //     row.addComponents([
+        //         new ButtonBuilder()
+        //             .setEmoji('🟢')
+        //             .setLabel(' Open in Spotify')
+        //             .setURL(encodeURI(`https://open.spotify.com/track/${event.instance.queue.track[0].id}`))
+        //             .setStyle(ButtonStyle.Link)
+        //     ]);
+
+        row.addComponents([
+            new ButtonBuilder()
+                .setEmoji('🔴')
+                .setLabel(' Open in YouTube')
+                .setURL(current.metadata.url)
+                .setStyle(ButtonStyle.Link)
+        ]);
 
         if (event.instance.textChannel) {
             if (event.instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current) {
                 isLoopMessageSent = true;
                 await sendMessage(event.instance.textChannel, undefined, {
-                    embeds: [await EMBEDS.NOW_REPEATING(data, locale, event.instance.queue.track[0])],
+                    embeds: [await EMBEDS.NOW_REPEATING(data, locale, current)],
                     components: [row]
                 });
             } else {
                 await sendMessage(event.instance.textChannel, undefined, {
-                    embeds: [await EMBEDS.NOW_PLAYING(data, locale, event.instance.queue.track[0])],
+                    embeds: [await EMBEDS.NOW_PLAYING(data, locale, current)],
                     components: [row]
                 });
             }

src/discord/MusicPlayer/Leave.ts

@@ -1,7 +1,7 @@
 import { I18n } from 'i18n';
 import { Message, CommandInteraction } from 'discord.js';
 
-import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';

src/discord/MusicPlayer/Loop.ts

@@ -1,7 +1,7 @@
 import { I18n } from 'i18n';
 import { Message, CommandInteraction } from 'discord.js';
 
-import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
@@ -105,7 +105,7 @@ export default class Loop extends DiscordModule {
                 true
             );
 
-        if (instance.queue.track.length === 0)
+        if (!instance.nekoPlayer.getCurrentAudioInformation())
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
             });

src/discord/MusicPlayer/NowPlaying.ts

@@ -3,16 +3,17 @@ import { I18n } from 'i18n';
 import { SpotifyTrack, YouTubeVideo } from 'play-dl';
 
 import DiscordProvider from '../../providers/Discord';
-import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import { makeErrorEmbed, makeInfoEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
+import { AudioInformation } from '../../../NekoMelody/src/providers/base';
 
 const EMBEDS = {
-    NOW_PLAYING: async (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
-        const title = TrackUtils.getTitle(track);
-        const thumbnails = await TrackUtils.getThumbnails(track);
+    NOW_PLAYING: async (data: HybridInteractionMessage, locale: I18n, track: AudioInformation) => {
+        const title = track.metadata.title;
+        const thumbnail = track.metadata.thumbnail;
 
         const embed = makeInfoEmbed({
             title: locale.__('musicplayer.now_playing'),
@@ -21,8 +22,7 @@ const EMBEDS = {
             user: DiscordProvider.client.user
         });
 
-        if (TrackUtils.getHighestResolutionThumbnail(thumbnails))
-            embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);
+        if (thumbnail) embed.setImage(thumbnail);
 
         return embed;
     },
@@ -53,38 +53,34 @@ export default class NowPlaying extends DiscordModule {
 
         const locale = await Locale.getGuildLocale(guild.id);
         const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
-        if (!instance || !instance.queue.track[0])
+        const current = instance?.nekoPlayer.getCurrentAudioInformation();
+
+        if (!instance || !current)
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
             });
 
         const row = new ActionRowBuilder<ButtonBuilder>();
 
-        if (instance.queue.track[0] instanceof SpotifyTrack)
-            row.addComponents([
-                new ButtonBuilder()
-                    .setEmoji('🟢')
-                    .setLabel(' Open in Spotify')
-                    .setURL(encodeURI(`https://open.spotify.com/track/${instance.queue.track[0].id}`))
-                    .setStyle(ButtonStyle.Link)
-            ]);
-        if (instance.queue.track[0] instanceof YouTubeVideo || instance.queue.track[0] instanceof SpotifyTrack) {
-            const actualPlaybackURL = instance.getActualPlaybackURL();
-            if (instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return;
-            row.addComponents([
-                new ButtonBuilder()
-                    .setEmoji('🔴')
-                    .setLabel(' Open in YouTube')
-                    .setURL(
-                        instance.queue.track[0] instanceof YouTubeVideo
-                            ? encodeURI(`https://www.youtube.com/watch?v=${instance.queue.track[0].id}`)
-                            : encodeURI(instance.getActualPlaybackURL()!)
-                    )
-                    .setStyle(ButtonStyle.Link)
-            ]);
-        }
+        // if (instance.queue.track[0] instanceof SpotifyTrack)
+        //     row.addComponents([
+        //         new ButtonBuilder()
+        //             .setEmoji('🟢')
+        //             .setLabel(' Open in Spotify')
+        //             .setURL(encodeURI(`https://open.spotify.com/track/${instance.queue.track[0].id}`))
+        //             .setStyle(ButtonStyle.Link)
+        //     ]);
+
+        row.addComponents([
+            new ButtonBuilder()
+                .setEmoji('🔴')
+                .setLabel(' Open in YouTube')
+                .setURL(current.metadata.url)
+                .setStyle(ButtonStyle.Link)
+        ]);
+
         return await sendHybridInteractionMessageResponse(data, {
-            embeds: [await EMBEDS.NOW_PLAYING(data, locale, instance.queue.track[0])],
+            embeds: [await EMBEDS.NOW_PLAYING(data, locale, current)],
             components: [row]
         });
     }

src/discord/MusicPlayer/Pause.ts

@@ -1,7 +1,7 @@
 import { Message, CommandInteraction, Interaction } from 'discord.js';
 import { I18n } from 'i18n';
 
-import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
@@ -87,7 +87,7 @@ export default class Pause extends DiscordModule {
                 true
             );
 
-        if (instance.queue.track.length === 0)
+        if (!instance.nekoPlayer.getCurrentAudioInformation())
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
             });

src/discord/MusicPlayer/Play.ts

@@ -15,7 +15,7 @@ import { I18n } from 'i18n';
 import { joinVoiceChannelProcedure } from './Join';
 
 import DiscordProvider from '../../providers/Discord';
-import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
@@ -26,6 +26,8 @@ import {
     makeInfoEmbed
 } from '../../utils/DiscordMessage';
 import { checkBotPermissionsInChannel } from '../../utils/DiscordPermission';
+import { AudioInformation } from '../../../NekoMelody/src/providers/base';
+import { COMMON_EMBEDS } from '../Settings';
 
 const EMBEDS = {
     PLAY_INFO: (data: HybridInteractionMessage, locale: I18n) => {
@@ -41,18 +43,14 @@ const EMBEDS = {
             user: data.getUser()
         });
     },
-    ADDED_QUEUE: async (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
-        const title = TrackUtils.getTitle(track);
-        const thumbnails = await TrackUtils.getThumbnails(track);
-
+    ADDED_QUEUE: async (data: HybridInteractionMessage, locale: I18n, track: AudioInformation) => {
         let embed = makeSuccessEmbed({
             title: locale.__('musicplayer_play.queue_added_song'),
-            description: title,
+            description: track.metadata.title ?? 'No title',
             user: data.getUser()
         });
 
-        if (TrackUtils.getHighestResolutionThumbnail(thumbnails))
-            embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);
+        if (track.metadata.thumbnail) embed.setImage(track.metadata.thumbnail);
 
         return embed;
     },
@@ -265,9 +263,7 @@ export default class Play extends DiscordModule {
 
             if (!instance) return;
 
-            let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(
-                DiscordMusicPlayer.parseYouTubeLink(interaction.values[0])
-            ).catch((err) => {
+            let result = await instance.nekoPlayer.enqueue(interaction.values[0]).catch((err) => {
                 sendHybridInteractionMessageResponse(
                     hybridData,
                     { embeds: [EMBEDS.LOOKUP_ERROR(hybridData, locale, err)] },
@@ -277,7 +273,6 @@ export default class Play extends DiscordModule {
             });
             if (!result) return;
 
-            instance.addTrackToQueue(result);
             return await sendHybridInteractionMessageResponse(
                 hybridData,
                 { embeds: [await EMBEDS.ADDED_QUEUE(new HybridInteractionMessage(interaction), locale, result)] },
@@ -335,6 +330,14 @@ export default class Play extends DiscordModule {
 
         if (!instance) return;
 
+        let placeholder: HybridInteractionMessage | undefined;
+
+        let _placeholder = await sendHybridInteractionMessageResponse(data, {
+            embeds: [COMMON_EMBEDS.PROCESSING(data, locale)]
+        });
+        if (_placeholder) placeholder = new HybridInteractionMessage(_placeholder);
+        if (!placeholder) return;
+
         if (DiscordMusicPlayer.isYouTubeLink(query)) {
             let linkData = DiscordMusicPlayer.parseYouTubeLink(query);
 
@@ -345,17 +348,15 @@ export default class Play extends DiscordModule {
                 for (let song of songs) {
                     instance.addTrackToQueue(song);
                 }
-                return await sendHybridInteractionMessageResponse(
-                    data,
-                    { embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, locale, songs)] },
-                    true
-                );
+                return placeholder.getMessage().edit({ embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, locale, songs)] });
             }
 
-            let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(linkData).catch((err) => {
-                sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] }, true);
-                return null;
-            });
+            let result = await instance.nekoPlayer
+                .enqueue(`https://www.youtube.com/watch?v=${linkData.videoId}`)
+                .catch((err) => {
+                    placeholder.getMessage().edit({ embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] });
+                    return null;
+                });
 
             if (!result) return;
 
@@ -371,8 +372,6 @@ export default class Play extends DiscordModule {
                 data.getMessage().suppressEmbeds(true);
             }
 
-            instance.addTrackToQueue(result);
-
             if (linkData.list) {
                 const row = new ActionRowBuilder<ButtonBuilder>().addComponents([
                     new ButtonBuilder()
@@ -388,24 +387,16 @@ export default class Play extends DiscordModule {
                         .setStyle(ButtonStyle.Primary)
                 ]);
 
-                return await sendHybridInteractionMessageResponse(data, {
-                    embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result)],
-                    components: [row]
-                });
-            } else
-                return await sendHybridInteractionMessageResponse(data, {
-                    embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result)]
-                });
+                return placeholder
+                    .getMessage()
+                    .edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result)], components: [row] });
+            } else return placeholder.getMessage().edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result)] });
         } else if (DiscordMusicPlayer.isSpotifyLink(query)) {
             let linkData = DiscordMusicPlayer.parseSpotifyLink(query);
 
             if (linkData.type === 'playlist' || linkData.type === 'album') {
                 let playlist = await DiscordMusicPlayer.getSpotifySongsInPlayList(query).catch((err) => {
-                    sendHybridInteractionMessageResponse(
-                        data,
-                        { embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] },
-                        true
-                    );
+                    placeholder.getMessage().edit({ embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] });
                     return null;
                 });
 
@@ -416,15 +407,11 @@ export default class Play extends DiscordModule {
                     instance.addTrackToQueue(song);
                 }
 
-                return await sendHybridInteractionMessageResponse(
-                    data,
-                    { embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, locale, songs)] },
-                    true
-                );
+                return placeholder.getMessage().edit({ embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, locale, songs)] });
             }
 
             let result = await DiscordMusicPlayer.searchSpotifyBySpotifyLink(linkData).catch((err) => {
-                sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] }, true);
+                placeholder.getMessage().edit({ embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] });
                 return null;
             });
 
@@ -442,30 +429,29 @@ export default class Play extends DiscordModule {
                 data.getMessage().suppressEmbeds(true);
             }
 
-            instance.addTrackToQueue(result);
+            const youTubeQuery = `${result.name} ${result.artists.map((artist) => artist.name).join(' ')}`;
 
-            return await sendHybridInteractionMessageResponse(data, {
-                embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result)]
-            });
+            const youTubeResult = await DiscordMusicPlayer.searchYouTubeByQuery(youTubeQuery);
+
+            if (!youTubeResult) {
+                placeholder
+                    .getMessage()
+                    .edit({ embeds: [EMBEDS.LOOKUP_ERROR(data, locale, new Error('Cannot find that song'))] });
+                return;
+            }
+
+            const finalResult = await instance.addTrackToQueue(youTubeResult[0]);
+
+            return placeholder.getMessage().edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, finalResult)] });
         } else {
             let result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
 
             if (!result) {
-                // TODO: Send not found embed
-                await sendHybridInteractionMessageResponse(
-                    data,
-                    { embeds: [EMBEDS.LOOKUP_ERROR(data, locale, new Error('Cannot find that song'))] },
-                    true
-                );
+                placeholder
+                    .getMessage()
+                    .edit({ embeds: [EMBEDS.LOOKUP_ERROR(data, locale, new Error('Cannot find that song'))] });
                 return;
             }
-            instance.addTrackToQueue(result[0]);
-
-            // Max 1 hour
-            if (result[0].durationInSec > 3600)
-                return await sendHybridInteractionMessageResponse(data, {
-                    embeds: [EMBEDS.TOO_LONG(data, locale)]
-                });
 
             if (result.length > 1) {
                 // TODO: Find a better logic than this
@@ -492,15 +478,15 @@ export default class Play extends DiscordModule {
                         .setStyle(ButtonStyle.Primary)
                 ]);
 
-                return await sendHybridInteractionMessageResponse(data, {
-                    embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])],
-                    components: [row]
-                });
+                const finalResult = await instance.nekoPlayer.enqueue(result[0].url);
+                return placeholder
+                    .getMessage()
+                    .edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, finalResult)], components: [row] });
             }
 
-            return await sendHybridInteractionMessageResponse(data, {
-                embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])]
-            });
+            const finalResult = await instance.nekoPlayer.enqueue(result[0].url);
+
+            return placeholder.getMessage().edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, finalResult)] });
         }
     }
 

src/discord/MusicPlayer/PlayMy.ts

@@ -1,12 +1,14 @@
 import { I18n } from 'i18n';
 import { Message, CommandInteraction, ActivityType, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';
 
-import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
 import { joinVoiceChannelProcedure } from './Join';
+import { AudioInformation } from '../../../NekoMelody/src/providers/base';
+import { COMMON_EMBEDS } from '../Settings';
 
 const EMBEDS = {
     NOT_DETECTED: (data: HybridInteractionMessage, locale: I18n) => {
@@ -27,9 +29,9 @@ const EMBEDS = {
             user: data.getUser()
         });
     },
-    ADDED_QUEUE: async (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
-        const title = TrackUtils.getTitle(track);
-        const thumbnails = await TrackUtils.getThumbnails(track);
+    ADDED_QUEUE: async (data: HybridInteractionMessage, locale: I18n, track: AudioInformation) => {
+        const title = track.metadata.title;
+        const thumbnail = track.metadata.thumbnail;
 
         let embed = makeSuccessEmbed({
             title: locale.__('musicplayer_play.queue_added_song'),
@@ -37,8 +39,7 @@ const EMBEDS = {
             user: data.getUser()
         });
 
-        if (TrackUtils.getHighestResolutionThumbnail(thumbnails))
-            embed.setImage(TrackUtils.getHighestResolutionThumbnail(thumbnails).url);
+        if (thumbnail) embed.setImage(thumbnail);
 
         return embed;
     },
@@ -101,6 +102,14 @@ export default class PlayMy extends DiscordModule {
         if (!member.presence) return;
         if (!member.presence.activities) return;
 
+        let placeholder: HybridInteractionMessage | undefined;
+
+        let _placeholder = await sendHybridInteractionMessageResponse(data, {
+            embeds: [COMMON_EMBEDS.PROCESSING(data, locale)]
+        });
+        if (_placeholder) placeholder = new HybridInteractionMessage(_placeholder);
+        if (!placeholder) return;
+
         let query;
         let found = false;
         for (const activity of member.presence.activities) {
@@ -113,13 +122,9 @@ export default class PlayMy extends DiscordModule {
 
                 const result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
                 if (!result) continue;
-                instance.addTrackToQueue(result[0]);
 
-                // Max 1 hour
-                if (result[0].durationInSec > 3600)
-                    return await sendHybridInteractionMessageResponse(data, {
-                        embeds: [EMBEDS.TOO_LONG(data, locale)]
-                    });
+                const finalResult = await instance.nekoPlayer.enqueue(result[0].url);
+                if (!finalResult) continue;
 
                 let row;
                 if (result.length > 1) {
@@ -149,19 +154,19 @@ export default class PlayMy extends DiscordModule {
                 }
 
                 if (!row)
-                    await sendHybridInteractionMessageResponse(data, {
-                        embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])]
-                    });
+                    return placeholder
+                        .getMessage()
+                        .edit({ embeds: [await EMBEDS.ADDED_QUEUE(data, locale, finalResult)] });
                 else
-                    await sendHybridInteractionMessageResponse(data, {
-                        embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])],
+                    return placeholder.getMessage().edit({
+                        embeds: [await EMBEDS.ADDED_QUEUE(data, locale, finalResult)],
                         components: [row]
                     });
             }
         }
 
-        if (!found) await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOT_DETECTED(data, locale)] });
-
+        if (!found)
+            return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOT_DETECTED(data, locale)] });
         return;
     }
 }

src/discord/MusicPlayer/Queue.ts

@@ -5,7 +5,7 @@ import DiscordMusicPlayer, {
     DiscordMusicPlayerInstance,
     DiscordMusicPlayerLoopMode,
     TrackUtils
-} from '../../providers/DiscordMusicPlayerTempFix';
+} from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
@@ -18,59 +18,59 @@ import {
 
 const EMBEDS = {
     QUEUE: (data: HybridInteractionMessage, locale: I18n, instance: DiscordMusicPlayerInstance) => {
-        const queue = instance.queue;
+        const queue = instance.nekoPlayer.getQueue();
+        const current = instance.nekoPlayer.getCurrentAudioInformation();
 
-        if (!queue.track[0])
+        if (!current)
             return makeInfoEmbed({
                 title: locale.__('musicplayer_queue.title'),
                 description: locale.__('musicplayer_queue.empty'),
                 user: data.getUser()
             });
-        else {
-            const nowPlayingText = `${
-                instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current
-                    ? ` ${locale.__('musicplayer_queue.looping_current')}`
-                    : ''
-            }: [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`;
 
-            let description;
-            if (queue.track.length == 1) {
-                let queueString = `1. [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`;
-                description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}\n
-                There are ${queue.track.length} song in the queue!\n${queueString}`;
-            } else if (queue.track.length >= 10) {
-                const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`;
-                const first10 = queue.track.slice(0, 10);
-                let queueString = first10
-                    .map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`)
-                    .join('\n');
-                description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
+        const nowPlayingText = `${
+            instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current
+                ? ` ${locale.__('musicplayer_queue.looping_current')}`
+                : ''
+        }: [${current.metadata.title}](${current.metadata.url})`;
+
+        let description;
+        if (queue.length == 0) {
+            let queueString = `1. [${current.metadata.title}](${current.metadata.url})`;
+            description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}\n
+            ${locale.__('musicplayer_queue.empty')}`;
+        } else if (queue.length >= 10) {
+            const upcomingText = `[${queue[0].metadata.title}](${queue[0].metadata.url})`;
+            const first10 = queue.slice(0, 10);
+            let queueString = first10
+                .map((track, index) => `${index + 1}. [${track.metadata.title}](${track.metadata.url})`)
+                .join('\n');
+            description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
                 ${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
-                ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString() })}
-                ${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ''}`;
-            } else {
-                const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`;
-                const queueString = queue.track
-                    .map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`)
-                    .join('\n');
-                description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
+                ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.length.toString() })}
+                ${queueString}\n${queue.length > 10 ? `...${queue.length - 10} more songs` : ''}`;
+        } else {
+            const upcomingText = `[${queue[0].metadata.title}](${queue[0].metadata.url})`;
+            const queueString = queue
+                .map((track, index) => `${index + 1}. [${track.metadata.title}](${track.metadata.url})`)
+                .join('\n');
+            description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
                 ${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
-                ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString() })}
+                ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.length.toString() })}
                 ${queueString}`;
-            }
-
-            return makeInfoEmbed({
-                title: locale.__('musicplayer_queue.title'),
-                description: description,
-                fields: [
-                    {
-                        name: locale.__('common.available_args'),
-                        value: locale.__('musicplayer_queue.valid_args')
-                    }
-                ],
-                user: data.getUser()
-            });
         }
+
+        return makeInfoEmbed({
+            title: locale.__('musicplayer_queue.title'),
+            description: description,
+            fields: [
+                {
+                    name: locale.__('common.available_args'),
+                    value: locale.__('musicplayer_queue.valid_args')
+                }
+            ],
+            user: data.getUser()
+        });
     },
     QUEUE_CLEARED: (data: HybridInteractionMessage, locale: I18n) => {
         return makeSuccessEmbed({

src/discord/MusicPlayer/Resume.ts

@@ -1,7 +1,7 @@
 import { Message, CommandInteraction, Interaction } from 'discord.js';
 import { I18n } from 'i18n';
 
-import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
 import {
@@ -87,7 +87,7 @@ export default class Resume extends DiscordModule {
                 true
             );
 
-        if (instance.queue.track.length === 0)
+        if (!instance.nekoPlayer.getCurrentAudioInformation())
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
             });

src/discord/MusicPlayer/Search.ts

@@ -10,7 +10,7 @@ import { I18n } from 'i18n';
 
 import { joinVoiceChannelProcedure } from './Join';
 
-import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer, { TrackUtils, ValidTracks } from '../../providers/DiscordMusicPlayer';
 import Locale from '../../services/Locale';
 
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';

src/discord/MusicPlayer/Skip.ts

@@ -3,7 +3,7 @@ import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModu
 import { Message, CommandInteraction } from 'discord.js';
 import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from '../../utils/DiscordMessage';
 
-import DiscordMusicPlayer from '../../providers/DiscordMusicPlayerTempFix';
+import DiscordMusicPlayer from '../../providers/DiscordMusicPlayer';
 import { I18n } from 'i18n';
 import Locale from '../../services/Locale';
 
@@ -81,14 +81,14 @@ export default class Skip extends DiscordModule {
                 true
             );
 
-        if (instance.queue.track.length === 0)
+        if (!instance.nekoPlayer.getCurrentAudioInformation())
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
             });
 
         instance.skipTrack();
 
-        if (instance.queue.track.length === 0)
+        if (!instance.nekoPlayer.getCurrentAudioInformation())
             return await sendHybridInteractionMessageResponse(data, {
                 embeds: [EMBEDS.SKIPPED_LASTSONG(data, locale)]
             });