refactor(Song): Song#id is mandatory

200percentmicky · Jun 11, 2024 · 9085236 · 9085236
1 parent aa10cc3
commit 9085236
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/core/manager/DisTubeVoiceManager.ts b/src/core/manager/DisTubeVoiceManager.ts
@@ -11,7 +11,7 @@ import type { VoiceBasedChannel } from "discord.js";
 export class DisTubeVoiceManager extends GuildIdManager<DisTubeVoice> {
   /**
    * Create a {@link DisTubeVoice} instance
-   * @param channel - A voice channel to join
+   * @param channel - A voice chann el to join
    */
   create(channel: VoiceBasedChannel): DisTubeVoice {
     const existing = this.get(channel.guildId);

diff --git a/src/core/manager/QueueManager.ts b/src/core/manager/QueueManager.ts
@@ -56,11 +56,9 @@ export class QueueManager extends GuildIdManager<Queue> {
    * @param queue - Queue
    */
   #emitPlaySong(queue: Queue): boolean {
-    return (
-      !this.options.emitNewSongOnly ||
-      (queue.repeatMode === RepeatMode.SONG && queue._next) ||
-      (queue.repeatMode !== RepeatMode.SONG && queue.songs[0]?.id !== queue.songs[1]?.id)
-    );
+    if (!this.options.emitNewSongOnly) return true;
+    if (queue.repeatMode === RepeatMode.SONG) return queue._next || queue._prev;
+    return queue.songs[0].id !== queue.songs[1].id;
   }
 
   /**

diff --git a/src/struct/Song.ts b/src/struct/Song.ts
@@ -14,7 +14,7 @@ export class Song<T = unknown> {
   /**
    * Song ID.
    */
-  id?: string;
+  id: string;
   /**
    * Song name.
    */

diff --git a/src/type.ts b/src/type.ts
@@ -194,8 +194,7 @@ export interface SongInfo {
   plugin: DisTubePlugin | null;
   source: string;
   playFromSource: boolean;
-  streamURL?: string;
-  id?: string;
+  id: string;
   name?: string;
   isLive?: boolean;
   duration?: number;