magmastream 2.9.3-dev.2 → 2.9.3-dev.20

package/dist/statestorage/MemoryQueue.js

@@ -16,6 +16,10 @@ class MemoryQueue extends Array {
     manager;
     /** The guild ID property. */
     guildId;
+    /**
+     * Whether the queue has been destroyed.
+     */
+    destroyed = false;
     /**
      * Constructs a new Queue.
      * @param guildId The guild ID.
@@ -34,7 +38,7 @@ class MemoryQueue extends Array {
      * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
      * @param [offset=null] The position to add the track(s) at. If not provided, the track(s) will be added at the end of the queue.
      */
-    async add(track, offset) {
+    add(track, offset) {
         try {
             const isArray = Array.isArray(track);
             const tracks = isArray ? [...track] : [track];
@@ -84,8 +88,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: {
@@ -123,7 +126,7 @@ class MemoryQueue extends Array {
      * Adds a track to the previous tracks.
      * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
      */
-    async addPrevious(track) {
+    addPrevious(track) {
         try {
             const max = this.manager.options.maxPreviousTracks;
             if (Array.isArray(track)) {
@@ -155,7 +158,7 @@ class MemoryQueue extends Array {
      * Clears the queue.
      * This will remove all tracks from the queue and emit a state update event.
      */
-    async clear() {
+    clear() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -187,20 +190,32 @@ class MemoryQueue extends Array {
     /**
      * Clears the previous tracks.
      */
-    async clearPrevious() {
+    clearPrevious() {
         this.previous = [];
     }
     /**
      * Removes the first element from the queue.
      */
-    async dequeue() {
+    dequeue() {
         return super.shift();
     }
+    /**
+     * Destroys the queue and releases all resources.
+     * After calling this method, the queue must not be used again.
+     */
+    destroy() {
+        if (this.destroyed)
+            return;
+        this.destroyed = true;
+        this.splice(0);
+        this.previous.length = 0;
+        this.current = null;
+    }
     /**
      * The total duration of the queue in milliseconds.
      * This includes the duration of the currently playing track.
      */
-    async duration() {
+    duration() {
         const current = this.current?.duration ?? 0;
         return this.reduce((acc, cur) => acc + (cur.duration || 0), current);
     }
@@ -208,7 +223,7 @@ class MemoryQueue extends Array {
      * Adds the specified track or tracks to the front of the queue.
      * @param track The track or tracks to add.
      */
-    async enqueueFront(track) {
+    enqueueFront(track) {
         if (Array.isArray(track)) {
             this.unshift(...track);
         }
@@ -219,49 +234,49 @@ class MemoryQueue extends Array {
     /**
      * @returns Whether all elements in the queue satisfy the provided testing function.
      */
-    async everyAsync(callback) {
+    everyAsync(callback) {
         return this.every(callback);
     }
     /**
      * @returns A new array with all elements that pass the test implemented by the provided function.
      */
-    async filterAsync(callback) {
+    filterAsync(callback) {
         return this.filter(callback);
     }
     /**
      * @returns The first element in the queue that satisfies the provided testing function.
      */
-    async findAsync(callback) {
+    findAsync(callback) {
         return this.find(callback);
     }
     /**
      * @returns The current track.
      */
-    async getCurrent() {
+    getCurrent() {
         return this.current;
     }
     /**
      * @returns The previous tracks.
      */
-    async getPrevious() {
+    getPrevious() {
         return [...this.previous];
     }
     /**
      * @returns The tracks in the queue from start to end.
      */
-    async getSlice(start, end) {
+    getSlice(start, end) {
         return this.slice(start, end); // Native sync method, still wrapped in a Promise
     }
     /**
      * @returns The tracks in the queue.
      */
-    async getTracks() {
+    getTracks() {
         return [...this]; // clone to avoid direct mutation
     }
     /**
      * @returns A new array with the results of calling a provided function on every element in the queue.
      */
-    async mapAsync(callback) {
+    mapAsync(callback) {
         return this.map(callback);
     }
     /**
@@ -271,16 +286,16 @@ class MemoryQueue extends Array {
      * @param items The elements to add to the queue.
      * @returns The modified queue.
      */
-    async modifyAt(start, deleteCount = 0, ...items) {
+    modifyAt(start, deleteCount = 0, ...items) {
         return super.splice(start, deleteCount, ...items);
     }
     /**
      * @returns The newest track.
      */
-    async popPrevious() {
+    popPrevious() {
         return this.previous.pop() || null; // get newest track
     }
-    async remove(startOrPosition = 0, end) {
+    remove(startOrPosition = 0, end) {
         try {
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
             if (typeof end !== "undefined") {
@@ -332,7 +347,7 @@ class MemoryQueue extends Array {
     /**
      * Shuffles the queue to play tracks requested by each user one by one.
      */
-    async roundRobinShuffle() {
+    roundRobinShuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -340,11 +355,11 @@ class MemoryQueue extends Array {
             const userTracks = new Map();
             // Group the tracks in the queue by the user that requested them.
             this.forEach((track) => {
-                const user = track.requester.id;
-                if (!userTracks.has(user)) {
-                    userTracks.set(user, []);
+                const userId = track.requester.id.toString();
+                if (!userTracks.has(userId)) {
+                    userTracks.set(userId, []);
                 }
-                userTracks.get(user).push(track);
+                userTracks.get(userId).push(track);
             });
             // Shuffle the tracks of each user.
             userTracks.forEach((tracks) => {
@@ -395,20 +410,20 @@ class MemoryQueue extends Array {
     /**
      * @param track The track to set.
      */
-    async setCurrent(track) {
+    setCurrent(track) {
         this.current = track;
     }
     /**
      * @param tracks The tracks to set.
      */
-    async setPrevious(tracks) {
+    setPrevious(tracks) {
         this.previous = [...tracks];
     }
     /**
      * Shuffles the queue.
      * This will randomize the order of the tracks in the queue and emit a state update event.
      */
-    async shuffle() {
+    shuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -444,13 +459,13 @@ class MemoryQueue extends Array {
      * This does not include the currently playing track.
      * @returns The size of tracks in the queue.
      */
-    async size() {
+    size() {
         return this.length;
     }
     /**
      * @returns Whether at least one element in the queue satisfies the provided testing function.
      */
-    async someAsync(callback) {
+    someAsync(callback) {
         return this.some(callback);
     }
     /**
@@ -458,24 +473,24 @@ class MemoryQueue extends Array {
      * This includes the current track if it is not null.
      * @returns The total size of tracks in the queue including the current track.
      */
-    async totalSize() {
+    totalSize() {
         return this.length + (this.current ? 1 : 0);
     }
     /**
      * Shuffles the queue to play tracks requested by each user one block at a time.
      */
-    async userBlockShuffle() {
+    userBlockShuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
             // Group the tracks in the queue by the user that requested them.
             const userTracks = new Map();
             this.forEach((track) => {
-                const user = track.requester.id;
-                if (!userTracks.has(user)) {
-                    userTracks.set(user, []);
+                const userId = track.requester.id.toString();
+                if (!userTracks.has(userId)) {
+                    userTracks.set(userId, []);
                 }
-                userTracks.get(user).push(track);
+                userTracks.get(userId).push(track);
             });
             // Create a new array for the shuffled queue.
             const shuffledQueue = [];

package/dist/statestorage/RedisQueue.js

@@ -18,6 +18,10 @@ class RedisQueue {
      * The Redis instance.
      */
     redis;
+    /**
+     * Whether the queue has been destroyed.
+     */
+    destroyed = false;
     /**
      * Constructs a new RedisQueue.
      * @param guildId The guild ID.
@@ -27,11 +31,7 @@ class RedisQueue {
         this.guildId = guildId;
         this.manager = manager;
         this.redis = manager.redis;
-        const rawPrefix = manager.options.stateStorage.redisConfig.prefix;
-        let clean = typeof rawPrefix === "string" ? rawPrefix.trim() : "";
-        if (!clean.endsWith(":"))
-            clean = clean || "magmastream";
-        this.redisPrefix = `${clean}:`;
+        this.redisPrefix = Utils_1.PlayerUtils.getRedisKey();
     }
     // #region Public
     /**
@@ -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: {
@@ -223,6 +222,28 @@ class RedisQueue {
             console.error(error);
         }
     }
+    /**
+     * Destroys the queue and releases all resources.
+     * After calling this method, the queue must not be used again.
+     */
+    async destroy() {
+        if (this.destroyed)
+            return;
+        this.destroyed = true;
+        try {
+            await this.redis.del(this.queueKey, this.previousKey, this.currentKey);
+        }
+        catch (err) {
+            const error = err instanceof MagmastreamError_1.MagmaStreamError
+                ? err
+                : new MagmastreamError_1.MagmaStreamError({
+                    code: Enums_1.MagmaStreamErrorCode.QUEUE_REDIS_ERROR,
+                    message: `Failed to destroy RedisQueue for guild ${this.guildId}: ${err.message}`,
+                    cause: err,
+                });
+            console.error(error);
+        }
+    }
     /**
      * @returns The total duration of the queue in milliseconds.
      * This includes the duration of the currently playing track.
@@ -488,7 +509,7 @@ class RedisQueue {
             const deserialized = rawTracks.map(this.deserialize);
             const userMap = new Map();
             for (const track of deserialized) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);
@@ -659,7 +680,7 @@ class RedisQueue {
             const deserialized = rawTracks.map(this.deserialize);
             const userMap = new Map();
             for (const track of deserialized) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);

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
@@ -283,6 +285,7 @@ var MagmaStreamErrorCode;
     MagmaStreamErrorCode["GENERAL_UNKNOWN"] = "MS_GENERAL_UNKNOWN";
     MagmaStreamErrorCode["GENERAL_TIMEOUT"] = "MS_GENERAL_TIMEOUT";
     MagmaStreamErrorCode["GENERAL_INVALID_MANAGER"] = "MS_GENERAL_INVALID_MANAGER";
+    MagmaStreamErrorCode["INTENT_MISSING"] = "MS_INTENT_MISSING";
     // MANAGER (1100)
     MagmaStreamErrorCode["MANAGER_INIT_FAILED"] = "MS_MANAGER_INIT_FAILED";
     MagmaStreamErrorCode["MANAGER_INVALID_CONFIG"] = "MS_MANAGER_INVALID_CONFIG";
@@ -326,6 +329,7 @@ var MagmaStreamErrorCode;
     MagmaStreamErrorCode["UTILS_TRACK_PARTIAL_INVALID"] = "MS_UTILS_TRACK_PARTIAL_INVALID";
     MagmaStreamErrorCode["UTILS_TRACK_BUILD_FAILED"] = "MS_UTILS_TRACK_BUILD_FAILED";
     MagmaStreamErrorCode["UTILS_AUTOPLAY_BUILD_FAILED"] = "MS_UTILS_AUTOPLAY_BUILD_FAILED";
+    MagmaStreamErrorCode["UTILS_PLAYER_SERIALIZE_FAILED"] = "MS_UTILS_PLAYER_SERIALIZE_FAILED";
     // PLUGIN (1800)
     MagmaStreamErrorCode["PLUGIN_LOAD_FAILED"] = "MS_PLUGIN_LOAD_FAILED";
     MagmaStreamErrorCode["PLUGIN_RUNTIME_ERROR"] = "MS_PLUGIN_RUNTIME_ERROR";
@@ -336,6 +340,7 @@ exports.MagmaStreamErrorNumbers = {
     [MagmaStreamErrorCode.GENERAL_UNKNOWN]: 1000,
     [MagmaStreamErrorCode.GENERAL_TIMEOUT]: 1001,
     [MagmaStreamErrorCode.GENERAL_INVALID_MANAGER]: 1002,
+    [MagmaStreamErrorCode.INTENT_MISSING]: 1003,
     // MANAGER
     [MagmaStreamErrorCode.MANAGER_INIT_FAILED]: 1100,
     [MagmaStreamErrorCode.MANAGER_INVALID_CONFIG]: 1101,
@@ -379,6 +384,7 @@ exports.MagmaStreamErrorNumbers = {
     [MagmaStreamErrorCode.UTILS_TRACK_PARTIAL_INVALID]: 1700,
     [MagmaStreamErrorCode.UTILS_TRACK_BUILD_FAILED]: 1701,
     [MagmaStreamErrorCode.UTILS_AUTOPLAY_BUILD_FAILED]: 1702,
+    [MagmaStreamErrorCode.UTILS_PLAYER_SERIALIZE_FAILED]: 1703,
     // PLUGIN
     [MagmaStreamErrorCode.PLUGIN_LOAD_FAILED]: 1800,
     [MagmaStreamErrorCode.PLUGIN_RUNTIME_ERROR]: 1801,

package/dist/structures/Filters.js

@@ -8,8 +8,6 @@ class Filters {
     distortion;
     equalizer;
     karaoke;
-    manager;
-    player;
     rotation;
     timescale;
     vibrato;
@@ -17,15 +15,16 @@ class Filters {
     volume;
     bassBoostlevel;
     filtersStatus;
+    manager;
+    player;
     constructor(player, manager) {
         this.distortion = null;
         this.equalizer = [];
         this.karaoke = null;
-        this.manager = manager;
-        this.player = player;
         this.rotation = null;
         this.timescale = null;
         this.vibrato = null;
+        this.reverb = null;
         this.volume = 1.0;
         this.bassBoostlevel = 0;
         // Initialize filter status
@@ -33,6 +32,8 @@ class Filters {
             acc[filter] = false;
             return acc;
         }, {});
+        this.manager = manager;
+        this.player = player;
     }
     /**
      * Updates the player's audio filters.

package/dist/structures/Manager.js

@@ -28,6 +28,7 @@ class Manager extends events_1.EventEmitter {
     initiated = false;
     redis;
     _send;
+    _getUser;
     loadedPlugins = new Set();
     /**
      * Initiates the Manager class.
@@ -61,6 +62,8 @@ class Manager extends events_1.EventEmitter {
             this.options.clusterId = options.clusterId;
         if (options.send && !this._send)
             this._send = options.send;
+        if (options.getUser && !this._getUser)
+            this._getUser = options.getUser;
         this.options = {
             ...options,
             enabledPlugins: options.enabledPlugins ?? [],
@@ -177,11 +180,15 @@ class Manager extends events_1.EventEmitter {
                 db: config.db ?? 0,
             });
         }
-        for (const node of this.nodes.values()) {
-            try {
-                await node.connect();
-            }
-            catch (err) {
+        const results = await Promise.allSettled([...this.nodes.values()].map(async (node) => {
+            await node.connect();
+            return node;
+        }));
+        for (let i = 0; i < results.length; i++) {
+            const result = results[i];
+            const node = [...this.nodes.values()][i];
+            if (result.status === "rejected") {
+                const err = result.reason;
                 const error = err instanceof MagmastreamError_1.MagmaStreamError
                     ? err
                     : new MagmastreamError_1.MagmaStreamError({
@@ -277,9 +284,7 @@ class Manager extends events_1.EventEmitter {
                     result.playlist.tracks = result.playlist.tracks.map(processTrack);
                 }
             }
-            const summary = "tracks" in result
-                ? result.tracks.map((t) => Object.fromEntries(Object.entries(t).filter(([key]) => key !== "requester")))
-                : [];
+            const summary = "tracks" in result ? result.tracks.map((t) => Object.fromEntries(Object.entries(t).filter(([key]) => key !== "requester"))) : [];
             this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Result search for ${_query.query}: ${Utils_1.JSONUtils.safe(summary, 2)}`);
             return result;
         }
@@ -466,9 +471,7 @@ class Manager extends events_1.EventEmitter {
             case Enums_1.StateStorageType.Redis:
                 {
                     try {
-                        const redisKey = `${this.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                            ? this.options.stateStorage.redisConfig.prefix
-                            : this.options.stateStorage.redisConfig.prefix ?? "magmastream:"}playerstore:${guildId}`;
+                        const redisKey = `${Utils_1.PlayerUtils.getRedisKey()}playerstore:${guildId}`;
                         await this.redis.set(redisKey, JSON.stringify(serializedPlayer));
                         this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Player state saved to Redis: ${guildId}`);
                     }
@@ -558,6 +561,7 @@ class Manager extends events_1.EventEmitter {
                                             token: state.voiceState.event.token,
                                             endpoint: state.voiceState.event.endpoint,
                                             sessionId: state.voiceState.sessionId,
+                                            channelId: state.voiceState.event.channel_id,
                                         },
                                     },
                                 });
@@ -579,7 +583,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) {
@@ -720,9 +724,7 @@ class Manager extends events_1.EventEmitter {
                 {
                     try {
                         // Get all keys matching our pattern
-                        const redisKeyPattern = `${this.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                            ? this.options.stateStorage.redisConfig.prefix
-                            : this.options.stateStorage.redisConfig.prefix ?? "magmastream:"}playerstore:*`;
+                        const redisKeyPattern = `${Utils_1.PlayerUtils.getRedisKey()}playerstore:*`;
                         const keys = await this.redis.keys(redisKeyPattern);
                         for (const key of keys) {
                             try {
@@ -753,7 +755,14 @@ class Manager extends events_1.EventEmitter {
                                 const player = this.create(playerOptions);
                                 await player.node.rest.updatePlayer({
                                     guildId: state.options.guildId,
-                                    data: { voice: { token: state.voiceState.event.token, endpoint: state.voiceState.event.endpoint, sessionId: state.voiceState.sessionId } },
+                                    data: {
+                                        voice: {
+                                            token: state.voiceState.event.token,
+                                            endpoint: state.voiceState.event.endpoint,
+                                            sessionId: state.voiceState.sessionId,
+                                            channelId: state.voiceState.event.channel_id,
+                                        },
+                                    },
                                 });
                                 player.connect();
                                 // Rest of the player state restoration code (tracks, filters, etc.)
@@ -774,7 +783,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) {
@@ -916,11 +925,7 @@ class Manager extends events_1.EventEmitter {
      * @returns {Node} The node to use.
      */
     get useableNode() {
-        return this.options.enablePriorityMode
-            ? this.priorityNode
-            : this.options.useNode === Enums_1.UseNodeOptions.LeastLoad
-                ? this.leastLoadNode.first()
-                : this.leastPlayersNode.first();
+        return this.options.enablePriorityMode ? this.priorityNode : this.options.useNode === Enums_1.UseNodeOptions.LeastLoad ? this.leastLoadNode.first() : this.leastPlayersNode.first();
     }
     /**
      * Handles the shutdown of the process by saving all active players' states and optionally cleaning up inactive players.
@@ -1079,13 +1084,17 @@ class Manager extends events_1.EventEmitter {
      */
     async handleVoiceServerUpdate(player, update) {
         player.voiceState.event = update;
-        const { sessionId, event: { token, endpoint }, } = player.voiceState;
+        const sessionId = player.voiceState.sessionId;
+        const channelId = player.voiceState.channelId;
+        const token = update.token;
+        const endpoint = update.endpoint;
+        this.emit(Enums_1.ManagerEventTypes.Debug, `Updated voice server for player ${player.guildId} with token ${token} | endpoint ${endpoint} | sessionId ${sessionId} | channelId ${channelId}`);
+        if (!sessionId || !channelId)
+            return;
         await player.node.rest.updatePlayer({
             guildId: player.guildId,
-            data: { voice: { token, endpoint, sessionId } },
+            data: { voice: { token, endpoint, sessionId, channelId } },
         });
-        this.emit(Enums_1.ManagerEventTypes.Debug, `Updated voice server for player ${player.guildId} with token ${token} and endpoint ${endpoint} and sessionId ${sessionId}`);
-        return;
     }
     /**
      * Handles a voice state update by updating the player's voice channel and session ID if provided, or by disconnecting and destroying the player if the channel ID is null.
@@ -1096,22 +1105,30 @@ class Manager extends events_1.EventEmitter {
      */
     async handleVoiceStateUpdate(player, update) {
         this.emit(Enums_1.ManagerEventTypes.Debug, `Updated voice state for player ${player.guildId} with channel id ${update.channel_id} and session id ${update.session_id}`);
-        if (update.channel_id) {
-            if (player.voiceChannelId !== update.channel_id) {
-                this.emit(Enums_1.ManagerEventTypes.PlayerMove, player, player.voiceChannelId, update.channel_id);
-            }
-            player.voiceState.sessionId = update.session_id;
-            player.voiceChannelId = update.channel_id;
-            player.options.voiceChannelId = update.channel_id;
+        if (!update.channel_id) {
+            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);
             return;
         }
-        this.emit(Enums_1.ManagerEventTypes.PlayerDisconnect, player, player.voiceChannelId);
-        player.voiceChannelId = null;
-        player.voiceState = Object.assign({});
-        if (player.options.pauseOnDisconnect) {
-            await player.pause(true);
+        if (player.voiceChannelId !== update.channel_id) {
+            this.emit(Enums_1.ManagerEventTypes.PlayerMove, player, player.voiceChannelId, update.channel_id);
         }
-        return;
+        player.voiceState.sessionId = update.session_id;
+        player.voiceState.channelId = update.channel_id;
+        player.voiceChannelId = update.channel_id;
+        player.options.voiceChannelId = update.channel_id;
+        const token = player.voiceState.event?.token;
+        const endpoint = player.voiceState.event?.endpoint;
+        if (!token || !endpoint)
+            return;
+        await player.node.rest.updatePlayer({
+            guildId: player.guildId,
+            data: { voice: { token, endpoint, sessionId: update.session_id, channelId: update.channel_id } },
+        });
     }
     /**
      * Cleans up inactive players by removing their state files from the file system.
@@ -1154,9 +1171,7 @@ class Manager extends events_1.EventEmitter {
                 break;
             case Enums_1.StateStorageType.Redis:
                 {
-                    const prefix = this.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                        ? this.options.stateStorage.redisConfig.prefix
-                        : this.options.stateStorage.redisConfig.prefix ?? "magmastream:";
+                    const prefix = Utils_1.PlayerUtils.getRedisKey();
                     const pattern = `${prefix}queue:*:current`;
                     try {
                         const stream = this.redis.scanStream({
@@ -1229,9 +1244,7 @@ class Manager extends events_1.EventEmitter {
                 {
                     try {
                         if (!player) {
-                            const prefix = this.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                                ? this.options.stateStorage.redisConfig.prefix
-                                : `${this.options.stateStorage.redisConfig.prefix ?? "magmastream"}:`;
+                            const prefix = Utils_1.PlayerUtils.getRedisKey();
                             const keysToDelete = [
                                 `${prefix}playerstore:${guildId}`,
                                 `${prefix}queue:${guildId}:tracks`,
@@ -1339,9 +1352,7 @@ class Manager extends events_1.EventEmitter {
                 break;
             }
             case Enums_1.StateStorageType.Redis: {
-                const prefix = this.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                    ? this.options.stateStorage.redisConfig.prefix
-                    : this.options.stateStorage.redisConfig.prefix ?? "magmastream:";
+                const prefix = Utils_1.PlayerUtils.getRedisKey();
                 const patterns = [`${prefix}playerstore:*`, `${prefix}queue:*`];
                 try {
                     for (const pattern of patterns) {
@@ -1440,6 +1451,9 @@ class Manager extends events_1.EventEmitter {
         }
         return this._send(packet);
     }
+    getUserFromCache(id) {
+        return this._getUser?.(id);
+    }
     sendPacket(packet) {
         return this.send(packet);
     }