Merge pull request #53 from warengroup/develop

Version 0.3.7

.env_example

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

.github/dependabot.yml

@@ -0,0 +1,19 @@
+version: 2
+updates:
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "develop"
+    labels:
+      - "dependencies"
+
+  # npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "develop"
+    labels:
+      - "dependencies"

.github/labeler.yml

@@ -0,0 +1,7 @@
+dependencies:
+- package-lock.json
+
+documentation:
+- README.md
+- LICENSE
+- .env_example

.github/workflows/codeql-analyze.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Analyze"
+
+on:
+  push:
+    branches: [ master, stable ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '24 20 * * 6'
+
+jobs:
+  analyze:
+    name: CodeQL Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docker-build.yml

@@ -0,0 +1,19 @@
+name: Docker Build
+
+on:
+  pull_request:
+
+jobs:
+  buildx:
+    name: Docker Build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1.6.0
+      id: buildx
+      with:
+        install: true
+    - name: Build
+      run: docker build . # will run buildx

.github/workflows/labeler.yml

@@ -0,0 +1,17 @@
+name: Labeler
+on: [pull_request]
+
+jobs:
+  label:
+    name: Labeler
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+    - uses: actions/labeler@v3
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: true

.github/workflows/typescript-build.yml

@@ -2,7 +2,6 @@ name: TypeScript Build
 
 on:
   push:
-  pull_request:
 
 jobs:
   tsc:
@@ -11,11 +10,9 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: install node v16
-      uses: actions/setup-node@v2.3.1
+      uses: actions/setup-node@v2.4.0
       with:
         node-version: 16
-    - name: npm install -g npm
-      run: npm install -g npm
     - name: npm install
       run: npm install
     - name: tsc

Dockerfile

@@ -10,8 +10,8 @@ WORKDIR /usr/src/app
 
 COPY / /usr/src/app/
 
-RUN npm install -g npm
-
 RUN npm install
 
+RUN npm run build
+
 CMD [ "npm", "start" ]

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`
+1. `docker build -t warengroup/eximiabots-radiox . --pull`
+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.json

@@ -1,11 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.2.0",
+  "version": "0.3.7",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
     "build": "rimraf ./build && tsc",
-    "start": "npm run build && node build/index.js"
+    "start": "node build/index.js",
+    "start:dev": "npm run build && node build/index.js"
   },
   "repository": {
     "type": "git",
@@ -17,32 +18,34 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/opus": "^0.5.3",
-    "@discordjs/voice": "^0.5.6",
-    "@types/node": "^16.4.13",
-    "@types/ws": "^7.4.7",
+    "@discordjs/builders": "^0.6.0",
+    "@discordjs/opus": "^0.6.0",
+    "@discordjs/rest": "^0.1.1-canary.0",
+    "@discordjs/voice": "^0.6.0",
     "discord-api-types": "^0.22.0",
-    "discord.js": "^13.0.1",
+    "discord.js": "^13.1.0",
     "dotenv": "^10.0.0",
     "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^2.6.1",
-    "path": "^0.12.7",
-    "tsc-watch": "^4.4.0",
-    "typescript": "^4.3.5"
+    "node-fetch": "^2.6.2",
+    "path": "^0.12.7"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.29.0",
-    "@typescript-eslint/parser": "^4.29.0",
+    "@types/node": "^16.7.13",
+    "@types/ws": "^7.4.7",
+    "@typescript-eslint/eslint-plugin": "^4.31.0",
+    "@typescript-eslint/parser": "^4.31.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.12",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.1.0"
+    "ts-node": "^10.2.1",
+    "tsc-watch": "^4.5.0",
+    "typescript": "^4.4.2"
   },
   "engines": {
-      "node": ">=16.6.0",
+      "node": ">=16.8.0",
       "npm": ">=7.0.0"
   }
-}
+}

src/Client.ts

@@ -1,11 +1,12 @@
 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"
+import path from "path";
+
+const events = "./client/events/";
 
 const GatewayIntents = new Discord.Intents();
 GatewayIntents.add(
@@ -16,7 +17,6 @@ GatewayIntents.add(
 
 class RadioClient extends Client {
     readonly commands: Collection<string, command>;
-    readonly commandAliases: Collection<string, command>;
     readonly radio: Map<string, radio>;
     public funcs: any;
     readonly config = config;
@@ -27,7 +27,6 @@ class RadioClient extends Client {
             intents: GatewayIntents
         });
         this.commands = new Collection();
-        this.commandAliases = new Collection();
         this.radio = new Map();
         this.datastore = null;
 
@@ -35,27 +34,62 @@ class RadioClient extends Client {
         this.funcs.check = require("./client/funcs/check.js");
         this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js");
         this.funcs.isDev = require("./client/funcs/isDev.js");
+        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");
+        this.funcs.searchStation = require("./client/funcs/searchStation.js");
+        this.funcs.play = require("./client/funcs/play.js");
+        this.funcs.listStations = require("./client/funcs/listStations.js");
+        this.funcs.restoreRadios = require("./client/funcs/restoreRadios.js");
+        this.funcs.saveRadios = require("./client/funcs/saveRadios.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) {
             const command = require(`./client/commands/${file}`);
-            command.uses = 0;
             this.commands.set(command.name, command);
-            this.commandAliases.set(command.alias, command);
         }
 
         this.on("ready", () => {
-            require(`${events}ready`).execute(this, Discord);
-            this.datastore = new Datastore();
+            require(`${events}ready`).execute(this);
         });
+
         this.on("messageCreate", msg => {
-            require(`${events}msg`).execute(this, msg, Discord);
+            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);
+        });
+
+        process.on('uncaughtException', (error) => {
+            require(`${events}uncaughtException`).execute(this, error);
+        });
+        
         this.on("error", error => {
             console.error(error);
         });

src/client/commands.js

@@ -0,0 +1,70 @@
+const { SlashCommandBuilder } = require('@discordjs/builders');
+const { REST } = require('@discordjs/rest');
+const { Routes } = require('discord-api-types/v9');
+const { token, version } = require('../config.js');
+const fs = require('fs');
+const path = require ('path');
+
+module.exports = {
+    async execute(client) {
+        const commands = [];
+        const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
+
+        for (const file of commandFiles) {
+            const command = require(`./commands/${file}`);
+            command.data = new SlashCommandBuilder()
+                .setName(command.name)
+                .setDescription(command.description);
+            
+            command.data = command.data.toJSON();
+            if(command.options) {
+                command.options.forEach(function(option) {
+                    if(option.type == "STRING") option.type = 3;
+                    if(option.type == "NUMBER") option.type = 10;
+                    command.data.options.push(option);
+                });
+            }
+
+            commands.push(command.data);
+        }
+
+        const rest = new REST({ version: '9' }).setToken(token);
+
+        (async () => {
+            try {
+                client.funcs.logger('Slash Commands', 'Started refreshing application (/) commands.');
+
+                if(version.includes("-dev")){
+                    await rest.put(
+                        Routes.applicationCommands(client.user.id),
+                        { body: [] },
+                    );
+
+                    let guilds = await client.guilds.fetch();
+                    guilds.forEach(async guild => {
+                        try {
+                            await rest.put(
+                                Routes.applicationGuildCommands(client.user.id, guild.id),
+                                { body: commands }
+                            );
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Successful' + "\n" + guild.id + " / " + guild.name);
+                        } catch (DiscordAPIError) {
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Failed' + "\n" + guild.id + " / " + guild.name);
+                            if(DiscordAPIError.name != "DiscordAPIError[50001]") console.error(DiscordAPIError.message + "\n\n");
+                        }
+                    });
+                } else {
+                    await rest.put(
+                        Routes.applicationCommands(client.user.id),
+                        { body: commands }
+                    );
+                }
+
+                client.funcs.logger('Slash Commands', 'Successfully reloaded application (/) commands.' + "\n");
+            } catch (error) {
+                client.funcs.logger('Slash Commands', 'Reloading application (/) commands failed.' + "\n");
+                console.error(error);
+            }
+        })();
+    }
+}

src/client/commands/bug.js

@@ -1,23 +1,26 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'bug',
-    alias: 'none',
-    usage: '',
     description: 'Report a bug',
-    permission: 'none',
     category: 'info',
-    async execute(msg, args, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
 
         message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);
-        message.bugDescription = message.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);
+        message.bugDescription = client.messages.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);
 
         const embed = new Discord.MessageEmbed()
             .setTitle(message.bugTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
             .setDescription(message.bugDescription)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        msg.channel.send({ embeds: [embed] });
 
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/help.js

@@ -1,51 +1,35 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'help',
-    alias: 'h',
-    usage: '<command(opt)>',
     description: 'Get help using bot',
-    permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
 
-        if (args[1]) {
-            if (!client.commands.has(args[1]) || (client.commands.has(args[1]) && client.commands.get(args[1]).omitFromHelp === true)) return msg.channel.send('That command does not exist');
-            const command = client.commands.get(args[1]);
-
-            message.helpCommandTitle = client.messages.helpCommandTitle.replace("%client.config.prefix%", client.config.prefix);
-            message.helpCommandTitle = message.helpCommandTitle.replace("%command.name%", command.name);
-            message.helpCommandTitle = message.helpCommandTitle.replace("%command.usage%", command.usage);
-            message.helpCommandDescription = client.messages.helpCommandDescription.replace("%command.description%", command.description);
-            message.helpCommandDescription = message.helpCommandDescription.replace("%command.alias%", command.alias);
-
-            const embed = new Discord.MessageEmbed()
-                .setTitle(message.helpCommandTitle)
-                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
-                .setColor(client.config.embedColor)
-                .setDescription(message.helpCommandDescription)
-                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-            msg.channel.send({ embeds: [embed] });
-        } else {
-            const categories = [];
-            for (let i = 0; i < client.commands.size; i++) {
-                if (!categories.includes(client.commands.array()[i].category)) categories.push(client.commands.array()[i].category);
-            }
-            let commands = '';
-            for (let i = 0; i < categories.length; i++) {
-                commands += `**» ${categories[i].toUpperCase()}**\n${client.commands.filter(x => x.category === categories[i] && !x.omitFromHelp).map(x => `\`${x.name}\``).join(', ')}\n`;
-            }
-
-            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)
-                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
-                .setColor(client.config.embedColor)
-                .setDescription(message.helpDescription)
-                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-            msg.channel.send({ embeds: [embed] });
+        const categories = [];
+        for (let i = 0; i < client.commands.size; i++) {
+            if (!categories.includes([...client.commands.values()][i].category)) categories.push([...client.commands.values()][i].category);
         }
+        let commands = '';
+        for (let i = 0; i < categories.length; i++) {
+            commands += `**» ${categories[i].toUpperCase()}**\n${client.commands.filter(x => x.category === categories[i] && !x.omitFromHelp).map(x => `\`${x.name}\``).join(', ')}\n`;
+        }
+
+        message.helpTitle = client.messages.helpTitle.replace("%client.user.username%", client.user.username);
+        message.helpDescription = client.messages.helpDescription.replace("%commands%", commands);
+
+        const embed = new Discord.MessageEmbed()
+            .setTitle(message.helpTitle)
+            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
+            .setColor(client.config.embedColor)
+            .setDescription(message.helpDescription)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+            .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/invite.js

@@ -1,18 +1,22 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'invite',
-    alias: 'i',
-    usage: '',
     description: 'Invite Bot',
-    permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
         message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
         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=3427328&scope=bot")
+            .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
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/list.js

@@ -1,28 +1,42 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'list',
-    alias: 'l',
-    usage: '',
-    description: 'List radio stations.',
-    permission: 'none',
+    description: 'List radio stations',
     category: 'radio',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
-		if(!client.stations) {
-			message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-			return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
-		}
-        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}**`);
+        if(!client.stations) {
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
+        
+        const radio = client.radio.get(interaction.guild.id);
+        
+        if(radio){
+            client.funcs.listStations(client, interaction);
+        } 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}.**`);
+            }
 
-        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, ''));
-        return msg.channel.send({ embeds: [embed] });
+            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)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .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

@@ -1,18 +1,142 @@
+import Discord from "discord.js";
+import fetch from "node-fetch";
+
 module.exports = {
     name: 'maintenance',
-    alias: 'm',
-    usage: '',
     description: 'Bot Maintenance',
-    permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    options: [
+        { type: "NUMBER", name: "action", description: "Select action", required: false}
+    ],
+    async execute(interaction, client) {
         let message = {};
 
-        if(!client.funcs.isDev(client.config.devId, msg.author.id)) return msg.channel.send(client.messageEmojis["error"] + client.messages.notAllowed);
+        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.notAllowed,
+            ephemeral: true
+        });
+        let action = interaction.options?.getNumber("action") ?? interaction.values?.[0];
+        const options = new Array(
+            {
+                emoji: "🌀",
+                label: "Restart Bot",
+                description: "",
+                value: "0"
+            },
+            {
+                emoji: "<:RadioXStop:688541155377414168>",
+                label: "Save Radios",
+                description: "",
+                value: "4"
+            },
+            {
+                emoji: "<:RadioXPlay:688541155712827458>",
+                label: "Restore Radios",
+                description: "",
+                value: "5"
+            },
+            {
+                emoji: "#️⃣",
+                label: "Reload Commands",
+                description: "",
+                value: "6"
+            },
+            {
+                emoji: "<:RadioXList:688541155519889482>",
+                label: "Reload Stations",
+                description: "",
+                value: "7"
+            },
+            {
+                emoji: "<:dnd:746069698139127831>",
+                label: "Enable Maintenance Mode",
+                description: "",
+                value: "8"
+            },
+            {
+                emoji: "<:online:746069731836035098>",
+                label: "Disable Maintenance Mode",
+                description: "",
+                value: "9"
+            }
+        );
+        
+        const menu = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageSelectMenu()
+                .setCustomId('maintenance')
+                .setPlaceholder('Select action')
+                .addOptions(options)
+        );
 
+        if(!action){
+            return interaction.reply({
+                content: "**" + client.messages.maintenanceTitle + "**",
+                components: [menu],
+                ephemeral: true
+            });
+        }
+
+        client.funcs.logger('Maintenance', options.find(option => option.value == action).label);
+
+        const embed = new Discord.MessageEmbed()
+            .setTitle(client.messages.maintenanceTitle)
+            .setColor(client.config.embedColor)
+            .setDescription(options.find(option => option.value == action).label)
+            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+        
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
+
+        switch(action){
+            case "0":
+                process.emit('SIGINT');
+                break;
+            case "4":
+                client.user.setStatus('idle');
+                client.funcs.saveRadios(client);
+                client.user.setStatus('online');
+                break;
+            case "5":
+                client.user.setStatus('idle');
+                let guilds = await client.guilds.fetch();
+                client.funcs.restoreRadios(client, guilds);
+                client.user.setStatus('online');
+                break;
+            case "6":
+                client.user.setStatus('idle');
+                require(`../commands.js`).execute(client);
+                client.user.setStatus('online');
+                break;
+            case "7":
+                try {
+                    client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
+                    client.stations = await fetch(client.config.stationslistUrl)
+                        .then(client.funcs.checkFetchStatus)
+                        .then(response => response.json());
+    
+                    client.funcs.logger('Stations', 'Successfully fetched list');
+                } catch (error) {
+                    client.funcs.logger('Stations', 'Fetching list failed');
+                }
+                break;
+            case "8":
+                client.user.setStatus('dnd');
+                break;
+            case "9":
+                client.user.setStatus('online');
+                break;
+            default:
+
+        }
+
+        
+        /*
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
         }
         
         let currentRadios = client.radio.keys();
@@ -26,18 +150,12 @@ module.exports = {
             currentRadio.guild = client.datastore.getEntry(radio.value).guild;
 
             if(currentRadio){
-                client.funcs.statisticsUpdate(client, currentRadio.currentGuild.guild, currentRadio);
-                currentRadio.connection.destroy();
-                currentRadio.audioPlayer.stop();
-                const cembed = new Discord.MessageEmbed()
-                    .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.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
+                currentRadio.connection?.destroy();
+                currentRadio.audioPlayer?.stop();
+                currentRadio.message?.delete();
                 client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.currentGuild.guild.name + "\n";
+                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
             }
             radio = currentRadios.next();
         }
@@ -47,7 +165,13 @@ module.exports = {
         .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
         .setColor(client.config.embedColor)
         .setDescription("Stopped all radios" + "\n" + stoppedRadios)
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
         .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });*/
+
     }
 };

src/client/commands/next.js

@@ -0,0 +1,39 @@
+module.exports = {
+    name: 'next',
+    description: 'Next Station',
+    category: 'radio',
+    async execute(interaction, client, command) {
+        if (client.funcs.check(client, interaction, command)) {
+            const radio = client.radio.get(interaction.guild.id);
+            
+            let index = client.stations.findIndex(station => station.name == radio.station.name) + 1;
+            if(index == client.stations.length) index = 0;
+
+            let station = client.stations[index];
+
+            if(!station) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
+
+            let url = station.stream[station.stream.default];
+
+            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();
+
+            if(interaction.isCommand()) {
+                client.funcs.play(interaction, interaction.guild, client, url);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(null, interaction.guild, client, url);
+            }
+
+        }
+    }
+}

src/client/commands/nowplaying.js

@@ -1,30 +1,35 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'nowplaying',
-    alias: 'np',
-    usage: '',
     description: 'Current Radio Station',
-    permission: 'none',
     category: 'radio',
-    async execute(msg, args, client, Discord, command) {
-        let message = {};
-        const radio = client.radio.get(msg.guild.id);
-        if (!radio) return msg.channel.send('There is nothing playing.');
-		if(!client.stations) {
-			message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-			return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
-		}
-        const completed = (radio.connection.dispatcher.streamTime.toFixed(0));
+    async execute(interaction, client, command) {
+        if (client.funcs.check(client, interaction, command)) {
+            let message = {};
+            const radio = client.radio.get(interaction.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, \"hh:mm:ss\")%", client.funcs.msToTime(completed, "hh:mm:ss"));
+            let date = new Date();
+            radio.currentTime = date.getTime();
+            radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
+            const completed = (radio.playTime);
 
-        const embed = new Discord.MessageEmbed()
-            .setTitle(client.messages.nowplayingTitle)
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))
-            .setColor(client.config.embedColor)
-            .setDescription(message.nowplayingDescription)
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+            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)%", client.funcs.msToTime(completed));
+
+            const embed = new Discord.MessageEmbed()
+                .setTitle(client.messages.nowplayingTitle)
+                .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
+                .setColor(client.config.embedColor)
+                .setDescription(message.nowplayingDescription)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .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/play.js

@@ -1,97 +1,114 @@
 const {
     createAudioPlayer,
-    createAudioResource,
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
-const { createDiscordJSAdapter } = require("../utils/adapter");
 
 module.exports = {
     name: "play",
-    alias: "p",
     usage: "<song name>",
-    description: "Play some music.",
-    permission: "none",
+    description: "Play radio",
+    options: [
+        { type: "STRING", name: "query", description: "Select station", required: false}
+    ],
     category: "radio",
-    async execute(msg, args, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
-        let url = args[1] ? args[1].replace(/<(.+)>/g, "$1") : "";
-        const radio = client.radio.get(msg.guild.id);
-        const voiceChannel = msg.member.voice.channel;
-        if (!radio) {
-            if (!msg.member.voice.channel)
-                return msg.channel.send(
-                    client.messageEmojis["error"] + client.messages.noVoiceChannel
-                );
-        } else {
-            if (voiceChannel !== radio.voiceChannel)
-                return msg.channel.send(
-                    client.messageEmojis["error"] + client.messages.wrongVoiceChannel
-                );
+        if(!client.stations) {
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
-        if (!client.stations) {
-            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace(
-                "%client.config.supportGuild%",
-                client.config.supportGuild
-            );
-            return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+
+        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
+        if(!query){
+            return client.funcs.listStations(client, interaction);
         }
-        if (!args[1]) return msg.channel.send(client.messages.noQuery);
-        const permissions = voiceChannel.permissionsFor(msg.client.user);
+        let url = query ? query.replace(/<(.+)>/g, "$1") : "";
+        const radio = client.radio.get(interaction.guild.id);
+        const voiceChannel = interaction.member.voice.channel;
+        if (!voiceChannel) return interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
+            ephemeral: true
+        });
+        if (radio) {
+            if (voiceChannel !== radio.voiceChannel) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
+                ephemeral: true
+            });
+        }
+        if (!query) return interaction.reply({
+            content: client.messages.noQuery,
+            ephemeral: true
+        });
+        const permissions = voiceChannel.permissionsFor(interaction.client.user);
         if (!permissions.has("CONNECT")) {
-            return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsConnect);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsConnect,
+                ephemeral: true
+            });
         }
         if (!permissions.has("SPEAK")) {
-            return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsSpeak);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsSpeak,
+                ephemeral: true
+            });
         }
         let station;
-        const number = parseInt(args[1] - 1);
+        const number = parseInt(query - 1);
         if (url.startsWith("http")) {
-            return msg.channel.send(
-                client.messageEmojis["error"] + client.messages.errorStationURL
-            );
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.errorStationURL,
+                ephemeral: true
+            });
         } else if (!isNaN(number)) {
             if (number > client.stations.length - 1) {
-                return msg.channel.send(
-                    client.messageEmojis["error"] + client.messages.wrongStationNumber
-                );
+                return interaction.reply({
+                    content: client.messageEmojis["error"] + client.messages.wrongStationNumber,
+                    ephemeral: true
+                });
             } else {
                 url = client.stations[number].stream[client.stations[number].stream.default];
                 station = client.stations[number];
             }
         } else {
-            if (args[1].length < 3)
-                return msg.channel.send(
-                    client.messageEmojis["error"] + client.messages.tooShortSearch
-                );
-            const sstation = await searchStation(args.slice(1).join(" "), client);
-            if (!sstation)
-                return msg.channel.send(
-                    client.messageEmojis["error"] + client.messages.noSearchResults
-                );
+            if (query.length < 3) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.tooShortSearch,
+                ephemeral: true
+            });
+            const sstation = await client.funcs.searchStation(query, client);
+            if (!sstation) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
             url = sstation.stream[sstation.stream.default];
             station = sstation;
         }
 
         if (radio) {
-            client.funcs.statisticsUpdate(client, msg.guild, radio);
+            client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
             
+            let date = new Date();
             radio.station = station;
-            radio.textChannel = msg.channel;
-            play(msg.guild, client, url);
+            radio.textChannel = interaction.channel;
+            radio.startTime = date.getTime();
+            client.funcs.play(interaction, interaction.guild, client, url);
 
             return;
         }
 
         const construct = {
-            textChannel: msg.channel,
+            textChannel: interaction.channel,
             voiceChannel: voiceChannel,
             connection: null,
+            message: null,
             audioPlayer: createAudioPlayer(),
             station: station
         };
-        client.radio.set(msg.guild.id, construct);
+        client.radio.set(interaction.guild.id, construct);
 
         try {
             const connection =
@@ -99,107 +116,29 @@ module.exports = {
                 joinVoiceChannel({
                     channelId: voiceChannel.id,
                     guildId: voiceChannel.guild.id,
-                    adapterCreator: createDiscordJSAdapter(voiceChannel)
+                    adapterCreator: voiceChannel.guild.voiceAdapterCreator
                 });
             construct.connection = connection;
             let date = new Date();
             construct.startTime = date.getTime();
-            play(msg.guild, client, url);
+            client.funcs.play(interaction, interaction.guild, client, url);
 
-            client.datastore.checkEntry(msg.guild.id);
-            construct.currentGuild = client.datastore.getEntry(msg.guild.id);
+            client.datastore.checkEntry(interaction.guild.id);
+            construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
 
             if (!construct.currentGuild.statistics[construct.station.name]) {
                 construct.currentGuild.statistics[construct.station.name] = {};
                 construct.currentGuild.statistics[construct.station.name].time = 0;
                 construct.currentGuild.statistics[construct.station.name].used = 0;
-                client.datastore.updateEntry(msg.guild, construct.currentGuild);
+                client.datastore.updateEntry(interaction.guild, construct.currentGuild);
             }
         } catch (error) {
             console.log(error);
-            client.radio.delete(msg.guild.id);
-            return msg.channel.send(client.messageEmojis["error"] + `An error occured: ${error}`);
+            client.radio.delete(interaction.guild.id);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + `An error occured: ${error}`,
+                ephemeral: true
+            });
         }
     }
-};
-function play(guild, client, url) {
-    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", () => {
-            console.log("Stream started");
-        })
-        .on("finish", () => {
-            console.log("Stream finished");
-            client.funcs.statisticsUpdate(client, guild, radio);
-            radio.connection.destroy();
-            client.radio.delete(guild.id);
-            return;
-        })
-        .on("error", error => {
-            console.error(error);
-            radio.connection.destroy();
-            client.radio.delete(guild.id);
-            return radio.textChannel.send(client.messages.errorPlaying);
-        });
-
-    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
-    radio.textChannel.send(client.messageEmojis["play"] + message.play);
-}
-
-function searchStation(key, client) {
-    if (client.stations === null) return false;
-    let foundStations = [];
-    if (!key) return false;
-    if (key == "radio") return false;
-    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/client/commands/prev.js

@@ -0,0 +1,39 @@
+module.exports = {
+    name: 'prev',
+    description: 'Previous Station',
+    category: 'radio',
+    async execute(interaction, client, command) {
+        if (client.funcs.check(client, interaction, command)) {
+            const radio = client.radio.get(interaction.guild.id);
+
+            let index = client.stations.findIndex(station => station.name == radio.station.name) - 1;
+            if(index == -1) index = client.stations.length - 1;
+
+            let station = client.stations[index];
+
+            if(!station) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
+
+            let url = station.stream[station.stream.default];
+
+            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();
+            
+            if(interaction.isCommand()) {
+                client.funcs.play(interaction, interaction.guild, client, url);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(null, interaction.guild, client, url);
+            }
+
+        }
+    }
+}

src/client/commands/statistics.js

@@ -1,29 +1,37 @@
+import Discord from "discord.js";
+
+
 module.exports = {
     name: 'statistics',
-    alias: 'stats',
-    usage: '',
-    description: 'Show usage statistics.',
-    permission: 'none',
+    description: 'Show statistics',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
         let stations = client.stations;
-        let currentGuild = client.datastore.getEntry(msg.guild.id);
+        let currentGuild = client.datastore.getEntry(interaction.guild.id);
+        let global = client.datastore.getEntry("global");
         let statistics = "";
         
-		if(!client.stations) {
-			message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-			return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
-		}
+        if(!client.stations) {
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
+        }
 
         if(!currentGuild || currentGuild && !currentGuild.statistics){
-            statistics = "You have not listened any radio station";
+            statistics = "You have not listened any radio stations";
         } else {
             Object.keys(stations).forEach(function(station) {
                 if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){
-                    statistics += `**${parseInt(station) + 1}** ` + stations[station].name + " \n";
-                    statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time, "dd:hh:mm:ss") + "\n";
-                    statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
+                    statistics += `**${parseInt(station) + 1}. ` + stations[station].name + "** \n";
+                    if(global && global.statistics[stations[station].name] && global.statistics[stations[station].name].time && parseInt(global.statistics[stations[station].name].time) > 0 && global.statistics[stations[station].name].used && parseInt(global.statistics[stations[station].name].used) > 0){
+                        statistics += "Guild – Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " (" + ((currentGuild.statistics[stations[station].name].time / global.statistics[stations[station].name].time) * 100).toFixed(0) + "%" + ")" + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + " (" + ((currentGuild.statistics[stations[station].name].used / global.statistics[stations[station].name].used) * 100).toFixed(0) + "%" + ")" + "\n";
+                        statistics += "Global – Time: " + client.funcs.msToTime(global.statistics[stations[station].name].time) + " / " + "Used: " + global.statistics[stations[station].name].used + "\n\n";
+                    } else {
+                        statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + "\n\n";
+                    }
                 }
             });
         }
@@ -33,7 +41,12 @@ module.exports = {
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
             .setDescription(statistics)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/status.js

@@ -1,27 +1,31 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'status',
-    alias: 'none',
-    usage: '',
     description: 'Bot Status',
-    permission: 'none',
     category: 'info',
-    async execute(msg, args, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
 
         message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username);
-        let uptime = client.funcs.msToTime(client.uptime, "dd:hh:mm:ss");
+        let uptime = client.funcs.msToTime(client.uptime);
 
         const embed = new Discord.MessageEmbed()
             .setTitle(message.statusTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
-            .addField(client.messages.statusField1, Date.now() - msg.createdTimestamp + "ms", true)
+            .addField(client.messages.statusField1, Date.now() - interaction.createdTimestamp + "ms", true)
             .addField(client.messages.statusField2, client.ws.ping + "ms", true)
             .addField(client.messages.statusField3, uptime, true)
             .addField(client.messages.statusField4, client.config.version, true)
             .addField(client.messages.statusField5, client.config.hostedBy, true)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
 
     }
 };

src/client/commands/stop.js

@@ -1,18 +1,41 @@
+import Discord from "discord.js";
+
 module.exports = {
-	name: 'stop',
-	description: 'Stop command.',
-	alias: 's',
-	usage: '',
-	permission: 'none',
-	category: 'radio',
-	execute(msg, args, client, Discord, command) {
-		const radio = client.radio.get(msg.guild.id);
-		if (client.funcs.check(client, msg, command)) {
-            client.funcs.statisticsUpdate(client, msg.guild, radio);
-			radio.connection?.destroy();
-			radio.audioPlayer?.stop();
-			client.radio.delete(msg.guild.id);
-			msg.channel.send(client.messageEmojis["stop"] + client.messages.stop);
-		}
-	}
+    name: 'stop',
+    description: 'Stop radio',
+    category: 'radio',
+    async execute(interaction, client, command) {
+        const radio = client.radio.get(interaction.guild.id);
+        if (client.funcs.check(client, interaction, command)) {
+            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.funcs.logger('Radio', 'Stream stopped' + " / " + interaction.guild.id);
+
+            const embed = new Discord.MessageEmbed()
+                .setTitle(client.user.username)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["stop"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .addField(client.messages.nowplayingTitle, "-", true)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            if(!radio.message){
+                radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
+            } else {
+                radio.message.edit({ embeds: [embed], components: [] });
+            }
+
+            setTimeout(async function() {
+                await radio.message?.delete();
+            }, 5000);
+
+            client.radio.delete(interaction.guild.id);
+
+            interaction.reply({
+                content: client.messageEmojis["stop"] + client.messages.stop,
+                ephemeral: true
+            });
+        }
+    }
 };

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": {
+
             }
         }
         
@@ -118,7 +126,7 @@ module.exports = class {
     
     saveEntry(file, data) {
         data = JSON.stringify(data, null, 4);
-        
+
         fs.writeFile(path.join(path.dirname(__dirname), '../datastore') + "/" + file + ".json", data, 'utf8', function(err) {
             if (err) {
                 //console.log(err);

src/client/emojis.js

@@ -9,7 +9,9 @@ module.exports = {
             stop: "<:RadioXStop:688541155377414168>",
             statistics: "<:RadioXStatistics:694954485507686421>",
             maintenance: "<:RadioXMaintenance:695043843057254493>",
-            error: "<:RadioXError:688541155792781320>"
+            error: "<:RadioXError:688541155792781320>",
+            prev: "<:RadioXPrev:882153637370023957>",
+            next: "<:RadioXNext:882153637474893834>"
         };
 
         let fallbackEmojis = {
@@ -20,7 +22,9 @@ module.exports = {
             stop: "⏹️",
             statistics: "📊",
             maintenance: "🛠️",
-            error: "❌"
+            error: "❌",
+            prev: "⏪",
+            next: "⏩"
         };
 
         client.messageEmojis = {};

src/client/events/SIGINT.js

@@ -0,0 +1,18 @@
+module.exports = {
+    name: 'SIGINT',
+    execute(client) {
+        client.user.setStatus('dnd');
+
+        console.log("\n");
+        client.funcs.logger("Bot", "Closing");
+        console.log("\n");
+
+        client.funcs.saveRadios(client);
+        
+        setInterval(() => {
+            if(client.radio.size == 0){
+                process.exit();
+            }
+        }, 500);
+    }
+}

src/client/events/SIGTERM.js

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

src/client/events/interactionCreate.js

@@ -0,0 +1,43 @@
+module.exports = {
+    name: 'interactionCreate',
+    async execute(client, interaction) {
+
+        const permissions = interaction.channel.permissionsFor(interaction.client.user);
+        if (!permissions.has('VIEW_CHANNEL')) return;
+        
+        if (!permissions.has('EMBED_LINKS')) return interaction.reply({
+            content: client.messages.noPermsEmbed,
+            ephemeral: true
+        });
+
+        if(interaction.isCommand()){
+            const commandName = interaction.commandName;
+            const command = client.commands.get(commandName);
+            if (!command) return;
+    
+            try {
+                command.execute(interaction, client);
+            } catch (error) {
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
+                console.error(error);
+            }
+        } else if (interaction.isSelectMenu() || interaction.isButton()){
+            const commandName = interaction.customId;
+            const command = client.commands.get(commandName);
+            if (!command) return;
+
+            try {
+                command.execute(interaction, client, command);
+            } catch (error) {
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
+                console.error(error);
+            }
+        }
+    }
+}

src/client/events/messageCreate.js

@@ -0,0 +1,58 @@
+import Discord from "discord.js";
+module.exports = {
+    name: 'messageCreate',
+    async execute(client, message) {
+
+        if (message.author.bot || !message.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(message.mentions.members.first() && message.mentions.members.first().user.id === client.user.id){
+            prefix = "<@!" + client.user.id + "> ";
+        } else {
+            return;
+        }
+        
+        const args = message.content.slice(prefix.length).split(' ');
+        if (!message.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));
+        if (!command && message.content !== `${prefix}`) return;
+        const permissions = message.channel.permissionsFor(message.client.user);
+        if (!permissions.has('EMBED_LINKS')) return message.channel.send(client.messages.noPermsEmbed);
+        try {
+            let newMessage = {};
+
+            newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
+    
+            const embed = new Discord.MessageEmbed()
+                .setTitle(newMessage.messageCommandsDeprecatedTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(client.messages.messageCommandsDeprecatedDescription)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            let msg = await message.channel.send({ embeds: [embed] });
+
+            setTimeout(async function() {
+                try {
+                    await msg.delete();
+                } catch (DiscordAPIError) {
+                }
+            }, 30000);
+        } catch (error) {
+            message.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/msg.js

@@ -1,27 +0,0 @@
-module.exports = {
-    name: 'message',
-    async execute(client, msg, Discord) {
-        if (msg.author.bot || !msg.guild) return;
-        let prefix = client.config.prefix;
-        if(msg.mentions.members.first()){
-            if(msg.mentions.members.first().user.id === client.user.id){
-                prefix = "<@!" + client.user.id + "> ";
-            }
-        }
-        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 {
-            command.execute(msg, args, client, Discord, command);
-        } catch (error) {
-            msg.reply(client.messages.runningCommandFailed);
-            console.error(error);
-        }
-    }
-}

src/client/events/ready.js

@@ -1,39 +1,70 @@
-const fetch = require('node-fetch');
+import Datastore from "../datastore.js";
+import fetch from "node-fetch";
 
 module.exports = {
     name: 'ready',
-    async execute(client, Discord) {
+    async execute(client) {
 
-        console.log('RadioX');
-        console.log('Internet Radio to your Discord guild');
-        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        client.funcs.logger("Bot", "Ready");
 
+        /*DATASTORE*/
+        client.funcs.logger('Datastore', 'Initialize');
+        client.datastore = new Datastore();
+
+        client.funcs.logger('Datastore');
+        client.datastore.map.forEach(datastore => {
+            console.log("- " + datastore.guild.id + " / " + datastore.guild.name);
+        });
+        console.log("\n");
+
+        client.funcs.logger('Datastore', 'Ready');
+
+        /*DEVELOPERS*/
+        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);
             if (i == client.config.devId.length - 1) {
                 client.developers += user.tag;
             } else {
                 client.developers += user.tag + " & ";
             }
         }
+        console.log("\n");
 
+        /*STATIONS*/
         try {
+            client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
             client.stations = await fetch(client.config.stationslistUrl)
                 .then(client.funcs.checkFetchStatus)
                 .then(response => response.json());
+
+            client.funcs.logger('Stations');
+            client.stations.forEach(station => {
+                console.log("- " + station.name);
+            });
+            console.log("\n");
+
+            client.funcs.logger('Stations', 'Successfully fetched list');
         } catch (error) {
-            console.error(error);
+            client.funcs.logger('Stations', 'Fetching list failed');
+            console.error(error + "\n");
         }
         
         setInterval(async () => {
             try {
+                client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
                 client.stations = await fetch(client.config.stationslistUrl)
                     .then(client.funcs.checkFetchStatus)
                     .then(response => response.json());
+
+                client.funcs.logger('Stations', 'Successfully fetched list');
             } catch (error) {
-                console.error(error);
+                client.funcs.logger('Stations', 'Fetching list failed');
+                //console.error(error);
             }
         }, 3600000);
 
@@ -41,8 +72,31 @@ module.exports = {
             client.user.setStatus('dnd');
         }
         
+        /*GUILDS*/
+        client.funcs.logger('Guilds', 'Started fetching list');
+
+        client.funcs.logger('Guilds');
+        let guilds = await client.guilds.fetch();
+        guilds.forEach(guild => {
+            console.log("- " + guild.id + " / " + guild.name);
+        });
+        console.log("\n");
+
+        client.funcs.logger('Guilds', 'Successfully fetched list');
+        
+        /*STATISTICS*/
         client.datastore.calculateGlobal(client);
+
+        /*EMOJIS*/
         require(`../emojis.js`).execute(client);
 
+        /*COMMANDS*/
+        require(`../commands.js`).execute(client);
+
+        setTimeout(function () {
+            /*RESTORE RADIOS*/
+            client.funcs.restoreRadios(client, guilds);
+        }, 5000);
+
     }
 }

src/client/events/uncaughtException.js

@@ -0,0 +1,7 @@
+module.exports = {
+    name: 'uncaughtException',
+    execute(client, error) {
+        console.log(error.stack);
+        process.emit('SIGINT');
+    }
+}

src/client/events/voiceStateUpdate.js

@@ -2,7 +2,6 @@ const {
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
-const { createDiscordJSAdapter } = require("../utils/adapter");
 
 module.exports = {
     name: "voiceStateUpdate",
@@ -18,6 +17,8 @@ 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);
             }
 
@@ -29,7 +30,7 @@ module.exports = {
                             radio.connection = joinVoiceChannel({
                                 channelId: oldState.channel.id,
                                 guildId: oldState.channel.guild.id,
-                                adapterCreator: createDiscordJSAdapter(oldState.channel)
+                                adapterCreator: oldState.channel.guild.voiceAdapterCreator
                             })
                             //radio.connection = await oldState.channel.join()
                         ),
@@ -39,6 +40,8 @@ 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);
                 }
                 return;
@@ -57,9 +60,11 @@ 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);
                 }
-            }, 120000);
+            }, 60000);
         }
     },
 };

src/client/funcs/check.js

@@ -1,20 +1,29 @@
-module.exports = function (client, msg, command) {
+module.exports = function (client, interaction, command) {
     let message = {};
-    const radio = client.radio.get(msg.guild.id);
-    const permissions = msg.channel.permissionsFor(msg.author);
+    const radio = client.radio.get(interaction.guild.id);
+    const permissions = interaction.channel.permissionsFor(interaction.user);
+    if(!client.stations) {
+        message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+        interaction.reply({
+            content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+            ephemeral: true
+        });
+        return false;
+    }
     if (!radio) {
-        msg.channel.send(client.messageEmojis["error"] + client.messages.notPlaying);
+        interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.notPlaying,
+            ephemeral: true
+        });
         return false;
     }
-    if (msg.member.voice.channel !== radio.voiceChannel) {
-        msg.channel.send(client.messageEmojis["error"] + client.messages.wrongVoiceChannel);
+    if (interaction.member.voice.channel !== radio.voiceChannel) {
+        interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
+            ephemeral: true
+        });
         return false;
     }
-    if(!command.permission == 'none'){
-        if (!permissions.has(command.permission)) {
-            message.noPerms = client.messages.noPerms.replace("%command.permission%", command.permission);
-            msg.channel.send(client.messageEmojis["error"] + message.noPerms);
-            return false;
-        } else return true;
-    } else return true;
+
+    return true;
 };

src/client/funcs/listStations.js

@@ -0,0 +1,33 @@
+import Discord from "discord.js";
+
+module.exports = function (client, interaction){
+    let stations = new Array();
+    let options = new Array();
+
+    stations = client.stations.forEach(station => {
+        if(station.name == "GrooveFM") return;
+        station = {
+            label: station.name,
+            description: station.owner,
+            value: station.name
+        };
+        options.push(station);
+    });
+
+    const menu = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageSelectMenu()
+                .setCustomId('play')
+                .setPlaceholder('Nothing selected')
+                .addOptions(options)
+        );
+
+    stations = null;
+    options = null;
+
+    return interaction.reply({
+        content: '**Select station:**',
+        components: [menu],
+        ephemeral: true
+    });
+}

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

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

src/client/funcs/msToTime.js

@@ -1,17 +1,12 @@
-module.exports = function msToTime(duration, format) {
-    var seconds = Math.floor((duration / 1000) % 60),
+module.exports = function msToTime(duration) {
+    let seconds = Math.floor((duration / 1000) % 60),
         minutes = Math.floor((duration / (1000 * 60)) % 60),
         hours = Math.floor((duration / (1000 * 60 * 60)) % 24),
         days = Math.floor((duration / (1000 * 60 * 60 * 24)));
 
-    days = (days < 10) ? "0" + days : days;
-    hours = (hours < 10) ? "0" + hours : hours;
-    minutes = (minutes < 10) ? "0" + minutes : minutes;
-    seconds = (seconds < 10) ? "0" + seconds : seconds;
-
-    if (format === "hh:mm:ss") {
-        return `${hours}:${minutes}:${seconds}`;
-    } else if (format === "dd:hh:mm:ss") {
-        return `${days}:${hours}:${minutes}:${seconds}`;
-    }
+    return +days > 0
+        ? `${days}:${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
+        : +hours > 0
+            ? `${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
+            : `${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`;
 }

src/client/funcs/play.js

@@ -0,0 +1,96 @@
+import Discord from "discord.js";
+const {
+    createAudioResource
+} = require("@discordjs/voice");
+
+module.exports = async function play(interaction, guild, client, url) {
+    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);
+            return interaction.reply({
+                content: client.messages.errorPlaying,
+                ephemeral: true
+            });
+        });
+
+    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((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
+        .setColor(client.config.embedColor)
+        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+        .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')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('stop')
+                .setEmoji(client.messageEmojis["stop"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('next')
+                .setEmoji(client.messageEmojis["next"])
+                .setStyle('SECONDARY')
+        )
+        .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);
+    
+    interaction?.reply({
+        content: client.messageEmojis["play"] + message.play,
+        ephemeral: true
+    });
+    
+}

src/client/funcs/restoreRadios.js

@@ -0,0 +1,62 @@
+import Discord from "discord.js";
+const {
+    createAudioPlayer,
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = async function restoreRadios(client, guilds) {
+    if(!client.stations) return;
+
+    guilds.forEach(async guild => {
+        let state = client.funcs.loadState(client, guild);
+        if(!state) return;
+        if(!state.station || !state.channels.voice || !state.channels.text) return;
+        let voiceChannel = client.channels.cache.get(state.channels.voice);
+        if(!voiceChannel) return;
+        if(voiceChannel.members.size === 0) return;
+
+
+        const sstation = await client.funcs.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 {
+            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();
+            
+            client.funcs.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);
+        }
+    });
+}

src/client/funcs/saveRadios.js

@@ -0,0 +1,20 @@
+module.exports =  function saveRadios(client) {
+    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();
+    }
+}

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/searchStation.js

@@ -0,0 +1,62 @@
+module.exports = 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/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]){
-        radio.currentGuild.statistics[radio.station.name] = {};
-        radio.currentGuild.statistics[radio.station.name].time = 0;
-        radio.currentGuild.statistics[radio.station.name].used = 0;
-        client.datastore.updateEntry(guild, radio.currentGuild);
+    if(!radio.datastore.statistics[radio.station.name]){
+        radio.datastore.statistics[radio.station.name] = {};
+        radio.datastore.statistics[radio.station.name].time = 0;
+        radio.datastore.statistics[radio.station.name].used = 0;
+        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;
-    client.datastore.updateEntry(guild, radio.currentGuild);
+    radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
+    client.datastore.updateEntry(guild, radio.datastore);
     client.datastore.calculateGlobal(client);
 }

src/client/messages.js

@@ -5,15 +5,13 @@ module.exports = {
     runningCommandFailed: "Running this command failed!",
     noPermsEmbed: "I cannot send embeds (Embed links).",
     bugTitle: "Found a bug with %client.user.username%?",
-    bugDescription: "Join the support server \n %client.config.supportGuild%",
+    bugDescription: "Join the support server" + "\n" + "%client.config.supportGuild%",
     helpTitle: "%client.user.username% help:",
-    helpDescription: "%commands% \n %client.config.prefix%help <command> to see more information about a command.",
-    helpCommandTitle: "%client.config.prefix%%command.name% %command.usage%",
-    helpCommandDescription: "%command.description% \n Command Alias: %command.alias%",
+    helpDescription: "%commands%",
     inviteTitle: "Invite %client.user.username% to your Discord server!",
     listTitle: "Radio Stations",
     nowplayingTitle: "Now Playing",
-    nowplayingDescription: "**%radio.station.name%** \n Owner: %radio.station.owner% \n %client.funcs.msToTime(completed, \"hh:mm:ss\")%",
+    nowplayingDescription: "**%radio.station.name%**" + "\n" + "Owner: %radio.station.owner%" + "\n" + "%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.",
@@ -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/utils/adapter.ts

@@ -1,70 +0,0 @@
-import { DiscordGatewayAdapterCreator, DiscordGatewayAdapterLibraryMethods } from '@discordjs/voice';
-import { VoiceChannel, Snowflake, Client, Constants, WebSocketShard, Guild, StageChannel } from 'discord.js';
-import { GatewayVoiceServerUpdateDispatchData, GatewayVoiceStateUpdateDispatchData } from 'discord-api-types/v9';
-
-const adapters = new Map<Snowflake, DiscordGatewayAdapterLibraryMethods>();
-const trackedClients = new Set<Client>();
-
-/**
- * Tracks a Discord.js client, listening to VOICE_SERVER_UPDATE and VOICE_STATE_UPDATE events.
- * @param client - The Discord.js Client to track
- */
-function trackClient(client: Client) {
-	if (trackedClients.has(client)) return;
-	trackedClients.add(client);
-	client.ws.on(Constants.WSEvents.VOICE_SERVER_UPDATE, (payload: GatewayVoiceServerUpdateDispatchData) => {
-		adapters.get(payload.guild_id)?.onVoiceServerUpdate(payload);
-	});
-	client.ws.on(Constants.WSEvents.VOICE_STATE_UPDATE, (payload: GatewayVoiceStateUpdateDispatchData) => {
-		if (payload.guild_id && payload.session_id && payload.user_id === client.user?.id) {
-			adapters.get(payload.guild_id)?.onVoiceStateUpdate(payload);
-		}
-	});
-}
-
-const trackedGuilds = new Map<WebSocketShard, Set<Snowflake>>();
-
-function cleanupGuilds(shard: WebSocketShard) {
-	const guilds = trackedGuilds.get(shard);
-	if (guilds) {
-		for (const guildID of guilds.values()) {
-			adapters.get(guildID)?.destroy();
-		}
-	}
-}
-
-function trackGuild(guild: Guild) {
-	let guilds = trackedGuilds.get(guild.shard);
-	if (!guilds) {
-		const cleanup = () => cleanupGuilds(guild.shard);
-		guild.shard.on('close', cleanup);
-		guild.shard.on('destroyed', cleanup);
-		guilds = new Set();
-		trackedGuilds.set(guild.shard, guilds);
-	}
-	guilds.add(guild.id);
-}
-
-/**
- * Creates an adapter for a Voice Channel
- * @param channel - The channel to create the adapter for
- */
-export function createDiscordJSAdapter(channel: VoiceChannel | StageChannel): DiscordGatewayAdapterCreator {
-	return (methods) => {
-		adapters.set(channel.guild.id, methods);
-		trackClient(channel.client);
-		trackGuild(channel.guild);
-		return {
-			sendPayload(data) {
-				if (channel.guild.shard.status === Constants.Status.READY) {
-					channel.guild.shard.send(data);
-					return true;
-				}
-				return false;
-			},
-			destroy() {
-				return adapters.delete(channel.guild.id);
-			},
-		};
-	};
-}

src/config.js

@@ -20,7 +20,7 @@ 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
+    version: process.env.RADIOX_VERSION || process.env.npm_package_version,
+    debug: process.env.DEBUG_MODE || false
 
-}
+}