magmastream 2.9.2-dev.3 → 2.9.2-dev.4

package/dist/index.d.ts

@@ -1,13 +1,14 @@
 import { Collection } from '@discordjs/collection';
 import { GatewayVoiceStateUpdate } from 'discord-api-types/v10';
 import { EventEmitter } from 'events';
-import { Message, User, ClientUser, Client } from 'discord.js';
+import { User, ClientUser, Message, Client } from 'discord.js';
+import { User as User$1, Message as Message$1, Client as Client$2 } from 'oceanic.js';
+import { User as User$2, Message as Message$2 } from 'detritus-client/lib/structures';
+import { User as User$3, Message as Message$3, Client as Client$1 } from 'eris';
+import { User as User$4, ClientUser as ClientUser$1, Message as Message$4, Client as Client$3, WorkerClient } from 'seyfert';
 import WebSocket$1, { WebSocket } from 'ws';
 import { Redis } from 'ioredis';
-import { Client as Client$1, User as User$1 } from 'eris';
 import { ClusterClient, ShardClient } from 'detritus-client';
-import { Client as Client$2, User as User$2 } from 'oceanic.js';
-import { Client as Client$3, WorkerClient, User as User$3 } from 'seyfert';
 
 /** Represents an equalizer band. */
 interface Band {
@@ -961,6 +962,20 @@ interface PortableUser {
     id: string;
     username?: string;
 }
+/**
+ * Any user
+ */
+type AnyUser = PortableUser | User | ClientUser | User$1 | User$2 | User$3 | User$4 | ClientUser$1;
+/**
+ * Portable Message
+ */
+interface PortableMessage {
+    id: string;
+}
+/**
+ * Any message
+ */
+type AnyMessage = PortableMessage | Message | Message$1 | Message$2 | Message$3 | Message$4;
 /**
  * Discord Packet
  */
@@ -1166,7 +1181,7 @@ interface Track {
     /** The thumbnail of the track or null if it's a unsupported source. */
     readonly thumbnail: string | null;
     /** The user that requested the track. */
-    requester?: PortableUser;
+    requester?: AnyUser;
     /** Displays the track thumbnail with optional size or null if it's a unsupported source. */
     displayThumbnail(size?: Sizes): string;
     /** Additional track info provided by plugins. */
@@ -1351,7 +1366,7 @@ interface PlaylistData {
     /** The playlist name. */
     name: string;
     /** Requester of playlist. */
-    requester: PortableUser;
+    requester: AnyUser;
     /** More playlist information. */
     playlistInfo: PlaylistInfoData[];
     /** The length of the playlist. */
@@ -2047,7 +2062,7 @@ declare class Player {
     /** The text channel for the player. */
     textChannelId: string | null;
     /**The now playing message. */
-    nowPlayingMessage?: Message;
+    nowPlayingMessage?: AnyMessage;
     /** The current state of the player. */
     state: StateTypes;
     /** The equalizer bands array. */
@@ -2146,7 +2161,7 @@ declare class Player {
      * @param message - The message of the now playing message.
      * @returns The now playing message.
      */
-    setNowPlayingMessage<T = Message>(message: T): Message;
+    setNowPlayingMessage(message: AnyMessage): AnyMessage;
     /**
      * Plays the next track.
      *
@@ -3076,7 +3091,7 @@ declare class Manager extends EventEmitter {
      * Resolves a PortableUser or ID to a real user object.
      * Can be overridden by wrapper managers to return wrapper-specific User classes.
      */
-    resolveUser(user: PortableUser | string): Promise<PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<AnyUser>;
 }
 
 declare class Filters {
@@ -3455,7 +3470,7 @@ declare abstract class TrackUtils {
      * @param requester The user who requested the track, if any.
      * @returns The built Track.
      */
-    static build<T = PortableUser | User | ClientUser>(data: TrackData, requester?: T): Track;
+    static build<T = AnyUser>(data: TrackData, requester?: T): Track;
     /**
      * Validates a search result.
      * @param result The search result to validate.
@@ -3591,7 +3606,7 @@ declare class DiscordJSManager extends Manager {
     readonly client: Client;
     constructor(client: Client, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
-    resolveUser(user: PortableUser | string): Promise<User | PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<User | AnyUser>;
 }
 
 /**
@@ -3601,7 +3616,7 @@ declare class ErisManager extends Manager {
     readonly client: Client$1;
     constructor(client: Client$1, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
-    resolveUser(user: PortableUser | string): Promise<User$1 | PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<User$3 | AnyUser>;
 }
 
 /**
@@ -3611,7 +3626,7 @@ declare class DetritusManager extends Manager {
     readonly client: ClusterClient | ShardClient;
     constructor(client: ClusterClient | ShardClient, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
-    resolveUser(user: PortableUser | string): Promise<PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<AnyUser>;
 }
 
 /**
@@ -3621,7 +3636,7 @@ declare class OceanicManager extends Manager {
     readonly client: Client$2;
     constructor(client: Client$2, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
-    resolveUser(user: PortableUser | string): Promise<User$2 | PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<User$1 | AnyUser>;
 }
 
 /**
@@ -3653,8 +3668,8 @@ declare class SeyfertManager extends Manager {
     readonly client: Client$3 | WorkerClient;
     constructor(client: Client$3 | WorkerClient, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
-    resolveUser(user: PortableUser | string): Promise<User$3 | PortableUser>;
+    resolveUser(user: AnyUser | string): Promise<User$4 | AnyUser>;
 }
 
 export { AutoPlayPlatform, AutoPlayUtils, AvailableFilters, DetritusManager, DiscordJSManager, ErisManager, Filters, JSONUtils, JsonQueue, LoadTypes, MagmaStreamError, MagmaStreamErrorCode, MagmaStreamErrorNumbers, Manager, ManagerEventTypes, MemoryQueue, Node, OceanicManager, Player, PlayerStateEventTypes, PlayerUtils, Plugin, RedisQueue, Rest, SearchPlatform, SeverityTypes, SeyfertManager, SponsorBlockSegment, StateStorageType, StateTypes, Structure, TrackEndReasonTypes, TrackPartial, TrackSourceTypes, TrackUtils, UseNodeOptions };
-export type { AlbumSearchResult, ArtistSearchResult, CPUStats, DiscordPacket, DistortionOptions, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, JsonConfig, KaraokeOptions, LavaPlayer, LavalinkInfo, LavalinkResponse, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateUpdateEvent, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, PodcastSearchResult, PortableUser, RedisConfig, RestPlayOptions, ReverbOptions, RotationOptions, SearchQuery, SearchResult, SearchSearchResult, Severity, ShortSearchResult, ShowSearchResult, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, StationSearchResult, TimescaleOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VibratoOptions, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };
+export type { AlbumSearchResult, AnyMessage, AnyUser, ArtistSearchResult, CPUStats, DiscordPacket, DistortionOptions, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, JsonConfig, KaraokeOptions, LavaPlayer, LavalinkInfo, LavalinkResponse, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateUpdateEvent, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, PodcastSearchResult, PortableMessage, PortableUser, RedisConfig, RestPlayOptions, ReverbOptions, RotationOptions, SearchQuery, SearchResult, SearchSearchResult, Severity, ShortSearchResult, ShowSearchResult, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, StationSearchResult, TimescaleOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VibratoOptions, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };

package/dist/structures/Node.js

@@ -575,8 +575,10 @@ class Node {
                 this.trackStart(player, track, payload);
                 break;
             case "TrackEndEvent":
-                if (player?.nowPlayingMessage && player?.nowPlayingMessage.deletable) {
-                    await player?.nowPlayingMessage?.delete().catch(() => { });
+                if (player?.nowPlayingMessage) {
+                    if ("delete" in player.nowPlayingMessage && typeof player.nowPlayingMessage.delete === "function") {
+                        await player.nowPlayingMessage.delete().catch(() => { });
+                    }
                 }
                 await this.trackEnd(player, track, payload);
                 break;
@@ -662,7 +664,7 @@ class Node {
         const previous = await player.queue.getPrevious();
         const current = await player.queue.getCurrent();
         // Only add current to previous if it's not already the newest
-        if (!skipFlag && (previous.length === 0 || (previous.at(-1)?.track !== current?.track))) {
+        if (!skipFlag && (previous.length === 0 || previous.at(-1)?.track !== current?.track)) {
             await player.queue.addPrevious(current);
         }
         player.set("skipFlag", false);
@@ -736,7 +738,6 @@ class Node {
         const filteredTracks = tracks.filter((track) => track.identifier !== lastTrack.identifier && track.uri !== lastTrack.uri && normalize(track.title) !== normalize(lastTrack.title));
         if (filteredTracks.length) {
             const randomTrack = filteredTracks[Math.floor(Math.random() * filteredTracks.length)];
-            console.log(randomTrack);
             await player.queue.add(randomTrack);
             await player.play();
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.2-dev.3",
+	"version": "2.9.2-dev.4",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -12,7 +12,8 @@
 		"types": "rtb --dist dist",
 		"lint": "eslint src",
 		"lint:fix": "eslint --fix src",
-		"ci": "run-s lint:fix lint build types"
+		"ci": "run-s lint:fix lint build types",
+		"release:dev": "npm run ci && npm version prerelease --preid=dev && npm run ci && npm publish --tag dev"
 	},
 	"devDependencies": {
 		"@favware/rollup-type-bundler": "^4.0.0",