magmastream 2.9.3-dev.2 → 2.9.3-dev.4

package/dist/index.d.ts

@@ -170,7 +170,9 @@ declare enum TrackPartial {
     /** The plugin info of the track */
     PluginInfo = "pluginInfo",
     /** The custom data of the track */
-    CustomData = "customData"
+    CustomData = "customData",
+    /** Whether the track got autoplayed */
+    IsAutoPlay = "isAutoplay"
 }
 /**
  * Manager Event Types Enum
@@ -1189,6 +1191,8 @@ interface Track {
     pluginInfo: TrackPluginInfo;
     /** Add your own data to the track. */
     customData: Record<string, unknown>;
+    /** If the track got added by autoplay. */
+    readonly isAutoplay: boolean;
 }
 /**
  * Track Plugin Info
@@ -3471,9 +3475,10 @@ declare abstract class TrackUtils {
      * Builds a Track from the raw data from Lavalink and a optional requester.
      * @param data The raw data from Lavalink to build the Track from.
      * @param requester The user who requested the track, if any.
+     * @param isAutoPlay Whether the track is autoplayed. Defaults to false.
      * @returns The built Track.
      */
-    static build<T = AnyUser>(data: TrackData, requester?: T): Track;
+    static build<T = AnyUser>(data: TrackData, requester?: T, isAutoplay?: boolean): Track;
     /**
      * Validates a search result.
      * @param result The search result to validate.

package/dist/statestorage/JsonQueue.js

@@ -56,8 +56,7 @@ class JsonQueue {
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[JSONQUEUE] Added ${tracks.length} track(s) to queue`);
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!isArray) {
-                    const AutoplayUser = (await this.manager.players.get(this.guildId).get("Internal_AutoplayUser"));
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {

package/dist/statestorage/MemoryQueue.js

@@ -84,8 +84,7 @@ class MemoryQueue extends Array {
             }
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!isArray) {
-                    const AutoplayUser = this.manager.players.get(this.guildId).get("Internal_AutoplayUser");
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {

package/dist/statestorage/RedisQueue.js

@@ -81,8 +81,7 @@ class RedisQueue {
             // Autoplay logic
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!Array.isArray(track)) {
-                    const AutoplayUser = (await this.manager.players.get(this.guildId).get("Internal_AutoplayUser"));
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {

package/dist/structures/Enums.js

@@ -163,6 +163,8 @@ var TrackPartial;
     TrackPartial["PluginInfo"] = "pluginInfo";
     /** The custom data of the track */
     TrackPartial["CustomData"] = "customData";
