Merge pull request #900 from warengroup/develop

Version 0.5.3

.github/workflows/codeql-analyze.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docker-build.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v2.9.0
+      uses: docker/setup-buildx-action@v3.0.0
       id: buildx
       with:
         install: true

.github/workflows/typescript-build.yml

@@ -11,9 +11,9 @@ jobs:
     name: TypeScript Build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install node v16
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 16
     - name: npm install

SECURITY.md

@@ -5,7 +5,7 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 0.5.x   | :white_check_mark: |
-| 0.4.x   | :white_check_mark: |
+| 0.4.x   | :x:                |
 | 0.3.x   | :x:                |
 | 0.2.x   | :x:                |
 | 0.1.x   | :x:                |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -18,29 +18,29 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^1.6.3",
+    "@discordjs/builders": "^1.7.0",
     "@discordjs/opus": "^0.9.0",
-    "@discordjs/rest": "^1.7.1",
-    "@discordjs/voice": "^0.16.0",
-    "discord-api-types": "^0.37.47",
-    "discord.js": "^14.11.0",
+    "@discordjs/rest": "^2.2.0",
+    "@discordjs/voice": "^0.16.1",
+    "discord-api-types": "^0.37.65",
+    "discord.js": "^14.14.1",
     "dotenv": "^16.3.1",
