Merge pull request #34 from warengroup/develop

Version 0.3.1

.env_example

@@ -1,3 +1,2 @@
 DISCORD_TOKEN=
 RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
-RADIOX_PREFIX=rx-

README.md

@@ -4,12 +4,9 @@ Internet Radio to your Discord guild
 ## [Radio Stations List](https://gitea.cwinfo.org/cwchristerw/radio)
 This bot is using Gitea repo to get radio stations from [playlist.json](https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json) file. List is currently maintained by Christer Warén. You can use alternative list with same format when using RADIOX_STATIONSLISTURL environment variable.
 
-## PREFIX
-Default prefix is "rx-" and you can change it with using RADIOX_PREFIX environment variable.
-
 ## Docker
 1. `docker build -t warengroup/eximiabots-radiox .`
-2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -e RADIOX_PREFIX="rx-" -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`
+2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`
 
 ## Join our Discord Server
 https://discord.gg/rRA65Mn

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "eximiabots-radiox",
-      "version": "0.3.0",
+      "version": "0.3.1",
       "license": "MIT",
       "dependencies": {
         "@discordjs/builders": "^0.6.0",
@@ -460,9 +460,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.7.8",
+      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
     },
     "node_modules/@types/ws": {
       "version": "7.4.7",
@@ -1159,9 +1159,9 @@
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "node_modules/core-util-is": {
-      "version": "1.0.2",
+      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/create-require": {
       "version": "1.1.1",
@@ -4236,9 +4236,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.7.8",
+      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
     },
     "@types/ws": {
       "version": "7.4.7",
@@ -4741,9 +4741,9 @@
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "core-util-is": {
-      "version": "1.0.2",
+      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "create-require": {
       "version": "1.1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {

src/Client.ts

@@ -1,16 +1,18 @@
 import Discord, { Client, Collection } from "discord.js";
 import fs from "fs";
-const events = "./client/events/";
 import Datastore from "./client/datastore.js";
 import { command, radio } from "./client/utils/typings.js";
 import config from "./config.js";
 import messages from "./client/messages.js";
 import path from "path";
 
+const events = "./client/events/";
+
 const GatewayIntents = new Discord.Intents();
 GatewayIntents.add(
     1 << 0, // GUILDS
     1 << 7, // GUILD_VOICE_STATES
+    1 << 9 // GUILD_MESSAGES
 );
 
 class RadioClient extends Client {
@@ -35,6 +37,15 @@ class RadioClient extends Client {
         this.funcs.logger = require("./client/funcs/logger.js");
         this.funcs.msToTime = require("./client/funcs/msToTime.js");
         this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
+        this.funcs.saveState = require("./client/funcs/saveState.js");
+        this.funcs.loadState = require("./client/funcs/loadState.js");
+
+        console.log('RadioX ' + this.config.version);
+        console.log('Internet Radio to your Discord guild');
+        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        console.log('');
+
+        this.funcs.logger("Bot", "Starting");
 
         const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
         for (const file of commandFiles) {
@@ -44,14 +55,32 @@ class RadioClient extends Client {
 
         this.on("ready", () => {
             require(`${events}ready`).execute(this);
-            this.datastore = new Datastore();
         });
+
+        this.on("messageCreate", msg => {
+            require(`${events}messageCreate`).execute(this, msg);
+        });
+
+        this.on("messageDelete", msg => {
+            require(`${events}messageDelete`).execute(this, msg);
+        });
+
         this.on("interactionCreate", interaction => {
             require(`${events}interactionCreate`).execute(this, interaction);
         });
+        
         this.on("voiceStateUpdate", (oldState, newState) => {
             require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
         });
+        
+        process.on('SIGINT', () => {
+            require(`${events}SIGINT`).execute(this);
+        });
+
+        process.on('SIGTERM', () => {
+            require(`${events}SIGTERM`).execute(this);
+        });
+        
         this.on("error", error => {
             console.error(error);
         });

src/client/commands/help.js

@@ -19,7 +19,6 @@ module.exports = {
 
         message.helpTitle = client.messages.helpTitle.replace("%client.user.username%", client.user.username);
         message.helpDescription = client.messages.helpDescription.replace("%commands%", commands);
-        message.helpDescription = message.helpDescription.replace("%client.config.prefix%", client.config.prefix);
 
         const embed = new Discord.MessageEmbed()
             .setTitle(message.helpTitle)

src/client/commands/invite.js

@@ -11,7 +11,7 @@ module.exports = {
         const embed = new Discord.MessageEmbed()
             .setTitle(message.inviteTitle)
             .setColor(client.config.embedColor)
-            .setURL("https://discordapp.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
+            .setURL("https://discord.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
 
         interaction.reply({

src/client/commands/list.js

@@ -11,22 +11,71 @@ module.exports = {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
         }
-        let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
+        
-        const hashs = stations.split('**#**').length;
+        const radio = client.radio.get(interaction.guild.id);
-        for (let i = 0; i < hashs; i++) {
+        
-            stations = stations.replace('**#**', `**${i + 1}.**`);
+        if(radio){
+            let menu = [];
+
+            let stations = new Array();
+
+            let options = new Array();
+            options[1] = new Array();
+            options[2] = new Array();
+
+            stations[1] = client.stations.slice(0,24).forEach(station => {
+                station = {
+                    label: station.name,
+                    description: station.owner,
+                    value: station.name
+                };
+                options[1].push(station);
+            });
+
+            stations[2] = client.stations.slice(25).forEach(station => {
+                station = {
+                    label: station.name,
+                    description: station.owner,
+                    value: station.name
+                };
+                options[2].push(station);
+            });
+
+            menu = new Discord.MessageActionRow()
+                .addComponents(
+                    new Discord.MessageSelectMenu()
+                        .setCustomId('play')
+                        .setPlaceholder('Change station')
+                        .addOptions(options[1])
+                        .addOptions(options[2])
+                );
+
+            stations = null;
+            options = null;
+
+            interaction.reply({
+                content: '**Select station:**',
+                components: [menu],
+                ephemeral: true
+            });
+        } else {
+            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
+            const hashs = stations.split('**#**').length;
+            for (let i = 0; i < hashs; i++) {
+                stations = stations.replace('**#**', `**${i + 1}.**`);
+            }
+
+            let embed = new Discord.MessageEmbed()
+                .setTitle(client.messages.listTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(stations)
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            interaction.reply({
+                embeds: [embed],
+                ephemeral: true
+            });
         }
-
-        const embed = new Discord.MessageEmbed()
-            .setTitle(client.messages.listTitle)
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
-            .setColor(client.config.embedColor)
-            .setDescription(stations)
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
     }
 };

src/client/commands/maintenance.js

@@ -26,18 +26,12 @@ module.exports = {
             currentRadio.guild = client.datastore.getEntry(radio.value).guild;
 
             if(currentRadio){
-                client.funcs.statisticsUpdate(client, currentRadio.currentGuild.guild, currentRadio);
+                client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
                 currentRadio.connection?.destroy();
                 currentRadio.audioPlayer?.stop();
-                const cembed = new Discord.MessageEmbed()
+                currentRadio.message?.delete();
-                    .setTitle(client.messages.maintenanceTitle)
-                    .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
-                    .setColor(client.config.embedColor)
-                    .setDescription(client.messages.sendedMaintenanceMessage)
-                    .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-                currentRadio.textChannel.send({ embeds: [cembed] });
                 client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.currentGuild.guild.name + "\n";
+                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
             }
             radio = currentRadios.next();
         }

src/client/commands/play.js

@@ -137,8 +137,10 @@ module.exports = {
             client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
             
+            let date = new Date();
             radio.station = station;
             radio.textChannel = interaction.channel;
+            radio.startTime = date.getTime();
             play(interaction, interaction.guild, client, url, Discord);
 
             return;
@@ -214,6 +216,7 @@ async function play(interaction, guild, client, url, Discord) {
     message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
     message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
     message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("Owner: ", "");
     message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
     message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
 

src/client/commands/stop.js

@@ -21,13 +21,13 @@ module.exports = {
                 .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
 
             if(!radio.message){
-                radio.message = await radio.textChannel.send({ embeds: [embed], components: [] });
+                radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
             } else {
                 radio.message.edit({ embeds: [embed], components: [] });
             }
 
-            setTimeout(function() {
+            setTimeout(async function() {
-                radio.message.delete();
+                await radio.message?.delete();
             }, 5000);
 
             client.radio.delete(interaction.guild.id);

src/client/datastore.js

@@ -80,6 +80,7 @@ module.exports = class {
         newData.guild = {};
         newData.guild.id = id;
         newData.statistics = {};
+        newData.state = {};
         this.map.set(id, newData);
         this.saveEntry(id, newData);
     }
@@ -90,6 +91,10 @@ module.exports = class {
     
     updateEntry(guild, newData) {
         newData.guild.name = guild.name;
+
+        let date = new Date();
+        newData.updated = date.toISOString().substring(0, 10)
+        
         this.map.set(guild.id, newData);
         this.saveEntry(guild.id, newData);
         //this.showEntry(this.getEntry(guild.id));
@@ -110,6 +115,9 @@ module.exports = class {
                     "time": 0,
                     "used": 0
                 }
+            },
+            "state": {
+
             }
         }
         

src/client/events/SIGINT.js

@@ -0,0 +1,43 @@
+import Discord from "discord.js";
+
+module.exports = {
+    name: 'SIGINT',
+    async execute(client) {
+        setTimeout(async function () {
+            let message = {};
+
+            if (!client.stations) return process.exit();
+
+            let currentRadios = client.radio.keys();
+            let radio = currentRadios.next();
+
+            while (!radio.done) {
+                let currentRadio = client.radio.get(radio.value);
+                currentRadio.guild = client.datastore.getEntry(radio.value).guild;
+
+                if (currentRadio) {
+                    client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
+                    client.funcs.saveState(client, currentRadio.guild, currentRadio);
+                    currentRadio.connection?.destroy();
+                    currentRadio.audioPlayer?.stop();
+                    currentRadio.message?.delete();
+                    client.radio.delete(radio.value);
+                }
+                
+                radio = currentRadios.next();
+            }
+
+            console.log("\n");
+            client.funcs.logger("Bot", "Closing");
+            console.log("\n");
+
+            client.user.setStatus('dnd');
+
+            setInterval(() => {
+                if(radio.done){
+                    process.exit();
+                }
+            }, 1000);
+        }, 5000);
+    }
+}

src/client/events/SIGTERM.js

@@ -0,0 +1,6 @@
+module.exports = {
+    name: 'SIGTERM',
+    async execute(client) {
+        process.emit('SIGINT');
+    }
+}

src/client/events/interactionCreate.js

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'interactionCreate',
     async execute(client, interaction) {
-        /*if (!interaction.isCommand()) return;*/
 
         const permissions = interaction.channel.permissionsFor(interaction.client.user);
         if (!permissions.has('EMBED_LINKS')) return interaction.send(client.messages.noPermsEmbed);
@@ -16,7 +15,10 @@ module.exports = {
             try {
                 command.execute(interaction, client, Discord, command);
             } catch (error) {
-                interaction.reply(client.messages.runningCommandFailed);
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
                 console.error(error);
             }
         } else if (interaction.isSelectMenu() || interaction.isButton()){
@@ -27,7 +29,10 @@ module.exports = {
             try {
                 command.execute(interaction, client, Discord, command);
             } catch (error) {
-                interaction.reply(client.messages.runningCommandFailed);
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
                 console.error(error);
             }
         }

src/client/events/messageCreate.js

@@ -0,0 +1,54 @@
+import Discord from "discord.js";
+module.exports = {
+    name: 'messageCreate',
+    async execute(client, msg) {
+
+        if (msg.author.bot || !msg.guild) return;
+        let prefix = "rx$";
+        if(client.user.username == "RadioX"){
+            prefix = "rx>";
+        } else if (client.user.username == "RadioX Beta"){
+            prefix = "rx-";
+        } else if (client.user.username == "RadioX Dev"){
+            prefix = "rx$";
+        } else if(msg.mentions.members.first() && msg.mentions.members.first().user.id === client.user.id){
+            prefix = "<@!" + client.user.id + "> ";
+        } else {
+            return;
+        }
+        
+        const args = msg.content.slice(prefix.length).split(' ');
+        if (!msg.content.startsWith(prefix)) return;
+        if (!args[0]) return;
+        const commandName = args[0].toLowerCase();
+        if (commandName === 'none') return;
+        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
+        if (!command && msg.content !== `${prefix}`) return;
+        const permissions = msg.channel.permissionsFor(msg.client.user);
+        if (!permissions.has('EMBED_LINKS')) return msg.channel.send(client.messages.noPermsEmbed);
+        try {
+            let message = {};
+
+            message.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
+    
+            const embed = new Discord.MessageEmbed()
+                .setTitle(message.messageCommandsDeprecatedTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(client.messages.messageCommandsDeprecatedDescription)
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            msg.channel.send({ embeds: [embed] });
+
+            setTimeout(function() {
+                msg.delete();
+            }, 30000);
+        } catch (error) {
+            msg.reply({
+                content: client.messages.runningCommandFailed,
+                ephemeral: true
+            });
+            console.error(error);
+        }
+    }
+}

src/client/events/messageDelete.js

@@ -0,0 +1,10 @@
+module.exports = {
+    name: 'messageDelete',
+    async execute(client, msg) {
+        if (!msg.author.bot || !msg.guild) return;
+        const radio = client.radio.get(msg.guild.id);
+        if (!radio) return;
+        if(msg.id != radio.message.id) return;
+        radio.message = null;
+    }
+}

src/client/events/ready.js

@@ -1,22 +1,24 @@
-const fetch = require('node-fetch');
+import Datastore from "../datastore.js";
+import fetch from "node-fetch";
 
 module.exports = {
     name: 'ready',
     async execute(client) {
 
-        console.log('RadioX ' + client.config.version);
+        client.funcs.logger("Bot", "Ready");
-        console.log('Internet Radio to your Discord guild');
+
-        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        /*DATASTORE*/
-        console.log('');
+        client.funcs.logger('Datastore', 'Initialize');
+        client.datastore = new Datastore();
 
         /*DEVELOPERS*/
-        client.funcs.logger('Developers', 'List');
+        client.funcs.logger('Developers');
         
         client.developers = "";
         let user = "";
         for (let i = 0; i < client.config.devId.length; i++) {
             user = await client.users.fetch(client.config.devId[i]);
-            console.log("   - " + user.tag);
+            console.log("- " + user.tag);
             if (i == client.config.devId.length - 1) {
                 client.developers += user.tag;
             } else {
@@ -32,9 +34,9 @@ module.exports = {
                 .then(client.funcs.checkFetchStatus)
                 .then(response => response.json());
 
-            client.funcs.logger('Stations', 'List');
+            client.funcs.logger('Stations');
             client.stations.forEach(station => {
-                console.log("   - " + station.name);
+                console.log("- " + station.name);
             });
             console.log("\n");
 
@@ -65,10 +67,10 @@ module.exports = {
         /*GUILDS*/
         client.funcs.logger('Guilds', 'Started fetching list');
 
-        client.funcs.logger('Guilds', 'List');
+        client.funcs.logger('Guilds');
         let guilds = await client.guilds.fetch();
         guilds.forEach(guild => {
-            console.log("   - " + guild.id + ": " + guild.name);
+            console.log("- " + guild.id + ": " + guild.name);
         });
         console.log("\n");
 
@@ -83,5 +85,10 @@ module.exports = {
         /*COMMANDS*/
         require(`../commands.js`).execute(client);
 
+        setTimeout(function () {
+            /*RESTORE RADIO*/
+            require(`../restoreradio.js`).execute(client, guilds);
+        }, 5000);
+
     }
 }

src/client/events/voiceStateUpdate.js

@@ -17,6 +17,7 @@ module.exports = {
                 client.funcs.statisticsUpdate(client, newState.guild, radio);
                 radio.connection?.destroy();
                 radio.audioPlayer?.stop();
+                radio.message?.delete();
                 client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                 return client.radio.delete(newState.guild.id);
             }
@@ -39,6 +40,7 @@ module.exports = {
                     client.funcs.statisticsUpdate(client, newState.guild, radio);
                     radio.connection?.destroy();
                     radio.audioPlayer?.stop();
+                    radio.message?.delete();
                     client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                     client.radio.delete(oldState.guild.id);
                 }
@@ -58,6 +60,7 @@ module.exports = {
                     client.funcs.statisticsUpdate(client, newState.guild, radio);
                     radio.connection?.destroy();
                     radio.audioPlayer?.stop();
+                    radio.message?.delete();
                     client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                     client.radio.delete(newState.guild.id);
                 }

src/client/funcs/loadState.js

@@ -0,0 +1,10 @@
+module.exports = function loadState(client, guild){
+    let data = client.datastore.getEntry(guild.id);
+    if(!data) return;
+    let state;
+
+    state = data.state;
+    data.state = {};
+    client.datastore.updateEntry(guild, data);
+    return state;
+}

src/client/funcs/logger.js

@@ -1,4 +1,5 @@
 module.exports = function (area, text){
     let date = new Date();
-    console.log('[' + area + '] – ' + date.toISOString() + '\n' + text + '\n');
+    console.log('[' + area + '] – ' + date.toISOString());
+    if(text)  console.log(text + '\n');
 }

src/client/funcs/saveState.js

@@ -0,0 +1,18 @@
+module.exports = function saveState(client, guild, radio){
+    client.datastore.checkEntry(guild.id);
+    
+    let date = new Date();
+
+    let data = client.datastore.getEntry(guild.id);
+
+    data.state = {};
+    data.state.channels = {};
+    data.state.channels.text = radio.textChannel.id;
+    data.state.channels.voice = radio.voiceChannel.id;
+    data.state.date = date.toISOString();
+    data.state.station = {};
+    data.state.station.name = radio.station.name;
+    data.state.station.owner = radio.station.owner;
+
+    client.datastore.updateEntry(guild, data);
+}

src/client/funcs/statisticsUpdate.js

@@ -2,21 +2,21 @@ module.exports = function statisticsUpdate(client, guild, radio) {
     
     client.datastore.checkEntry(guild.id);
     
-    radio.currentGuild = client.datastore.getEntry(guild.id);
+    radio.datastore = client.datastore.getEntry(guild.id);
     
-    if(!radio.currentGuild.statistics[radio.station.name]){
+    if(!radio.datastore.statistics[radio.station.name]){
-        radio.currentGuild.statistics[radio.station.name] = {};
+        radio.datastore.statistics[radio.station.name] = {};
-        radio.currentGuild.statistics[radio.station.name].time = 0;
+        radio.datastore.statistics[radio.station.name].time = 0;
-        radio.currentGuild.statistics[radio.station.name].used = 0;
+        radio.datastore.statistics[radio.station.name].used = 0;
-        client.datastore.updateEntry(guild, radio.currentGuild);
+        client.datastore.updateEntry(guild, radio.datastore);
     }
     
     let date = new Date();
     radio.currentTime = date.getTime();
     radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
-    radio.currentGuild.statistics[radio.station.name].time = parseInt(radio.currentGuild.statistics[radio.station.name].time)+parseInt(radio.playTime);
+    radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
     
-    radio.currentGuild.statistics[radio.station.name].used = parseInt(radio.currentGuild.statistics[radio.station.name].used)+1;
+    radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
-    client.datastore.updateEntry(guild, radio.currentGuild);
+    client.datastore.updateEntry(guild, radio.datastore);
     client.datastore.calculateGlobal(client);
 }

src/client/messages.js

@@ -8,8 +8,6 @@ module.exports = {
     bugDescription: "Join the support server \n %client.config.supportGuild%",
     helpTitle: "%client.user.username% help:",
     helpDescription: "%commands%",
-    helpCommandTitle: "%client.config.prefix%%command.name% %command.usage%",
-    helpCommandDescription: "%command.description% \n Command Alias: %command.alias%",
     inviteTitle: "Invite %client.user.username% to your Discord server!",
     listTitle: "Radio Stations",
     nowplayingTitle: "Now Playing",
@@ -36,5 +34,7 @@ module.exports = {
     statusField3: "Uptime",
     statusField4: "Version",
     statusField5: "Hosted by",
-    errorStationURL: "Station can't be URL"
+    errorStationURL: "Station can't be URL",
+    messageCommandsDeprecatedTitle: "%client.user.username%",
+    messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055) \n\n  **Invite Bot** \n https://wgi.fi/radiox_invite \n\n This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord. \n\n We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
 };

src/client/restoreradio.js

@@ -0,0 +1,207 @@
+import Discord from "discord.js";
+const {
+    createAudioPlayer,
+    createAudioResource,
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = {
+    async execute(client, guilds) {
+        guilds.forEach(async guild => {
+            let state = client.funcs.loadState(client, guild);
+            if(!state) return;
+            if(!state.station || !state.channels.voice || !state.channels.text) return;
+
+            const sstation = await searchStation(state.station.name, client);
+            let url = sstation.stream[sstation.stream.default];
+            let station = sstation;
+
+            const construct = {
+                textChannel: client.channels.cache.get(state.channels.text),
+                voiceChannel: client.channels.cache.get(state.channels.voice),
+                connection: null,
+                message: null,
+                audioPlayer: createAudioPlayer(),
+                station: station
+            };
+            client.radio.set(guild.id, construct);
+
+            try {
+                let voiceChannel = client.channels.cache.get(state.channels.voice);
+                const connection =
+                    getVoiceConnection(guild.id) ??
+                    joinVoiceChannel({
+                        channelId: voiceChannel.id,
+                        guildId: voiceChannel.guild.id,
+                        adapterCreator: voiceChannel.guild.voiceAdapterCreator
+                    });
+
+                construct.connection = connection;
+                let date = new Date();
+                construct.startTime = date.getTime();
+                
+                play(null, guild, client, url, Discord);
+    
+                client.datastore.checkEntry(guild.id);
+                construct.datastore = client.datastore.getEntry(guild.id);
+    
+                if (!construct.datastore.statistics[construct.station.name]) {
+                    construct.datastore.statistics[construct.station.name] = {};
+                    construct.datastore.statistics[construct.station.name].time = 0;
+                    construct.datastore.statistics[construct.station.name].used = 0;
+                    client.datastore.updateEntry(guild, construct.datastore);
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        });
+    }
+}
+
+async function play(interaction, guild, client, url, Discord) {
+    let message = {};
+    const radio = client.radio.get(guild.id);
+    const resource = createAudioResource(url);
+    radio.connection.subscribe(radio.audioPlayer);
+    radio.audioPlayer.play(resource);
+    resource.playStream
+        .on("readable", () => {
+            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
+        })
+        .on("finish", () => {
+            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
+            client.funcs.statisticsUpdate(client, guild, radio);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+            return;
+        })
+        .on("error", error => {
+            client.funcs.logger('Radio', 'Stream errored');
+            console.error(error);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+        });
+
+    message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
+    message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
+    message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("Owner: ", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+
+    const embed = new Discord.MessageEmbed()
+        .setTitle(client.user.username)
+        .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))
+        .setColor(client.config.embedColor)
+        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
+        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+    
+    const buttons = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('list')
+                .setEmoji(client.messageEmojis["list"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('prev')
+                .setEmoji(client.messageEmojis["prev"])
+                .setStyle('SECONDARY')
+                .setDisabled(true)
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('stop')
+                .setEmoji(client.messageEmojis["stop"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('next')
+                .setEmoji(client.messageEmojis["next"])
+                .setStyle('SECONDARY')
+                .setDisabled(true)
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('statistics')
+                .setEmoji(client.messageEmojis["statistics"])
+                .setStyle('SECONDARY')
+        );
+
+    if(!radio.message){
+        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+    } else {
+        radio.message.edit({ embeds: [embed], components: [buttons] });
+    }
+
+    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
+    
+}
+
+function searchStation(key, client) {
+    if (client.stations === null) return false;
+    let foundStations = [];
+    if (!key) return false;
+    if (key == "radio") return false;
+
+    client.stations
+        .filter(
+            x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
+        )
+        .forEach(x =>
+            foundStations.push({ station: x, name: x.name, probability: 100 })
+        );
+
+    if (key.startsWith("radio ")) key = key.slice(6);
+    const probabilityIncrement = 100 / key.split(" ").length / 2;
+    for (let i = 0; i < key.split(" ").length; i++) {
+        client.stations
+            .filter(
+                x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
+            )
+            .forEach(x =>
+                foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
+            );
+    }
+    if (foundStations.length === 0) return false;
+    for (let i = 0; i < foundStations.length; i++) {
+        for (let j = 0; j < foundStations.length; j++) {
+            if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
+        }
+    }
+    for (let i = 0; i < foundStations.length; i++) {
+        if (foundStations[i].name.length > key.length) {
+            foundStations[i].probability -=
+                (foundStations[i].name.split(" ").length - key.split(" ").length) *
+                (probabilityIncrement * 0.5);
+        } else if (foundStations[i].name.length === key.length) {
+            foundStations[i].probability += probabilityIncrement * 0.9;
+        }
+
+        for (let j = 0; j < key.split(" ").length; j++) {
+            if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
+                foundStations[i].probability -= probabilityIncrement * 0.5;
+            }
+        }
+    }
+    let highestProbabilityStation;
+    for (let i = 0; i < foundStations.length; i++) {
+        if (
+            !highestProbabilityStation ||
+            highestProbabilityStation.probability < foundStations[i].probability
+        )
+            highestProbabilityStation = foundStations[i];
+        if (
+            highestProbabilityStation &&
+            highestProbabilityStation.probability === foundStations[i].probability
+        ) {
+            highestProbabilityStation = foundStations[i].station;
+        }
+    }
+    return highestProbabilityStation;
+}

src/config.js

@@ -20,7 +20,6 @@ module.exports = {
     hostedBy: "[Warén Group](https://waren.io)",
 
     //Settings
-    prefix: process.env.RADIOX_PREFIX || "rx-",
     version: process.env.RADIOX_VERSION || process.env.npm_package_version,
     debug: process.env.DEBUG_MODE || false