From e924082af521b7af3d4dd256bf70eed046db1df0 Mon Sep 17 00:00:00 2001
From: Manuel <30572287+manuel-rw@users.noreply.github.com>
Date: Wed, 8 Mar 2023 13:01:18 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20components=20in=20playlist?=
 =?UTF-8?q?=20command=20with=20no=20event=20collector?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/commands/playlist/playlist.command.ts     | 36 ++++++++++++++-----
 .../playlist.interaction-collector.ts         |  2 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/commands/playlist/playlist.command.ts b/src/commands/playlist/playlist.command.ts
index 4b837b3..a746304 100644
--- a/src/commands/playlist/playlist.command.ts
+++ b/src/commands/playlist/playlist.command.ts
@@ -75,6 +75,15 @@ export class PlaylistCommand {
     this.logger.debug(
       `Added '${interaction.id}' as a message id for page storage`,
     );
+
+    setTimeout(async () => {
+      this.logger.log(
+        `Removed the components of message from interaction '${interaction.id}' because the event collector has reachted the timeout`,
+      );
+      await interaction.editReply({
+        components: [],
+      });
+    }, 60 * 1000);
   }
 
   private getChunks() {
@@ -87,6 +96,19 @@ export class PlaylistCommand {
   ): InteractionReplyOptions | InteractionUpdateOptions {
     const chunks = this.getChunks();
 
+    if (chunks.length === 0) {
+      return {
+        embeds: [
+          this.discordMessageService.buildMessage({
+            title: 'There are no items in your playlist',
+            description:
+              'Use the ``/play`` command to add new items to your playlist',
+          }),
+        ],
+        ephemeral: true,
+      };
+    }
+
     if (page >= chunks.length) {
       return {
         embeds: [
@@ -136,6 +158,7 @@ export class PlaylistCommand {
       embeds: [contentForPage.toJSON()],
       ephemeral: true,
       components: [rowBuilder],
+      fetchReply: true,
     };
   }
 
@@ -149,11 +172,14 @@ export class PlaylistCommand {
       return undefined;
     }
 
+    const offset = page * 10;
+
     const content = chunks[page]
       .map((track, index) => {
         const isCurrent = track === playlist.getActiveTrack();
 
-        let point = this.getListPoint(isCurrent, index);
+        // use the offset for the page, add the current index and offset by one because the array index is used
+        let point = `${offset + index + 1}. `;
         point += `**${trimStringToFixedLength(track.name, 30)}**`;
 
         if (isCurrent) {
@@ -170,12 +196,4 @@ export class PlaylistCommand {
 
     return new EmbedBuilder().setTitle('Your playlist').setDescription(content);
   }
-
-  private getListPoint(isCurrent: boolean, index: number) {
-    if (isCurrent) {
-      return `${index + 1}. `;
-    }
-
-    return `${index + 1}. `;
-  }
 }
diff --git a/src/commands/playlist/playlist.interaction-collector.ts b/src/commands/playlist/playlist.interaction-collector.ts
index 3476918..bf7e99a 100644
--- a/src/commands/playlist/playlist.interaction-collector.ts
+++ b/src/commands/playlist/playlist.interaction-collector.ts
@@ -17,7 +17,7 @@ import {
 import { PlaylistCommand } from './playlist.command';
 
 @Injectable({ scope: Scope.REQUEST })
-@InteractionEventCollector({ time: 15 * 1000 })
+@InteractionEventCollector({ time: 60 * 1000 })
 export class PlaylistInteractionCollector {
   private readonly logger = new Logger(PlaylistInteractionCollector.name);