diff --git a/src/client/classes/Radio.ts b/src/client/classes/Radio.ts index 6de5d49..dc60097 100644 --- a/src/client/classes/Radio.ts +++ b/src/client/classes/Radio.ts @@ -10,6 +10,7 @@ export interface radio { connection: VoiceConnection | undefined, message: Message | null, station: station, + track?: string, datastore?: datastore, currentTime?: number, startTime: number, diff --git a/src/client/classes/Stations.ts b/src/client/classes/Stations.ts index c3f2fb5..9fde50a 100644 --- a/src/client/classes/Stations.ts +++ b/src/client/classes/Stations.ts @@ -11,7 +11,6 @@ export interface station { type: "radioplay" | "supla" | "yle", address: string | string } - track?: string; } export default class Stations extends Array { diff --git a/src/client/funcs/play.ts b/src/client/funcs/play.ts index 41bfed8..b41ebf9 100644 --- a/src/client/funcs/play.ts +++ b/src/client/funcs/play.ts @@ -20,27 +20,27 @@ export default async function play(client: RadioClient, interaction: ChatInputCo .catch(error => { }); - radio.station.track = "-"; + radio.track = "-"; if(playlist){ switch(radio.station.playlist.type){ case "radioplay": if(playlist[0] && playlist[0].stationNowPlaying && playlist[0].stationNowPlaying.nowPlayingArtist && playlist[0].stationNowPlaying.nowPlayingTrack){ - radio.station.track = "__" + playlist[0].stationNowPlaying.nowPlayingArtist + "__" + "\n" + playlist[0].stationNowPlaying.nowPlayingTrack; + radio.track = "__" + playlist[0].stationNowPlaying.nowPlayingArtist + "__" + "\n" + playlist[0].stationNowPlaying.nowPlayingTrack; } break; case "supla": if(playlist.items && playlist.items[0] && playlist.items[0].artist && playlist.items[0].song){ - radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song; + radio.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song; } break; case "yle": if(playlist.data && playlist.data.performer && playlist.data.title){ - radio.station.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title; + radio.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title; } break; default: - radio.station.track = "-"; + radio.track = "-"; } } } @@ -60,7 +60,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 != undefined ? "\n\n" + radio.station.track : "-" + "%radio.station.track%": radio.track != undefined ? "\n\n" + radio.track : "-" }) }, { @@ -135,27 +135,27 @@ export default async function play(client: RadioClient, interaction: ChatInputCo .catch(error => { }); - radio.station.track = "-"; + radio.track = "-"; if(playlist){ switch(radio.station.playlist?.type){ case "radioplay": if(playlist[0] && playlist[0].stationNowPlaying && playlist[0].stationNowPlaying.nowPlayingArtist && playlist[0].stationNowPlaying.nowPlayingTrack){ - radio.station.track = "__" + playlist[0].stationNowPlaying.nowPlayingArtist + "__" + "\n" + playlist[0].stationNowPlaying.nowPlayingTrack; + radio.track = "__" + playlist[0].stationNowPlaying.nowPlayingArtist + "__" + "\n" + playlist[0].stationNowPlaying.nowPlayingTrack; } break; case "supla": if(playlist.items && playlist.items[0] && playlist.items[0].artist && playlist.items[0].song){ - radio.station.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song; + radio.track = "__" + playlist.items[0].artist + "__" + "\n" + playlist.items[0].song; } break; case "yle": if(playlist.data && playlist.data.performer && playlist.data.title){ - radio.station.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title; + radio.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title; } break; default: - radio.station.track = "-"; + radio.track = "-"; } } } @@ -180,7 +180,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 != undefined ? "\n\n" + radio.station.track : "-" + "%radio.station.track%": radio.track != undefined ? "\n\n" + radio.track : "-" }) }, {