From e690958cef4ec2d38ab297e016c7fcf9983b8b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Tue, 21 Nov 2023 07:03:05 +0200
Subject: [PATCH] Temp handle TypeError in missing playlist info

---
 src/client/commands/nowplaying.ts | 23 ++++++++------
 src/client/funcs/play.ts          | 53 +++++++++++++++++--------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/client/commands/nowplaying.ts b/src/client/commands/nowplaying.ts
index 830ee9c..4bfcf97 100644
--- a/src/client/commands/nowplaying.ts
+++ b/src/client/commands/nowplaying.ts
@@ -21,16 +21,19 @@ export default {
                     .then((response: Response) => response.json())
                     .catch(error => {
                     });
+                try {
+                    switch(radio.station?.playlist.type){
+                        case "supla":
+                            radio.station.track = "__" + playlist.items[0]?.artist + "__" + "\n" + playlist.items[0]?.song;
+                            break;
+                        case "yle":
+                            radio.station.track = "-";
+                            break;
+                        default:
+                            radio.station.track = "-";
+                    }
+                } catch(TypeError) {
 
-                switch(radio.station?.playlist.type){
-                    case "supla":
-                        radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song;
-                        break;
-                    case "yle":
-                        radio.station.track = "-";
-                        break;
-                    default:
-                        radio.station.track = "-";
                 }
             }
 
@@ -42,7 +45,7 @@ export default {
                     "%radio.station.name%": radio.station.name,
                     "%radio.station.owner%\n": radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "",
                     "%client.funcs.msToTime(completed)%": client.funcs.msToTime(completed),
-                    "\n\n%radio.station.track%": radio.station.track != "-" ? "\n\n" + radio.station.track : ""
+                    "\n\n%radio.station.track%": radio.station.track != undefined ? "\n\n" + radio.station.track : ""
                 }))
                 .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
                 .setFooter({
diff --git a/src/client/funcs/play.ts b/src/client/funcs/play.ts
index 4fae67e..283a7aa 100644
--- a/src/client/funcs/play.ts
+++ b/src/client/funcs/play.ts
@@ -16,15 +16,19 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
             .catch(error => {
             });
 
-        switch(radio.station?.playlist.type){
-            case "supla":
-                radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song;
-                break;
-            case "yle":
-                radio.station.track = "-";
-                break;
-            default:
-                radio.station.track = "-";
+        try {
+            switch(radio.station?.playlist.type){
+                case "supla":
+                    radio.station.track = "__" + playlist.items[0]?.artist + "__" + "\n" + playlist.items[0]?.song;
+                    break;
+                case "yle":
+                    radio.station.track = "-";
+                    break;
+                default:
+                    radio.station.track = "-";
+            }
+        } catch(TypeError) {
+
         }
     }
 
@@ -42,7 +46,7 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
         {
             name: client.messages.playTitle2,
             value: client.messages.replace(client.messages.playDescription2, {
-                "%radio.station.track%": radio.station.track
+                "%radio.station.track%": radio.station.track != undefined ? "\n\n" + radio.station.track : "-"
             })
         })
         .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
@@ -102,19 +106,22 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
                 .then((response: Response) => response.json())
                 .catch(error => {
                 });
+            try {
+                switch(radio.station?.playlist.type){
+                    case "supla":
+                        if(radio.station.track != playlist.items[0].artist + "\n" + playlist.items[0].song){
+                            changed = true;
+                            radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song;
+                        }
+                        break;
+                    case "yle":
+                        radio.station.track = "-";
+                        break;
+                    default:
+                        radio.station.track = "-";
+                }
+            } catch(TypeError) {
 
-            switch(radio.station?.playlist.type){
-                case "supla":
-                    if(radio.station.track != playlist.items[0].artist + "\n" + playlist.items[0].song){
-                        changed = true;
-                        radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song;
-                    }
-                    break;
-                case "yle":
-                    radio.station.track = "-";
-                    break;
-                default:
-                    radio.station.track = "-";
             }
         }
 
@@ -133,7 +140,7 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
             {
                 name: client.messages.playTitle2,
                 value: client.messages.replace(client.messages.playDescription2, {
-                    "%radio.station.track%": radio.station.track
+                    "%radio.station.track%": radio.station.track != undefined ? "\n\n" + radio.station.track : "-"
                 })
             })
             .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')