magmastream 2.9.2-dev.4 → 2.9.2-dev.6

package/dist/structures/Manager.js

@@ -571,6 +571,10 @@ class Manager extends events_1.EventEmitter {
                                         player.setAutoplay(true, autoPlayUser, state.autoplayTries);
                                     }
                                 }
+                                const savedNowPlayingMessage = state.data?.nowPlayingMessage;
+                                if (savedNowPlayingMessage) {
+                                    player.setNowPlayingMessage(savedNowPlayingMessage);
+                                }
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {
@@ -749,9 +753,7 @@ class Manager extends events_1.EventEmitter {
                                     guildId: state.options.guildId,
                                     data: { voice: { token: state.voiceState.event.token, endpoint: state.voiceState.event.endpoint, sessionId: state.voiceState.sessionId } },
                                 });
-                                if (!lavaPlayer || !lavaPlayer.state.connected) {
-                                    player.connect();
-                                }
+                                player.connect();
                                 // Rest of the player state restoration code (tracks, filters, etc.)
                                 const tracks = [];
                                 const currentTrack = state.queue.current;
@@ -763,6 +765,10 @@ class Manager extends events_1.EventEmitter {
                                         player.setAutoplay(true, autoPlayUser, state.autoplayTries);
                                     }
                                 }
+                                const savedNowPlayingMessage = state.data?.nowPlayingMessage;
+                                if (savedNowPlayingMessage) {
+                                    player.setNowPlayingMessage(savedNowPlayingMessage);
+                                }
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {

package/dist/structures/Node.js

@@ -579,6 +579,8 @@ class Node {
                     if ("delete" in player.nowPlayingMessage && typeof player.nowPlayingMessage.delete === "function") {
                         await player.nowPlayingMessage.delete().catch(() => { });
                     }
+                    player.nowPlayingMessage = null;
+                    player.set("nowPlayingMessage", null);
                 }
                 await this.trackEnd(player, track, payload);
                 break;

package/dist/structures/Player.js

@@ -355,6 +355,7 @@ class Player {
                 message: "You must provide the message of the now playing message.",
             });
         }
+        this.set("nowPlayingMessage", message);
         this.nowPlayingMessage = message;
         return this.nowPlayingMessage;
     }
@@ -692,16 +693,25 @@ class Player {
     async stop(amount) {
         const oldPlayer = { ...this };
         let removedTracks = [];
+        const current = await this.queue.getCurrent(); // may be null
         if (typeof amount === "number" && amount > 1) {
-            if (amount > (await this.queue.size())) {
+            const queueSize = await this.queue.size();
+            if (amount > queueSize) {
                 throw new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.PLAYER_QUEUE_EMPTY,
-                    message: "The queue size must be greater than 1.",
+                    message: "The amount of tracks to remove is greater than the queue size.",
                 });
             }
             removedTracks = await this.queue.getSlice(0, amount - 1);
             await this.queue.modifyAt(0, amount - 1);
+            const toAdd = [];
+            if (current)
+                toAdd.push(current);
+            toAdd.push(...removedTracks);
+            await this.queue.addPrevious(toAdd);
         }
+        // This will trigger trackEnd for the current track; since we already added current,
+        // addPrevious will ignore duplicates.
         this.node.rest.updatePlayer({
             guildId: this.guildId,
             data: {

package/dist/structures/Utils.js

@@ -651,7 +651,8 @@ class PlayerUtils {
                 }
                 if (key === "data") {
                     return {
-                        clientUser: value?.Internal_BotUser ?? null,
+                        clientUser: value?.Internal_AutoplayUser ?? null,
+                        nowPlayingMessage: value?.nowPlayingMessage ?? null,
                     };
                 }
                 return value;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.2-dev.4",
+	"version": "2.9.2-dev.6",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",