+    /** Whether the track got autoplayed */
+    TrackPartial["IsAutoPlay"] = "isAutoplay";
 })(TrackPartial || (exports.TrackPartial = TrackPartial = {}));
 /**
  * Manager Event Types Enum

package/dist/structures/Manager.js

@@ -579,7 +579,7 @@ class Manager extends events_1.EventEmitter {
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {
-                                        await player.queue.add(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
+                                        await player.queue.add(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester, currentTrack.isAutoplay));
                                     }
                                     const remainingQueue = queueTracks.filter((t) => t.uri !== lavaPlayer.track.info.uri);
                                     if (remainingQueue.length > 0) {
@@ -774,7 +774,7 @@ class Manager extends events_1.EventEmitter {
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {
-                                        await player.queue.add(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
+                                        await player.queue.add(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester, currentTrack.isAutoplay));
                                     }
                                     const remainingQueue = queueTracks.filter((t) => t.uri !== lavaPlayer.track.info.uri);
                                     if (remainingQueue.length > 0) {
@@ -1107,6 +1107,7 @@ class Manager extends events_1.EventEmitter {
         }
         this.emit(Enums_1.ManagerEventTypes.PlayerDisconnect, player, player.voiceChannelId);
         player.voiceChannelId = null;
+        player.state = Enums_1.StateTypes.Disconnected;
         player.voiceState = Object.assign({});
         if (player.options.pauseOnDisconnect) {
             await player.pause(true);

package/dist/structures/Node.js

@@ -632,12 +632,7 @@ class Node {
         player.playing = true;
         player.paused = false;
         this.manager.emit(Enums_1.ManagerEventTypes.TrackStart, player, track, payload);
-        const AutoplayUser = player.get("Internal_AutoplayUser");
-        if (!track.requester || !track.requester.id) {
-            console.log(track);
-            console.warn(`[WARN] Track requester missing for guild ${player.guildId}`, track);
-        }
-        if (AutoplayUser && track.requester && AutoplayUser.id === track.requester.id) {
+        if (track.isAutoplay) {
             this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
                 changeType: Enums_1.PlayerStateEventTypes.TrackChange,
                 details: {

package/dist/structures/Player.js

@@ -260,6 +260,9 @@ class Player {
      */
     async destroy(disconnect = true) {
         this.state = Enums_1.StateTypes.Destroying;
+        await this.queue.clear();
+        await this.queue.clearPrevious();
+        await this.queue.setCurrent(null);
         if (disconnect) {
             await this.disconnect().catch((err) => {
                 console.warn(`[Player#destroy] Failed to disconnect player ${this.guildId}:`, err);
@@ -268,9 +271,6 @@ class Player {
         await this.node.rest.destroyPlayer(this.guildId).catch((err) => {
             console.warn(`[Player#destroy] REST failed to destroy player ${this.guildId}:`, err);
         });
-        await this.queue.clear();
-        await this.queue.clearPrevious();
-        await this.queue.setCurrent(null);
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
         if (this.manager.options.stateStorage.deleteInactivePlayers)
@@ -1005,6 +1005,7 @@ class Player {
             nowPlayingMessage: this.nowPlayingMessage,
             isAutoplay: this.isAutoplay,
             applyVolumeAsFilter: this.options.applyVolumeAsFilter,
+            pauseOnDisconnect: this.options.pauseOnDisconnect,
         };
         // If force is true, destroy the existing player for the new guild
         if (force && newPlayer) {
@@ -1015,6 +1016,7 @@ class Player {
         newOptions.selfMute = newOptions.selfMute ?? oldPlayerProperties.selfMute;
         newOptions.volume = newOptions.volume ?? oldPlayerProperties.volume;
         newOptions.applyVolumeAsFilter = newOptions.applyVolumeAsFilter ?? oldPlayerProperties.applyVolumeAsFilter;
+        newOptions.pauseOnDisconnect = newOptions.pauseOnDisconnect ?? oldPlayerProperties.pauseOnDisconnect;
         // Deep clone the current player
         const clonedPlayer = this.manager.create(newOptions);
         // Connect the cloned player to the new voice channel

package/dist/structures/Utils.js

@@ -85,9 +85,10 @@ class TrackUtils {
      * Builds a Track from the raw data from Lavalink and a optional requester.
      * @param data The raw data from Lavalink to build the Track from.
      * @param requester The user who requested the track, if any.
+     * @param isAutoPlay Whether the track is autoplayed. Defaults to false.
      * @returns The built Track.
      */
-    static build(data, requester) {
+    static build(data, requester, isAutoplay = false) {
         if (typeof data === "undefined") {
             throw new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.UTILS_TRACK_BUILD_FAILED,
@@ -138,6 +139,7 @@ class TrackUtils {
                 requester: requester,
                 pluginInfo: data.pluginInfo,
                 customData: {},
+                isAutoplay: isAutoplay,
             };
             track.displayThumbnail = track.displayThumbnail.bind(track);
             if (this.trackPartial) {
@@ -560,7 +562,7 @@ class AutoPlayUtils {
                         context: { recommendedResult },
                     });
                 }
-                return [TrackUtils.build(data, requester)];
+                return [TrackUtils.build(data, requester, true)];
             }
             case Enums_1.LoadTypes.Short:
             case Enums_1.LoadTypes.Search: {
@@ -572,7 +574,7 @@ class AutoPlayUtils {
                         context: { recommendedResult },
                     });
                 }
-                return data.map((d) => TrackUtils.build(d, requester));
+                return data.map((d) => TrackUtils.build(d, requester, true));
             }
             case Enums_1.LoadTypes.Album:
             case Enums_1.LoadTypes.Artist:
@@ -582,7 +584,7 @@ class AutoPlayUtils {
             case Enums_1.LoadTypes.Playlist: {
                 const data = recommendedResult.data;
                 if (this.isPlaylistRawData(data)) {
-                    return data.tracks.map((d) => TrackUtils.build(d, requester));
+                    return data.tracks.map((d) => TrackUtils.build(d, requester, true));
                 }
                 throw new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.UTILS_AUTOPLAY_BUILD_FAILED,

package/package.json

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