Fix now playing logic - move track from station to radio interface

Co-authored-by: cwchristerw <13464896+cwchristerw@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-06 22:32:16 +00:00
parent ff8d6bc273
commit aff9a67e2c
3 changed files with 13 additions and 13 deletions

View File

@@ -10,6 +10,7 @@ export interface radio {
connection: VoiceConnection | undefined,
message: Message | null,
station: station,
track?: string,
datastore?: datastore,
currentTime?: number,
startTime: number,

View File

@@ -11,7 +11,6 @@ export interface station {
type: "radioplay" | "supla" | "yle",
address: string | string
}
track?: string;
}
export default class Stations extends Array {

View File

@@ -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 : "-"
})
},
{