-    "libsodium-wrappers": "^0.7.11",
+    "libsodium-wrappers": "^0.7.13",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^20.4.1",
-    "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "^3.0.0",
-    "rimraf": "^5.0.1",
+    "@types/node": "^20.10.0",
+    "@types/ws": "^8.5.9",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "prettier": "^3.1.0",
+    "rimraf": "^5.0.5",
     "ts-node": "^10.9.1",
     "tsc-watch": "^6.0.4",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "engines": {
       "node": ">=18.16.0",

src/client/classes/Radio.ts

@@ -1,19 +1,20 @@
-import { Channel, Collection, GuildMember, OAuth2Guild, TextBasedChannel, VoiceBasedChannel, VoiceChannel } from "discord.js";
+import { Collection, GuildMember, Message, OAuth2Guild, TextBasedChannel, VoiceBasedChannel, VoiceChannel } from "discord.js";
 import { getVoiceConnection, joinVoiceChannel, VoiceConnection } from "@discordjs/voice";
 import RadioClient from "../../Client";
 import { station } from "./Stations";
 import { datastore } from "./Datastore";
 
 export interface radio {
-    textChannel: Channel | TextBasedChannel | undefined | null,
-    voiceChannel: Channel | VoiceBasedChannel | undefined,
+    textChannel: TextBasedChannel | undefined | null,
+    voiceChannel: VoiceBasedChannel | undefined,
     connection: VoiceConnection | null,
-    message: null,
+    message: Message | null,
     station: station,
     datastore?: datastore,
     currentTime?: number,
     startTime: number,
     playTime?: number,
+    guild?: any
 }
 
 export interface state {
@@ -28,7 +29,7 @@ export interface state {
     }
 }
 
-export default class Radio extends Map {
+export default class Radio extends Map<string, radio> {
 
     constructor() {
         super();
@@ -75,8 +76,8 @@ export default class Radio extends Map {
 
             let date = new Date();
             const construct: radio = {
-                textChannel: client.channels.cache.get(state.channels.text),
-                voiceChannel: client.channels.cache.get(state.channels.voice),
+                textChannel: client.channels.cache.get(state.channels.text) as TextBasedChannel,
+                voiceChannel: client.channels.cache.get(state.channels.voice) as VoiceBasedChannel,
                 connection: null,
                 message: null,
                 station: station,

src/client/classes/Stations.ts

@@ -6,7 +6,12 @@ export interface station {
     logo: string,
     stream: {
         [key: string]: string
+    },
+    playlist?: {
+        type: "radioplay" | "supla" | "yle",
+        address: string | string
     }
+    track?: string;
 }
 
 export default class Stations extends Array {
@@ -20,7 +25,7 @@ export default class Stations extends Array {
             logger('Stations', 'Started fetching list - ' + options.url);
             let stations: station[] = await fetch(options.url)
                 .then(this.checkFetchStatus)
-                .then((response: Response) => response.json());
+                .then((response: Response) => response.json() as Promise<station[]>);
 
             for(const station of stations){
                 this.push(station);

src/client/classes/Streamer.ts

@@ -70,6 +70,13 @@ export default class Streamer {
                 })
                 .on(AudioPlayerStatus.Idle, () => {
                     logger('Streamer', station.name + " / " + "Idle");
+                    if(this.mode == "auto"){
+                        const url = station.stream[station.stream.default];
+                        const resource = createAudioResource(url);
+                        audioPlayer?.play(resource);
+                    } else {
+                        this.stop(station.name);
+                    }
                 })
                 .on(AudioPlayerStatus.Paused, () => {
                     logger('Streamer', station.name + " / " + "Paused");

src/client/commands.ts

@@ -6,7 +6,6 @@ import invite from "./commands/invite";
 import list from "./commands/list";
 import maintenance from "./commands/maintenance";
 import next from "./commands/next";
-import nowplaying from "./commands/nowplaying";
 import play from "./commands/play";
 import prev from "./commands/prev";
 import statistics from "./commands/statistics";
@@ -22,7 +21,7 @@ export interface command {
 }
 
 export default async function commands(client: RadioClient) {
-    const commands : command[] = [ bug, help, invite, list, maintenance, next, nowplaying, play, prev, statistics, status, stop ];
+    const commands : command[] = [ bug, help, invite, list, maintenance, next, play, prev, statistics, status, stop ];
 
     for(const command of commands){
         client.commands.set(command.name, command);

src/client/commands/list.ts

@@ -1,10 +1,13 @@
-import { ButtonInteraction, ChatInputCommandInteraction, EmbedBuilder, StringSelectMenuInteraction } from "discord.js";
+import { ApplicationCommandOptionType, ButtonInteraction, ChatInputCommandInteraction, EmbedBuilder, StringSelectMenuInteraction } from "discord.js";
 import RadioClient from "../../Client";
 import { station } from "../classes/Stations";
 
 export default {
     name: 'list',
-    description: 'List radio stations',
+    description: 'List stations',
+    options: [
+        { type: ApplicationCommandOptionType.String, name: "query", description: "Select list", choices: [{"name": "1", "value": "1"},{"name": "2", "value": "2"}], required: false}
+    ],
     category: 'radio',
     execute(interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient) {
 
@@ -15,6 +18,20 @@ export default {
             });
         }
 
+        if(!interaction.guild) return;
+
+        let query: string | null = null;
+
+        if(interaction.isChatInputCommand()){
+            query = interaction.options?.getString("query");
+        }
+
+        if(interaction.isStringSelectMenu()){
+            query = interaction.values?.[0];
+        }
+
+        if(!query) query = "1";
+
         if(!client.stations) {
             return interaction.reply({
                 content: client.messages.emojis["error"] + client.messages.replace(client.messages.errorToGetPlaylist, {
@@ -24,10 +41,10 @@ export default {
             });
         }
 
-        const radio = client.radio?.get(interaction.guild?.id);
+        const radio = client.radio?.get(interaction.guild.id);
 
         if(radio && !client.config.maintenanceMode){
-            client.funcs.listStations(client, interaction);
+            client.funcs.listStations(client, interaction, query);
         } else {
             let stations = `${client.stations.map((s: station) => `**#** ${s.name}`).join('\n')}`
             const hashs = stations.split('**#**').length;

src/client/commands/maintenance.ts

@@ -183,7 +183,7 @@ export default {
                 client.user?.setStatus('idle');
                 client.radio?.save(client);
 
-                setInterval(() => {
+                let timer : NodeJS.Timeout = setInterval(() => {
                     if(client.radio?.size == 0 && client.config.streamerMode == "manual" && client.config.maintenanceMode){
                         client.streamer?.leave(client);
                         client.streamer = new Streamer();
@@ -195,9 +195,9 @@ export default {
                     }
 
                     if(!client.config.maintenanceMode){
-                        clearInterval(undefined);
+                        clearInterval(timer);
                     }
-                }, 500);
+                }, 1000);
 
                 break;
             case "11":
@@ -207,7 +207,7 @@ export default {
                 client.user?.setStatus('idle');
                 client.radio?.save(client);
 
-                setInterval(() => {
+                let timer2 : NodeJS.Timeout = setInterval(() => {
                     if(client.radio?.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){
                         client.streamer?.leave(client);
                         client.streamer = new Streamer();
@@ -219,9 +219,9 @@ export default {
                     }
 
                     if(!client.config.maintenanceMode){
-                        clearInterval(undefined);
+                        clearInterval(timer2);
                     }
-                }, 500);
+                }, 1000);
 
                 break;
             default:

src/client/commands/next.ts

@@ -9,7 +9,9 @@ export default {
     category: 'radio',
     async execute(interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient, command: command) {
         if (client.funcs.check(client, interaction, command)) {
+            if(!interaction.guild) return;
             const radio = client.radio?.get(interaction.guild?.id);
+            if(!radio) return;
 
             if(client.config.maintenanceMode){
                 return interaction.reply({

src/client/commands/nowplaying.ts

@@ -1,40 +0,0 @@
-import { ButtonInteraction, ChatInputCommandInteraction, EmbedBuilder, StringSelectMenuInteraction } from "discord.js";
-import RadioClient from "../../Client";
-import { command } from "../commands";
-
-export default {
-    name: 'nowplaying',
-    description: 'Current Radio Station',
-    category: 'radio',
-    async execute(interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient, command: command) {
-        if(client.funcs.check(client, interaction, command)) {
-
-            const radio = client.radio?.get(interaction.guild?.id);
-
-            let date = new Date();
-            radio.currentTime = date.getTime();
-            radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
-            const completed = (radio.playTime);
-
-            const embed = new EmbedBuilder()
-                .setTitle(client.messages.nowplayingTitle)
-                .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messages.emojis["play"].replace(/[^0-9]+/g, '')))
-                .setColor(client.config.embedColor)
-                .setDescription(client.messages.replace(client.messages.nowplayingDescription, {
-                    "%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)
-                }))
-                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-                .setFooter({
-                    text: client.messages.footerText,
-                    iconURL: "https://cdn.discordapp.com/emojis/" + client.messages.emojis["eximiabots"].replace(/[^0-9]+/g, '')
-                });
-
-            interaction.reply({
-                embeds: [embed],
-                ephemeral: true
-            });
-        }
-    }
-};

src/client/commands/play.ts

@@ -13,6 +13,8 @@ export default {
     category: "radio",
     async execute(interaction: ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient) {
 
+        if(!interaction.guild) return;
+
         if(client.config.maintenanceMode){
             return interaction.reply({
                 content: client.messages.emojis["error"] + client.messages.maintenance,
@@ -40,10 +42,10 @@ export default {
         }
 
         if(!query){
-            return client.funcs.listStations(client, interaction);
+            return client.funcs.listStations(client, interaction, "1");
         }
 
-        const radio = client.radio?.get(interaction.guild?.id);
+        const radio = client.radio?.get(interaction.guild.id);
 
         if(!(interaction.member instanceof GuildMember)) return;
         const voiceChannel = interaction.member?.voice.channel;

src/client/commands/prev.ts

@@ -9,7 +9,9 @@ export default {
     category: 'radio',
     async execute(interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient, command: command) {
         if (client.funcs.check(client, interaction, command)) {
+            if(!interaction.guild) return;
             const radio = client.radio?.get(interaction.guild?.id);
+            if(!radio) return;
 
             if(client.config.maintenanceMode){
                 return interaction.reply({

src/client/commands/stop.ts

@@ -8,7 +8,9 @@ export default {
     category: 'radio',
     async execute(interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, client: RadioClient, command: command) {
         if (client.funcs.check(client, interaction, command)) {
+            if(!interaction.guild) return;
             const radio = client.radio?.get(interaction.guild?.id);
+            if(!radio) return;
             client.statistics?.update(client, interaction.guild, radio);
             radio.connection?.destroy();
             client.funcs.logger('Radio', interaction.guild?.id + " / " + 'Stop');
@@ -18,7 +20,7 @@ export default {
                 .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messages.emojis["stop"].replace(/[^0-9]+/g, ''))
                 .setColor(client.config.embedColor)
                 .addFields({
-                    name: client.messages.nowplayingTitle,
+                    name: client.messages.playTitle1,
                     value: "-"
                 })
                 .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
@@ -28,9 +30,9 @@ export default {
                 });
 
             if(!radio.message){
-                radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
+                radio.message = await radio.textChannel?.send({ embeds: [embed], components: [] }) ?? null;
             } else {
-                if(radio.textChannel.id == radio.message.channel.id){
+                if(radio.textChannel?.id == radio.message.channel.id){
                     radio.message.edit({ embeds: [embed], components: [] });
                 } else {
                     radio.message?.delete();
@@ -41,7 +43,7 @@ export default {
                 await radio.message?.delete();
             }, 5000);
 
-            client.radio?.delete(interaction.guild?.id);
+            client.radio?.delete(interaction.guild.id);
 
             interaction.reply({
                 content: client.messages.emojis["stop"] + client.messages.stop,

src/client/events/voiceStateUpdate.ts

@@ -53,7 +53,7 @@ export default async function voiceStateUpdate(client: RadioClient, oldState: Vo
     if ((oldState.channel.members.filter(member => !member.user.bot).size === 0 && oldState.channel === radio.voiceChannel) || change) {
         setTimeout(() => {
             if (!radio || !radio.connection || !radio.connection === null) return;
-            if (radio.voiceChannel.members.filter((member: GuildMember) => !member.user.bot).size === 0) {
+            if (radio.voiceChannel?.members.filter((member: GuildMember) => !member.user.bot).size === 0) {
                 client.statistics?.update(client, newState.guild, radio);
                 radio.connection?.destroy();
                 radio.message?.delete();

src/client/funcs/check.ts

@@ -4,6 +4,7 @@ import { command } from "../commands";
 
 export default function check(client: RadioClient, interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, command: command) {
 
+    if(!interaction.guild) return;
     const radio = client.radio?.get(interaction.guild?.id);
     if(!client.stations) {
         interaction.reply({

src/client/funcs/listStations.ts

@@ -1,11 +1,12 @@
 import { ActionRowBuilder, ButtonInteraction, ChatInputCommandInteraction, SelectMenuComponentOptionData, StringSelectMenuBuilder, StringSelectMenuInteraction } from "discord.js";
 import RadioClient from "../../Client";
 
-export default function listStations(client: RadioClient, interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction){
+export default function listStations(client: RadioClient, interaction: ButtonInteraction | ChatInputCommandInteraction | StringSelectMenuInteraction, offset: string){
     if(!client.stations) return;
 
     let options : SelectMenuComponentOptionData[] = new Array();
 
+
     for (const station of client.stations){
         options.push({
             label: station.name,
@@ -14,6 +15,17 @@ export default function listStations(client: RadioClient, interaction: ButtonInt
         });
     }
 
+    switch(offset){
+        case "1":
+            options = options.slice(0,Math.round(options.length/2));
+            break;
+        case "2":
+            options = options.slice(Math.round(options.length/2),options.length-1);
+            break;
+        default:
+            options = options.slice(0,Math.round(options.length/2));
+    }
+
     const menu = new ActionRowBuilder<StringSelectMenuBuilder>()
         .addComponents(
             new StringSelectMenuBuilder()

src/client/funcs/play.ts

@@ -6,24 +6,69 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
     if(!guild) return;
 
     const radio = client.radio?.get(guild.id);
+    if(!radio) return;
     const audioPlayer = client.streamer?.listen(station);
-    radio.connection.subscribe(audioPlayer);
+    if(!audioPlayer) return;
+    radio.connection?.subscribe(audioPlayer);
     client.funcs.logger('Radio', guild.id + " / " + "Play" + " / " + radio.station.name);
 
+    if(radio.station.playlist){
+        if(radio.station.playlist.type == "radioplay" || radio.station.playlist.type == "supla" || radio.station.playlist.type == "yle"){
+            let playlist: any = await fetch(radio.station.playlist.address)
+            .then((response: Response) => response.json())
+            .catch(error => {
+            });
+
+            radio.station.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;
+                        }
+                        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;
+                        }
+                        break;
+                    case "yle":
+                        if(playlist.data && playlist.data.performer && playlist.data.title){
+                            radio.station.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title;
+                        }
+                        break;
+                    default:
+                        radio.station.track = "-";
+                }
+            }
+        }
+    }
+
     const embed = new EmbedBuilder()
         .setTitle(client.user?.username || "-")
         .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messages.emojis["play"].replace(/[^0-9]+/g, '')))
         .setColor(client.config.embedColor)
         .addFields({
-            name: client.messages.nowplayingTitle,
-            value: client.messages.replace(client.messages.nowplayingDescription, {
+            name: client.messages.playTitle1,
+            value: client.messages.replace(client.messages.playDescription1, {
                 "%radio.station.name%": radio.station.name,
-                "%radio.station.owner%\n": radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "",
-                "%client.funcs.msToTime(completed)%": "",
-                "**": "",
-                "**:2": ""
+                "%radio.station.owner%": radio.station.name != radio.station.owner ? radio.station.owner + "\n" : ""
+            })
+        },
+        {
+            name: client.messages.playTitle2,
+            value: client.messages.replace(client.messages.playDescription2, {
+                "%radio.station.track%": radio.station.track != undefined ? "\n\n" + radio.station.track : "-"
+            })
+        },
+        {
+            name: client.messages.playTitle3,
+            value: client.messages.replace(client.messages.playDescription3, {
+                "%client.funcs.msToTime(completed)%": "-"
             })
         })
+
         .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
         .setFooter({
             text: client.messages.footerText,
@@ -63,16 +108,105 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
         );
 
     if(!radio.message){
-        radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] });
+        radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] }) ?? null;
     } else {
-        if(radio.textChannel.id == radio.message.channel.id){
+        if(radio.textChannel?.id == radio.message.channel.id){
             radio.message.edit({ embeds: [embed], components: [buttons] });
         } else {
             radio.message?.delete();
-            radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] });
+            radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] }) ?? null;
         }
     }
 
+    const oldRadio = {...radio};
+
+    let timer : NodeJS.Timeout = setInterval(async function(){
+        const radio = client.radio?.get(guild.id);
+
+        if(!radio || !oldRadio || radio.station.name != oldRadio.station.name) {
+            return clearInterval(timer);
+        }
+
+        if(radio.station.playlist){
+            if(radio.station.playlist.type == "radioplay" || radio.station.playlist.type == "supla" || radio.station.playlist.type == "yle"){
+                let playlist: any = await fetch(radio.station.playlist.address)
+                .then((response: Response) => response.json())
+                .catch(error => {
+                });
+
+                radio.station.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;
+                            }
+                            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;
+                            }
+                            break;
+                        case "yle":
+                            if(playlist.data && playlist.data.performer && playlist.data.title){
+                                radio.station.track = "__" + playlist.data.performer + "__" + "\n" + playlist.data.title;
+                            }
+                            break;
+                        default:
+                            radio.station.track = "-";
+                    }
+                }
+            }
+        }
+
+        let date = new Date();
+        radio.currentTime = date.getTime();
+        radio.playTime = radio.currentTime - radio.startTime;
+        const completed = (radio.playTime);
+
+        const embed = new EmbedBuilder()
+        .setTitle(client.user?.username || "-")
+        .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messages.emojis["play"].replace(/[^0-9]+/g, '')))
+        .setColor(client.config.embedColor)
+        .addFields({
+            name: client.messages.playTitle1,
+            value: client.messages.replace(client.messages.playDescription1, {
+                "%radio.station.name%": radio.station.name,
+                "%radio.station.owner%": radio.station.name != radio.station.owner ? radio.station.owner + "\n" : ""
+            })
+        },
+        {
+            name: client.messages.playTitle2,
+            value: client.messages.replace(client.messages.playDescription2, {
+                "%radio.station.track%": radio.station.track != undefined ? "\n\n" + radio.station.track : "-"
+            })
+        },
+        {
+            name: client.messages.playTitle3,
+            value: client.messages.replace(client.messages.playDescription3, {
+                "%client.funcs.msToTime(completed)%": client.funcs.msToTime(completed)
+            })
+        })
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+        .setFooter({
+            text: client.messages.footerText,
+            iconURL: "https://cdn.discordapp.com/emojis/" + client.messages.emojis["eximiabots"].replace(/[^0-9]+/g, '')
+        });
+
+
+        if(!radio.message){
+            radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] }) ?? null;
+        } else {
+            if(radio.textChannel?.id == radio.message.channel.id){
+                radio.message?.edit({ embeds: [embed], components: [buttons] });
+            } else {
+                radio.message?.delete();
+                radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] }) ?? null;
+            }
+        }
+    },2500);
+
     interaction?.reply({
         content: client.messages.emojis["play"] + client.messages.replace(client.messages.play, {
             "%radio.station.name%": radio.station.name

src/client/messages.ts

@@ -22,8 +22,12 @@ export const messages = {
     helpDescription: "%commands%",
     inviteTitle: "Invite %client.user.username% to your Discord server!",
     listTitle: "Radio Stations",
-    nowplayingTitle: "Now Playing",
-    nowplayingDescription: "**%radio.station.name%**" + "\n" + "%radio.station.owner%" + "\n" + "%client.funcs.msToTime(completed)%",
+    playTitle1: ":radio: Channel",
+    playDescription1: "__%radio.station.name%__" + "\n" + "%radio.station.owner%",
+    playTitle2: ":musical_note: Track",
+    playDescription2: "%radio.station.track%",
+    playTitle3: ":stopwatch: Duration",
+    playDescription3: "%client.funcs.msToTime(completed)%",
     noVoiceChannel: "You need to be in a voice channel to play radio!",
     noQuery: "You need to use a number or search for a supported station!",
     noPermsConnect: "I cannot connect to your voice channel.",