Merge pull request #144 from warengroup/develop

Version 0.3.13

.dockerignore

@@ -4,4 +4,4 @@
 datastore
 Dockerfile
 LICENSE
-README.md
+README.md

.env_example

@@ -1,2 +1,5 @@
 DISCORD_TOKEN=
-RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
+RADIOX_STATIONSLISTURL=https://git.cwinfo.net/cwchristerw/radio/raw/branch/master/playlist.json
+DEV_MODE=false
+DEBUG_MODE=false
+STREAMER_MODE=manual

.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,9 @@
+dependencies:
+- package-lock.json
+
+documentation:
+- README.md
+- SECURITY.md
+- CONTRIBUTING.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

@@ -11,9 +11,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1.5.1
+      uses: docker/setup-buildx-action@v1.6.0
       id: buildx
       with:
         install: true
     - name: Build
-      run: docker build . # will run buildx
+      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

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: install node v16
-      uses: actions/setup-node@v2.3.1
+      uses: actions/setup-node@v2.5.0
       with:
         node-version: 16
     - name: npm install

.gitignore

@@ -1,6 +1,5 @@
 datastore/
 node_modules/
 npm-debug.log
-.vscode/
 .env
-build/
+build/

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "editor.renderFinalNewline": false
+}

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+If you haven't already, come find us in [Discord](https://waren.io/r/eximiabots-discord). We want you working on things you're excited about.
+
+Here are some important resources:
+
+    * [Discord](https://waren.io/r/eximiabots-discord) Join our Discord guild.
+
+## Coding
+
+### Pull Requests
+    * Open a new PR from your fork's new branch into develop branch.
+    * Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+    * Try to fix all merge conflicts.
+
+### Coding conventions
+    * We indent using four spaces (soft tabs)
+    * We ALWAYS put spaces after list items and method parameters (`[1, 2, 3]`, not `[1,2,3]`), around operators (`x += 1`, not `x+=1`), and around hash arrows.
+    * This is open source software. Consider the people who will read your code, and make it look nice for them. It's sort of like driving a car: Perhaps you love doing donuts when you're alone, but with passengers the goal is to make the ride as smooth as possible.
+
+## Testing
+
+We have currently automated testing in Github Workflows, you can suggest new Github Workflows to us by making PR.
+
+Every release is manually tested by [cwchristerw](https://github.com/cwchristerw) or [MatteZ02](https://github.com/MatteZ02).

Dockerfile

@@ -14,4 +14,4 @@ RUN npm install
 
 RUN npm run build
 
-CMD [ "npm", "start" ]
+CMD [ "npm", "start" ]

README.md

@@ -1,11 +1,11 @@
 # RadioX by EximiaBots
 Internet Radio to your Discord guild
 
-## [Radio Stations List](https://gitea.cwinfo.org/cwchristerw/radio)
+## [Radio Stations List](https://git.cwinfo.net/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.
+This bot is using Gitea repo to get radio stations from [playlist.json](https://git.cwinfo.net/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.
 
 ## Docker
-1. `docker build -t 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

SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.3.x   | :white_check_mark: |
+| 0.2.x   | :x:                |
+| 0.1.x   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

package.json

@@ -1,12 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.5",
+  "version": "0.3.13",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
     "build": "rimraf ./build && tsc",
-    "start": "node build/index.js",
+    "start": "node --no-warnings build/index.js",
-    "start:dev": "npm run build && node build/index.js"
+    "start:dev": "npm run build && node --no-warnings build/index.js"
   },
   "repository": {
     "type": "git",
@@ -18,34 +18,34 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^0.6.0",
+    "@discordjs/builders": "^0.9.0",
-    "@discordjs/opus": "^0.6.0",
+    "@discordjs/opus": "^0.7.0",
-    "@discordjs/rest": "^0.1.1-canary.0",
+    "@discordjs/rest": "^0.2.0-canary.0",
-    "@discordjs/voice": "^0.6.0",
+    "@discordjs/voice": "^0.7.5",
-    "discord-api-types": "^0.22.0",
+    "discord-api-types": "^0.25.2",
-    "discord.js": "^13.1.0",
+    "discord.js": "^13.2.0",
     "dotenv": "^10.0.0",
     "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.1.0",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.7.8",
+    "@types/node": "^17.0.2",
-    "@types/ws": "^7.4.7",
+    "@types/ws": "^8.2.2",
-    "@typescript-eslint/eslint-plugin": "^4.29.3",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^4.29.3",
+    "@typescript-eslint/parser": "^5.8.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.5.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "nodemon": "^2.0.12",
+    "nodemon": "^2.0.15",
-    "prettier": "^2.3.2",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.4.0",
-    "tsc-watch": "^4.5.0",
+    "tsc-watch": "^4.6.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.5.4"
   },
   "engines": {
-      "node": ">=16.6.0",
+      "node": ">=16.9.1",
       "npm": ">=7.0.0"
   }
-}
+}

src/Client.ts

@@ -1,6 +1,10 @@
 import Discord, { Client, Collection } from "discord.js";
+import Datastore from "./client/classes/Datastore.js";
+import Radio from "./client/classes/Radio.js";
+import Stations from "./client/classes/Stations.js";
+import Streamer from "./client/classes/Streamer.js";
+import Statistics from "./client/classes/Statistics.js";
 import fs from "fs";
-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";
@@ -17,33 +21,34 @@ GatewayIntents.add(
 
 class RadioClient extends Client {
     readonly commands: Collection<string, command>;
-    readonly radio: Map<string, radio>;
     public funcs: any;
     readonly config = config;
     readonly messages = messages;
     public datastore: Datastore | null;
+    public stations: Stations | null;
+    public streamer: Streamer | null;
+    public statistics: Statistics | null;
+    public radio: Radio | null;
     constructor() {
         super({
             intents: GatewayIntents
         });
         this.commands = new Collection();
-        this.radio = new Map();
         this.datastore = null;
+        this.stations = null;
+        this.streamer = null;
+        this.statistics = null;
+        this.radio = null;
 
         this.funcs = {};
         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');
@@ -52,11 +57,8 @@ class RadioClient extends Client {
 
         this.funcs.logger("Bot", "Starting");
 
-        const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
+        this.funcs.logger("Maintenance Mode", "Enabled");
-        for (const file of commandFiles) {
+        this.config.maintenanceMode = true;
-            const command = require(`./client/commands/${file}`);
-            this.commands.set(command.name, command);
-        }
 
         this.on("ready", () => {
             require(`${events}ready`).execute(this);
@@ -73,11 +75,17 @@ class RadioClient extends Client {
         this.on("interactionCreate", interaction => {
             require(`${events}interactionCreate`).execute(this, interaction);
         });
-        
+
         this.on("voiceStateUpdate", (oldState, newState) => {
             require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
         });
-        
+
+        this.on("error", error => {
+            this.funcs.logger("Discord Client / Error");
+            console.error(error);
+            console.log('');
+        });
+
         process.on('SIGINT', () => {
             require(`${events}SIGINT`).execute(this);
         });
@@ -85,13 +93,25 @@ class RadioClient extends Client {
         process.on('SIGTERM', () => {
             require(`${events}SIGTERM`).execute(this);
         });
-        
+
-        this.on("error", error => {
+        process.on('uncaughtException', (error) => {
-            console.error(error);
+            require(`${events}uncaughtException`).execute(this, error);
         });
 
-        this.login(this.config.token).catch(err => console.log("Failed to login: " + err));
+        process.on('exit', () => {
+            this.funcs.logger("Bot", "Stopping");
+        });
+
+        process.on('warning', (warning) => {
+            require(`${events}warning`).execute(this, warning);
+        });
+
+        this.login(this.config.token).catch((err) => {
+            this.funcs.logger("Discord Client / Error");
+            console.log(err);
+            console.log('');
+        });
     }
 }
 
-export default RadioClient
+export default RadioClient

src/client/classes/Datastore.js

@@ -0,0 +1,106 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+        this.loadData();
+    }
+
+    loadData() {
+        const dir = path.join(path.dirname(__dirname), '../../datastore');
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir);
+        }
+        //console.log("");
+        const dataFiles = fs.readdirSync(path.join(path.dirname(__dirname), '../../datastore')).filter(f => f.endsWith('.json'));
+        for (const file of dataFiles) {
+            try {
+                const json = require(`../../../datastore/${file}`);
+                this.map.set(json.guild.id, json);
+                //console.log('[LOADED] ' + file + " (" + json.guild.id + ")");
+                //console.log(JSON.stringify(json, null, 4));
+            } catch (error) {
+                //console.log('[ERROR] Loading ' + file + ' failed');
+            }
+        }
+        //console.log("");
+    }
+
+    checkEntry(id){
+        this.loadEntry(id);
+        if(!this.map.has(id)){
+            this.createEntry(id);
+            //this.showEntry(this.getEntry(id));
+        } else {
+            //this.showEntry(this.getEntry(id));
+        }
+    }
+
+    createEntry(id){
+        let newData = {};
+        newData.guild = {};
+        newData.guild.id = id;
+        newData.statistics = {};
+        newData.state = {};
+        this.map.set(id, newData);
+        this.saveEntry(id, newData);
+    }
+
+    loadEntry(id){
+        try {
+            const json = require(`../../../datastore/` + id + '.json');
+            this.map.set(id, json);
+        } catch (error) {
+        }
+    }
+
+    getEntry(id){
+        return this.map.get(id);
+    }
+
+    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));
+    }
+
+    showEntry(data){
+        console.log(data);
+    }
+
+    createTestFile () {
+        let newData = {
+            "guild": {
+                "id": "test",
+                "name": "Test"
+            },
+            "statistics": {
+                "test": {
+                    "time": 0,
+                    "used": 0
+                }
+            },
+            "state": {
+
+            }
+        }
+
+        this.updateEntry(newData.guild, newData);
+    }
+
+    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/classes/Radio.js

@@ -0,0 +1,78 @@
+const {
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = class Radio extends Map {
+    constructor() {
+        super();
+    }
+
+    save(client) {
+        let currentRadios = this.keys();
+        let radio = currentRadios.next();
+
+        while (!radio.done) {
+            let currentRadio = this.get(radio.value);
+
+            if (currentRadio) {
+                currentRadio.guild = client.datastore.getEntry(radio.value).guild;
+
+                client.statistics.update(client, currentRadio.guild, currentRadio);
+                client.funcs.saveState(client, currentRadio.guild, currentRadio);
+                currentRadio.connection?.destroy();
+                currentRadio.message?.delete();
+                this.delete(radio.value);
+            }
+
+            radio = currentRadios.next();
+        }
+    }
+
+    restore(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.filter(member => !member.user.bot).size === 0) return;
+
+
+            const sstation = await client.stations.search(state.station.name, "direct");
+            let station = sstation;
+
+            if(!station) return;
+
+            const construct = {
+                textChannel: client.channels.cache.get(state.channels.text),
+                voiceChannel: client.channels.cache.get(state.channels.voice),
+                connection: null,
+                message: null,
+                station: station
+            };
+            this.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.datastore.checkEntry(guild.id);
+                client.funcs.play(client, null, guild, station);
+            } catch (error) {
+                console.log(error);
+            }
+        });
+    }
+
+};

src/client/classes/Stations.js

@@ -0,0 +1,138 @@
+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));
+
+module.exports = class Stations extends Array {
+    constructor() {
+        super();
+        this.logger = require("../funcs/logger.js");
+    }
+
+    async fetch(options){
+        try {
+            this.logger('Stations', 'Started fetching list – ' + options.url);
+            let list = await fetch(options.url)
+                .then(this.checkFetchStatus)
+                .then(response => response.json());
+
+            if(list){
+                this.length = 0;
+                list.forEach(station => {
+                    try {
+                        this.push(station);
+                    } catch (error) {
+
+                    }
+                });
+
+                if(options.show){
+                    this.logger('Stations');
+                    list.forEach(station => {
+                        console.log("- " + station.name);
+                    });
+                    console.log("\n");
+                }
+
+                list.forEach(async station => {
+                    try {
+                        let stationTest = await fetch(station.stream[station.stream.default]);
+                        if(stationTest.ok === true) return;
+                        this.splice(this.indexOf(station),1);
+                    } catch (error) {
+                        this.splice(this.indexOf(station),1);
+                    }
+                });
+            }
+
+            this.logger('Stations', 'Successfully fetched list');
+        } catch (error) {
+            this.logger('Stations', 'Fetching list failed');
+            console.error(error + "\n");
+
+            if(this.length == 0) this.fetch(options);
+        }
+    }
+
+    checkFetchStatus(response) {
+        if (response.ok) { // res.status >= 200 && res.status < 300
+            return response;
+        } else {
+            throw new Error(response.status + " " + response.statusText);
+        }
+    }
+
+    search(key, type) {
+        if (this === null) return false;
+        if (!key) return false;
+        if (!type) return false;
+
+        if(type == "direct"){
+            let foundStation;
+            this.forEach(station => {
+                if(station.name != key) return false;
+                foundStation = station;
+            });
+
+            return foundStation;
+        } else {
+
+            let foundStations = [];
+            if (key == "radio") return false;
+
+            this
+                .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++) {
+                this
+                    .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/classes/Statistics.js

@@ -0,0 +1,70 @@
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+    }
+
+    update(client, guild, radio) {
+
+        client.datastore.checkEntry(guild.id);
+
+        radio.datastore = client.datastore.getEntry(guild.id);
+
+        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.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
+
+        radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
+        client.datastore.updateEntry(guild, radio.datastore);
+        this.calculateGlobal(client);
+    }
+
+    calculateGlobal(client){
+        if(!client.stations) return;
+        if(!client.datastore.map) return;
+
+        let guilds = client.datastore.map.keys();
+        let stations = client.stations;
+        let statistics = {};
+
+        if(!client.stations) return;
+
+        let calculation = guilds.next();
+
+        while (!calculation.done) {
+            let currentGuild = client.datastore.getEntry(calculation.value);
+            if(calculation.value != 'global'){
+                if(stations){
+                    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){
+                            if(!statistics[stations[station].name]){
+                                statistics[stations[station].name] = {};
+                                statistics[stations[station].name].time = 0;
+                                statistics[stations[station].name].used = 0;
+                            }
+
+                            statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
+                            statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
+                        }
+                    });
+                }
+            }
+            calculation = guilds.next();
+        }
+
+        let newData = {};
+        newData.guild = {};
+        newData.guild.id = "global";
+        newData.guild.name = "global";
+        newData.statistics = statistics;
+        client.datastore.updateEntry(newData.guild, newData);
+    }
+
+};

src/client/classes/Streamer.js

@@ -0,0 +1,120 @@
+const {
+    createAudioPlayer,
+    createAudioResource,
+    AudioPlayerStatus,
+    NoSubscriberBehavior
+} = require("@discordjs/voice");
+
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+        this.mode = null;
+        this.logger = require("../funcs/logger.js");
+    }
+
+    init(client){
+        if(!client.config.streamerMode) return;
+
+        switch(client.config.streamerMode){
+            case "manual":
+                this.mode = "manual";
+                break;
+            case "auto":
+                this.mode = "auto";
+                break;
+            default:
+                this.mode = "manual";
+        }
+
+        if(this.mode == "auto"){
+            if(!client.stations) return;
+
+            client.stations.forEach(station => {
+                this.play(station);
+            });
+        }
+    }
+
+    refresh(client){
+        this.init(client);
+
+        let streamers = this.map.keys();
+        streamers.forEach(streamer => {
+            if(client.stations.findIndex(station => station.name == streamer) == -1){
+                this.stop(streamer);
+            }
+        });
+    }
+
+    play(station) {
+        let audioPlayer = this.map.get(station.name);
+        if(!audioPlayer) {
+            if(this.mode == "auto"){
+                audioPlayer = createAudioPlayer({
+                    behaviors: {
+                        noSubscriber: NoSubscriberBehavior.Play,
+                        maxMissedFrames: Math.round(5000 / 20),
+                    },
+                });
+            }
+            if(this.mode == "manual"){
+                audioPlayer = createAudioPlayer({
+                    behaviors: {
+                        noSubscriber: NoSubscriberBehavior.Stop,
+                        maxMissedFrames: Math.round(5000 / 20),
+                    },
+                });
+            }
+            this.map.set(station.name, audioPlayer);
+        }
+        const url = station.stream[station.stream.default];
+        const resource = createAudioResource(url);
+        audioPlayer.play(resource);
+        audioPlayer
+            .on('playing', () => {
+	            this.logger('Streamer', station.name + " / " + "Playing");
+            })
+            .on('idle', () => {
+                this.logger('Streamer', station.name + " / " + "Idle");
+                audioPlayer.removeAllListeners();
+                if(this.mode == "manual" && audioPlayer.subscribers.length == 0) return;
+                this.play(station);
+            })
+            .on('paused', () => {
+                this.logger('Streamer', station.name + " / " + "Paused");
+            })
+            .on('buffering', () => {
+                this.logger('Streamer', station.name + " / " + "Buffering");
+            })
+            .on('autopaused', () => {
+                this.logger('Streamer', station.name + " / " + "AutoPaused");
+            })
+            .on('error', error => {
+                this.logger('Streamer', station.name + " / " + "Error" + "\n" + error);
+            });
+        return audioPlayer;
+    }
+
+    stop(station){
+        let audioPlayer = this.map.get(station.name);
+        if(audioPlayer){
+            this.logger('Streamer', station.name + " / " + "Stop");
+            audioPlayer.removeAllListeners();
+            audioPlayer.stop();
+        }
+        this.map.delete(station.name);
+    }
+
+    listen(station) {
+        let audioPlayer = this.map.get(station.name);
+        if(!audioPlayer || this.mode == "manual" && audioPlayer.subscribers.length == 0) audioPlayer = this.play(station);
+        return audioPlayer;
+    }
+
+    leave(client) {
+        if(!client.stations) return;
+        client.stations.forEach(station => {
+            this.stop(station);
+        });
+    }
+};

src/client/commands.js

@@ -1,21 +1,23 @@
 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}`);
+            client.commands.set(command.name, command);
+
             command.data = new SlashCommandBuilder()
                 .setName(command.name)
                 .setDescription(command.description);
-            
+
             command.data = command.data.toJSON();
             if(command.options) {
                 command.options.forEach(function(option) {
@@ -28,13 +30,13 @@ module.exports = {
             commands.push(command.data);
         }
 
-        const rest = new REST({ version: '9' }).setToken(token);
+        const rest = new REST({ version: '9' }).setToken(client.config.token);
 
         (async () => {
             try {
                 client.funcs.logger('Slash Commands', 'Started refreshing application (/) commands.');
 
-                if(version.includes("-dev")){
+                if(client.config.devMode){
                     await rest.put(
                         Routes.applicationCommands(client.user.id),
                         { body: [] },
@@ -58,6 +60,17 @@ module.exports = {
                         Routes.applicationCommands(client.user.id),
                         { body: commands }
                     );
+
+                    let guilds = await client.guilds.fetch();
+                    guilds.forEach(async guild => {
+                        try {
+                            await rest.put(
+                                Routes.applicationGuildCommands(client.user.id, guild.id),
+                                { body: [] }
+                            );
+                        } catch (DiscordAPIError) {
+                        }
+                    });
                 }
 
                 client.funcs.logger('Slash Commands', 'Successfully reloaded application (/) commands.' + "\n");
@@ -67,4 +80,4 @@ module.exports = {
             }
         })();
     }
-}
+}

src/client/commands/bug.js

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'bug',
     description: 'Report a bug',
-    permission: 'none',
     category: 'info',
     async execute(interaction, client) {
         let message = {};
@@ -24,4 +23,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/help.js

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'help',
     description: 'Get help using bot',
-    permission: 'none',
     category: 'info',
     execute(interaction, client) {
         let message = {};
@@ -27,7 +26,7 @@ module.exports = {
             .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

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'invite',
     description: 'Invite Bot',
-    permission: 'none',
     category: 'info',
     execute(interaction, client) {
         let message = {};
@@ -20,4 +19,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/list.js

@@ -3,18 +3,21 @@ import Discord from "discord.js";
 module.exports = {
     name: 'list',
     description: 'List radio stations',
-    permission: 'none',
     category: 'radio',
     execute(interaction, client) {
         let message = {};
+
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
-        
+
         const radio = client.radio.get(interaction.guild.id);
-        
+
-        if(radio){
+        if(radio && !client.config.maintenanceMode){
             client.funcs.listStations(client, interaction);
         } else {
             let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
@@ -37,4 +40,4 @@ module.exports = {
             });
         }
     }
-};
+};

src/client/commands/maintenance.js

@@ -1,17 +1,19 @@
 import Discord from "discord.js";
+import Streamer from "../classes/Streamer.js";
+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));
 
 module.exports = {
     name: 'maintenance',
     description: 'Bot Maintenance',
-    permission: 'none',
     category: 'info',
-    options: [
-        { type: "NUMBER", name: "action", description: "Select action", required: false}
-    ],
     async execute(interaction, client) {
         let message = {};
 
-        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply(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(
             {
@@ -38,6 +40,12 @@ module.exports = {
                 description: "",
                 value: "6"
             },
+            {
+                emoji: "<:RadioXList:688541155519889482>",
+                label: "Reload Stations",
+                description: "",
+                value: "7"
+            },
             {
                 emoji: "<:dnd:746069698139127831>",
                 label: "Enable Maintenance Mode",
@@ -49,9 +57,21 @@ module.exports = {
                 label: "Disable Maintenance Mode",
                 description: "",
                 value: "9"
+            },
+            {
+                emoji: "💤",
+                label: "Streamer Mode – Manual",
+                description: "",
+                value: "10"
+            },
+            {
+                emoji: "📡",
+                label: "Streamer Mode – Auto",
+                description: "",
+                value: "11"
             }
         );
-        
+
         const menu = new Discord.MessageActionRow()
         .addComponents(
             new Discord.MessageSelectMenu()
@@ -75,86 +95,112 @@ module.exports = {
             .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
         });
 
+        let guilds = await client.guilds.fetch();
+
         switch(action){
             case "0":
+                client.config.maintenanceMode = true;
                 process.emit('SIGINT');
                 break;
             case "4":
+                client.config.maintenanceMode = true;
                 client.user.setStatus('idle');
-                setTimeout(function () {
+                client.radio.save(client);
-                    client.funcs.saveRadios(client);
-                }, 5000);
                 client.user.setStatus('online');
+                client.config.maintenanceMode = false;
                 break;
             case "5":
+                client.config.maintenanceMode = true;
                 client.user.setStatus('idle');
-                let guilds = await client.guilds.fetch();
+                client.radio.restore(client, guilds);
-                setTimeout(function () {
-                    client.funcs.restoreRadios(client, guilds);
-                }, 5000);
                 client.user.setStatus('online');
+                client.config.maintenanceMode = false;
                 break;
             case "6":
+                client.config.maintenanceMode = true;
                 client.user.setStatus('idle');
                 require(`../commands.js`).execute(client);
                 client.user.setStatus('online');
+                client.config.maintenanceMode = false;
+                break;
+            case "7":
+                try {
+                    client.stations.fetch({
+                        url: client.config.stationslistUrl
+                    });
+                    client.streamer.refresh(client);
+
+                } catch (error) {
+
+                }
                 break;
             case "8":
                 client.user.setStatus('dnd');
+                client.funcs.logger("Maintenance Mode", "Enabled");
+                client.config.maintenanceMode = true;
                 break;
             case "9":
                 client.user.setStatus('online');
+                client.funcs.logger("Maintenance Mode", "Disabled");
+                client.config.maintenanceMode = false;
+                break;
+            case "10":
+                client.config.streamerMode = "manual";
+                client.config.maintenanceMode = true;
+
+                client.user.setStatus('idle');
+                client.radio.save(client);
+
+                setInterval(() => {
+                    if(client.radio.size == 0 && client.config.streamerMode == "manual" && client.config.maintenanceMode){
+                        client.streamer.leave(client);
+                        client.streamer = new Streamer();
+                        client.streamer.init(client);
+
+                        client.radio.restore(client, guilds);
+                        client.user.setStatus('online');
+                        client.config.maintenanceMode = false;
+                    }
+
+                    if(!client.config.maintenanceMode){
+                        clearInterval();
+                    }
+                }, 500);
+
+                break;
+            case "11":
+                client.config.streamerMode = "auto";
+                client.config.maintenanceMode = true;
+
+                client.user.setStatus('idle');
+                client.radio.save(client);
+
+                setInterval(() => {
+                    if(client.radio.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){
+                        client.streamer.leave(client);
+                        client.streamer = new Streamer();
+                        client.streamer.init(client);
+
+                        client.radio.restore(client, guilds);
+                        client.user.setStatus('online');
+                        client.config.maintenanceMode = false;
+                    }
+
+                    if(!client.config.maintenanceMode){
+                        clearInterval();
+                    }
+                }, 500);
+
                 break;
             default:
 
         }
 
-        
-        /*
-        if(!client.stations) {
-            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-        }
-        
-        let currentRadios = client.radio.keys();
-        let radio = currentRadios.next();
-        let stoppedRadios = "";
-
-        client.user.setStatus('dnd');
-        
-        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);
-                currentRadio.connection?.destroy();
-                currentRadio.audioPlayer?.stop();
-                currentRadio.message?.delete();
-                client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
-            }
-            radio = currentRadios.next();
-        }
-
-        const embed = 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("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, ''));
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });*/
-
     }
-};
+};

src/client/commands/next.js

@@ -1,12 +1,11 @@
 module.exports = {
     name: 'next',
     description: 'Next Station',
-    permission: 'none',
     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;
 
@@ -17,19 +16,20 @@ module.exports = {
                 ephemeral: true
             });
 
-            interaction.deferUpdate();
+            client.statistics.update(client, interaction.guild, radio);
 
-            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();
-            client.funcs.play(null, interaction.guild, client, url);
 
+            if(interaction.isCommand()) {
+                client.funcs.play(client, interaction, interaction.guild, station);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(client, null, interaction.guild, station);
+            }
         }
     }
-}
+}

src/client/commands/nowplaying.js

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'nowplaying',
     description: 'Current Radio Station',
-    permission: 'none',
     category: 'radio',
     async execute(interaction, client, command) {
         if (client.funcs.check(client, interaction, command)) {
@@ -16,7 +15,7 @@ module.exports = {
             const completed = (radio.playTime);
 
             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("%radio.station.owner%" + "\n", radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "");
             message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));
 
             const embed = new Discord.MessageEmbed()
@@ -26,11 +25,11 @@ module.exports = {
                 .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,5 +1,4 @@
 const {
-    createAudioPlayer,
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
@@ -11,13 +10,23 @@ module.exports = {
     options: [
         { type: "STRING", name: "query", description: "Select station", required: false}
     ],
-    permission: "none",
     category: "radio",
     async execute(interaction, client) {
         let message = {};
+
+        if(client.config.maintenanceMode){
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.maintenance,
+                ephemeral: true
+            });
+        }
+
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
 
         let query = interaction.options?.getString("query") ?? interaction.values?.[0];
@@ -27,26 +36,32 @@ module.exports = {
         let url = query ? query.replace(/<(.+)>/g, "$1") : "";
         const radio = client.radio.get(interaction.guild.id);
         const voiceChannel = interaction.member.voice.channel;
-        if (!radio) {
+        if (!voiceChannel) return interaction.reply({
-            if (!interaction.member.voice.channel)
+            content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
-                return interaction.reply({
+            ephemeral: true
-                    content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
+        });
-                    ephemeral: true
+        if (radio) {
-                });
+            if (voiceChannel !== radio.voiceChannel) return interaction.reply({
-        } else {
+                content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
-            if (voiceChannel !== radio.voiceChannel)
+                ephemeral: true
-                return interaction.reply({
+            });
-                    content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
-                    ephemeral: true
-                });
         }
-        if (!query) return interaction.reply(client.messages.noQuery);
+        if (!query) return interaction.reply({
+            content: client.messages.noQuery,
+            ephemeral: true
+        });
         const permissions = voiceChannel.permissionsFor(interaction.client.user);
         if (!permissions.has("CONNECT")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsConnect);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsConnect,
+                ephemeral: true
+            });
         }
         if (!permissions.has("SPEAK")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsSpeak);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsSpeak,
+                ephemeral: true
+            });
         }
         let station;
         const number = parseInt(query - 1);
@@ -62,34 +77,38 @@ module.exports = {
                     ephemeral: true
                 });
             } else {
-                url = client.stations[number].stream[client.stations[number].stream.default];
                 station = client.stations[number];
             }
         } else {
-            if (query.length < 3)
+            if (query.length < 3) return interaction.reply({
-                return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.tooShortSearch,
-                    content: client.messageEmojis["error"] + client.messages.tooShortSearch,
+                ephemeral: true
-                    ephemeral: true
+            });
-                });
+
-            const sstation = await client.funcs.searchStation(query, client);
+            let type = "";
-            if (!sstation)
+
-                return interaction.reply({
+            if(interaction.values?.[0]){
-                    content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                type = "direct";
-                    ephemeral: true
+            } else {
-                });
+                type = "text";
-            url = sstation.stream[sstation.stream.default];
+            }
+
+            const sstation = await client.stations.search(query, type);
+            if (!sstation) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
             station = sstation;
         }
 
         if (radio) {
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            client.statistics.update(client, interaction.guild, radio);
-            radio.audioPlayer.stop();
+
-            
             let date = new Date();
             radio.station = station;
             radio.textChannel = interaction.channel;
             radio.startTime = date.getTime();
-            client.funcs.play(interaction, interaction.guild, client, url);
+            client.funcs.play(client, interaction, interaction.guild, station);
 
             return;
         }
@@ -99,7 +118,6 @@ module.exports = {
             voiceChannel: voiceChannel,
             connection: null,
             message: null,
-            audioPlayer: createAudioPlayer(),
             station: station
         };
         client.radio.set(interaction.guild.id, construct);
@@ -115,21 +133,15 @@ module.exports = {
             construct.connection = connection;
             let date = new Date();
             construct.startTime = date.getTime();
-            client.funcs.play(interaction, interaction.guild, client, url);
-
             client.datastore.checkEntry(interaction.guild.id);
-            construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
+            client.funcs.play(client, interaction, interaction.guild, station);
-
-            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(interaction.guild, construct.currentGuild);
-            }
         } catch (error) {
             console.log(error);
             client.radio.delete(interaction.guild.id);
-            return interaction.reply(client.messageEmojis["error"] + `An error occured: ${error}`);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + `An error occured: ${error}`,
+                ephemeral: true
+            });
         }
     }
-};
+};

src/client/commands/prev.js

@@ -1,7 +1,6 @@
 module.exports = {
     name: 'prev',
     description: 'Previous Station',
-    permission: 'none',
     category: 'radio',
     async execute(interaction, client, command) {
         if (client.funcs.check(client, interaction, command)) {
@@ -17,19 +16,21 @@ module.exports = {
                 ephemeral: true
             });
 
-            interaction.deferUpdate();
+            client.statistics.update(client, interaction.guild, radio);
 
-            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();
-            client.funcs.play(null, interaction.guild, client, url);
+
+            if(interaction.isCommand()) {
+                client.funcs.play(client, interaction, interaction.guild, station);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(client, null, interaction.guild, station);
+            }
 
         }
     }
-}
+}

src/client/commands/statistics.js

@@ -4,7 +4,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'statistics',
     description: 'Show statistics',
-    permission: 'none',
     category: 'info',
     execute(interaction, client) {
         let message = {};
@@ -12,10 +11,13 @@ module.exports = {
         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 interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
 
         if(!currentGuild || currentGuild && !currentGuild.statistics){
@@ -33,7 +35,7 @@ module.exports = {
                 }
             });
         }
-        
+
         const embed = new Discord.MessageEmbed()
             .setTitle(client.messages.statisticsTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
@@ -47,4 +49,4 @@ module.exports = {
             ephemeral: true
         });
     }
-};
+};

src/client/commands/status.js

@@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
     name: 'status',
     description: 'Bot Status',
-    permission: 'none',
     category: 'info',
     async execute(interaction, client) {
         let message = {};
@@ -15,11 +14,11 @@ module.exports = {
             .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() - interaction.createdTimestamp + "ms", true)
+            .addField(client.messages.statusField1, uptime, false)
-            .addField(client.messages.statusField2, client.ws.ping + "ms", true)
+            .addField(client.messages.statusField2, client.config.version, false)
-            .addField(client.messages.statusField3, uptime, true)
+            .addField(client.messages.statusField3, Date.now() - interaction.createdTimestamp + "ms", false)
-            .addField(client.messages.statusField4, client.config.version, true)
+            .addField(client.messages.statusField4, client.ws.ping + "ms", false)
-            .addField(client.messages.statusField5, client.config.hostedBy, true)
+            .addField(client.messages.statusField5, client.config.hostedBy, false)
             .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, ''));
 
@@ -29,4 +28,4 @@ module.exports = {
         });
 
     }
-};
+};

src/client/commands/stop.js

@@ -3,15 +3,13 @@ import Discord from "discord.js";
 module.exports = {
     name: 'stop',
     description: 'Stop radio',
-    permission: 'none',
     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);
+            const radio = client.radio.get(interaction.guild.id);
+            client.statistics.update(client, interaction.guild, radio);
             radio.connection?.destroy();
-            radio.audioPlayer?.stop();
+            client.funcs.logger('Radio', interaction.guild.id + " / " + 'Stop');
-            client.funcs.logger('Radio', 'Stream stopped' + " / " + interaction.guild.id);
 
             const embed = new Discord.MessageEmbed()
                 .setTitle(client.user.username)
@@ -24,7 +22,11 @@ module.exports = {
             if(!radio.message){
                 radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
             } else {
-                radio.message.edit({ embeds: [embed], components: [] });
+                if(radio.textChannel.id == radio.message.channel.id){
+                    radio.message.edit({ embeds: [embed], components: [] });
+                } else {
+                    radio.message?.delete();
+                }
             }
 
             setTimeout(async function() {
@@ -39,4 +41,4 @@ module.exports = {
             });
         }
     }
-};
+};

src/client/datastore.js

@@ -1,136 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-module.exports = class {
-    constructor() {
-        this.map = new Map();
-        this.loadData();
-    }
-    
-    loadData() {
-        const dir = path.join(path.dirname(__dirname), '../datastore');
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir);
-        }
-        //console.log("");
-        const dataFiles = fs.readdirSync(path.join(path.dirname(__dirname), '../datastore')).filter(f => f.endsWith('.json'));
-        for (const file of dataFiles) {
-            try {
-                const json = require(`../../datastore/${file}`);
-                this.map.set(json.guild.id, json);
-                //console.log('[LOADED] ' + file + " (" + json.guild.id + ")");
-                //console.log(JSON.stringify(json, null, 4));
-            } catch (error) {
-                //console.log('[ERROR] Loading ' + file + ' failed');
-            }
-        }
-        //console.log("");
-    }
-
-    calculateGlobal(client){
-        let guilds = this.map.keys();
-        let stations = client.stations;
-        var statistics = {};
-
-        if(!client.stations) return;
-        
-        let calculation = guilds.next();
-
-        while (!calculation.done) {
-            let currentGuild = this.getEntry(calculation.value);
-            if(calculation.value != 'global'){
-                if(stations){
-                    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){
-                            if(!statistics[stations[station].name]){
-                                statistics[stations[station].name] = {};
-                                statistics[stations[station].name].time = 0;
-                                statistics[stations[station].name].used = 0;
-                            }
-                        
-                            statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
-                            statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
-                        }
-                    });
-                }
-            }
-            calculation = guilds.next();
-        }
-
-        let newData = {};
-        newData.guild = {};
-        newData.guild.id = "global";
-        newData.guild.name = "global";
-        newData.statistics = statistics;
-        this.updateEntry(newData.guild, newData);
-    }
-
-
-    checkEntry(id){
-        if(!this.map.has(id)){
-            this.createEntry(id);
-            //this.showEntry(this.getEntry(id));
-        } else {
-            //this.showEntry(this.getEntry(id));
-        }
-    }
-
-    createEntry(id){
-        let newData = {};
-        newData.guild = {};
-        newData.guild.id = id;
-        newData.statistics = {};
-        newData.state = {};
-        this.map.set(id, newData);
-        this.saveEntry(id, newData);
-    }
-    
-    getEntry(id){
-        return this.map.get(id);
-    }
-    
-    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));
-    }
-    
-    showEntry(data){
-        console.log(data);
-    }
-    
-    createTestFile () {
-        let newData = {
-            "guild": {
-                "id": "test",
-                "name": "Test"
-            },
-            "statistics": {
-                "test": {
-                    "time": 0,
-                    "used": 0
-                }
-            },
-            "state": {
-
-            }
-        }
-        
-        this.updateEntry(newData.guild, newData);
-    }
-    
-    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

@@ -39,4 +39,4 @@ module.exports = {
             }
         }
     }
-}
+}

src/client/events/SIGINT.js

@@ -1,23 +1,15 @@
-const { REST } = require('@discordjs/rest');
-const { Routes } = require('discord-api-types/v9');
-const { token, version } = require('../../config.js');
-
 module.exports = {
     name: 'SIGINT',
-    async execute(client) {
+    execute(client) {
         client.user.setStatus('dnd');
 
-        console.log("\n");
+        client.streamer.leave(client);
-        client.funcs.logger("Bot", "Closing");
+        client.radio.save(client);
-        console.log("\n");
-        
-        setTimeout(async function () {
-            let message = {};
 
-            if (!client.stations) return process.exit();
+        setInterval(() => {
-
+            if(client.radio.size == 0){
-            await client.funcs.saveRadios(client);
+                process.exit();
-            await process.exit();
+            }
-        }, 5000);
+        }, 500);
     }
-}
+}

src/client/events/SIGTERM.js

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

src/client/events/interactionCreate.js

@@ -4,9 +4,9 @@ module.exports = {
 
         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,
+            content: client.messageEmojis["error"] + client.messages.noPermsEmbed,
             ephemeral: true
         });
 
@@ -14,12 +14,12 @@ module.exports = {
             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,
+                    content: client.messageEmojis["error"] + client.messages.runningCommandFailed,
                     ephemeral: true
                 });
                 console.error(error);
@@ -33,7 +33,7 @@ module.exports = {
                 command.execute(interaction, client, command);
             } catch (error) {
                 interaction.reply({
-                    content: client.messages.runningCommandFailed,
+                    content: client.messageEmojis["error"] + client.messages.runningCommandFailed,
                     ephemeral: true
                 });
                 console.error(error);

src/client/events/messageCreate.js

@@ -16,7 +16,7 @@ module.exports = {
         } else {
             return;
         }
-        
+
         const args = message.content.slice(prefix.length).split(' ');
         if (!message.content.startsWith(prefix)) return;
         if (!args[0]) return;
@@ -30,7 +30,7 @@ module.exports = {
             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, ''))
@@ -41,8 +41,11 @@ module.exports = {
 
             let msg = await message.channel.send({ embeds: [embed] });
 
-            setTimeout(function() {
+            setTimeout(async function() {
-                msg.delete();
+                try {
+                    await msg.delete();
+                } catch (DiscordAPIError) {
+                }
             }, 30000);
         } catch (error) {
             message.reply({
@@ -52,4 +55,4 @@ module.exports = {
             console.error(error);
         }
     }
-}
+}

src/client/events/messageDelete.js

@@ -7,4 +7,4 @@ module.exports = {
         if(msg.id != radio.message.id) return;
         radio.message = null;
     }
-}
+}

src/client/events/ready.js

@@ -1,5 +1,8 @@
-import Datastore from "../datastore.js";
+import Datastore from "../classes/Datastore.js";
-import fetch from "node-fetch";
+import Radio from "../classes/Radio.js";
+import Stations from "../classes/Stations.js";
+import Streamer from "../classes/Streamer.js";
+import Statistics from "../classes/Statistics.js";
 
 module.exports = {
     name: 'ready',
@@ -21,7 +24,7 @@ module.exports = {
 
         /*DEVELOPERS*/
         client.funcs.logger('Developers');
-        
+
         client.developers = "";
         let user = "";
         for (let i = 0; i < client.config.devId.length; i++) {
@@ -36,42 +39,27 @@ module.exports = {
         console.log("\n");
 
         /*STATIONS*/
-        try {
+        client.stations = new Stations();
-            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');
+        await client.stations.fetch({
-            client.stations.forEach(station => {
+            url: client.config.stationslistUrl,
-                console.log("- " + station.name);
+            show: true
-            });
+        });
-            console.log("\n");
 
-            client.funcs.logger('Stations', 'Successfully fetched list');
-        } catch (error) {
-            client.funcs.logger('Stations', 'Fetching list failed');
-            console.error(error + "\n");
-        }
-        
         setInterval(async () => {
-            try {
+            await client.stations.fetch({
-                client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
+                url: client.config.stationslistUrl,
-                client.stations = await fetch(client.config.stationslistUrl)
+                show: false
-                    .then(client.funcs.checkFetchStatus)
+            });
-                    .then(response => response.json());
-
-                client.funcs.logger('Stations', 'Successfully fetched list');
-            } catch (error) {
-                client.funcs.logger('Stations', 'Fetching list failed');
-                //console.error(error);
-            }
         }, 3600000);
 
+        client.streamer = new Streamer();
+        client.streamer.init(client);
+
         if(!client.stations) {
             client.user.setStatus('dnd');
         }
-        
+
         /*GUILDS*/
         client.funcs.logger('Guilds', 'Started fetching list');
 
@@ -83,9 +71,10 @@ module.exports = {
         console.log("\n");
 
         client.funcs.logger('Guilds', 'Successfully fetched list');
-        
+
         /*STATISTICS*/
-        client.datastore.calculateGlobal(client);
+        client.statistics = new Statistics();
+        client.statistics.calculateGlobal(client);
 
         /*EMOJIS*/
         require(`../emojis.js`).execute(client);
@@ -93,10 +82,21 @@ module.exports = {
         /*COMMANDS*/
         require(`../commands.js`).execute(client);
 
+        /*RADIO*/
+        client.radio = new Radio();
+
         setTimeout(function () {
             /*RESTORE RADIOS*/
-            client.funcs.restoreRadios(client, guilds);
+            client.radio.restore(client, guilds);
         }, 5000);
 
+        setTimeout(function () {
+            if(client.stations) {
+                /*MAINTENANCE MODE*/
+                client.funcs.logger("Maintenance Mode", "Disabled");
+                client.config.maintenanceMode = false;
+            }
+        }, 10000);
+
     }
-}
+}

src/client/events/uncaughtException.js

@@ -0,0 +1,11 @@
+module.exports = {
+    name: 'uncaughtException',
+    execute(client, error) {
+        client.funcs.logger("Error");
+        console.log(error.stack);
+        console.log('');
+
+        if(error.name == "DiscordAPIError" && error.message == "Unknown interaction") return;
+        process.emit('SIGINT');
+    }
+}

src/client/events/voiceStateUpdate.js

@@ -14,11 +14,10 @@ module.exports = {
         if (newState.member.id === client.user.id && oldState.member.id === client.user.id) {
 
             if (newState.channel === null) {
-                client.funcs.statisticsUpdate(client, newState.guild, radio);
+                client.statistics.update(client, newState.guild, radio);
                 radio.connection?.destroy();
-                radio.audioPlayer?.stop();
                 radio.message?.delete();
-                client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                 return client.radio.delete(newState.guild.id);
             }
 
@@ -37,11 +36,10 @@ module.exports = {
                         1000
                     );
                 } catch (error) {
-                    client.funcs.statisticsUpdate(client, newState.guild, radio);
+                    client.statistics.update(client, newState.guild, radio);
                     radio.connection?.destroy();
-                    radio.audioPlayer?.stop();
                     radio.message?.delete();
-                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                    client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                     client.radio.delete(oldState.guild.id);
                 }
                 return;
@@ -53,18 +51,17 @@ module.exports = {
                 //radio.connection = await newState.channel.join();
             }
         }
-        if ((oldState.channel.members.size === 1 && oldState.channel === radio.voiceChannel) || change) {
+        if ((oldState.channel.members.filter(member => !member.user.bot).size === 0 && oldState.channel === radio.voiceChannel) || change) {
             setTimeout(() => {
                 if (!radio || !radio.connection || !radio.connection === null) return;
-                if (radio.voiceChannel.members.size === 1) {
+                if (radio.voiceChannel.members.filter(member => !member.user.bot).size === 0) {
-                    client.funcs.statisticsUpdate(client, newState.guild, radio);
+                    client.statistics.update(client, newState.guild, radio);
                     radio.connection?.destroy();
-                    radio.audioPlayer?.stop();
                     radio.message?.delete();
-                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                    client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                     client.radio.delete(newState.guild.id);
                 }
-            }, 60000);
+            }, 5000);
         }
     },
 };

src/client/events/warning.js

@@ -0,0 +1,12 @@
+module.exports = {
+    name: 'warning',
+    execute(client, warning) {
+        if(warning.name == "ExperimentalWarning" && warning.message.startsWith("stream/web")) return;
+
+        client.funcs.logger("Warning");
+        console.warn(warning.name);
+        console.warn(warning.message);
+        console.warn(warning.stack);
+        console.log('');
+    }
+}

src/client/funcs/check.js

@@ -1,7 +1,14 @@
-module.exports = function (client, interaction, command) {
+module.exports = function check(client, interaction, command) {
     let message = {};
     const radio = client.radio.get(interaction.guild.id);
     const permissions = interaction.channel.permissionsFor(interaction.user);
+    if(client.config.maintenanceMode){
+        interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.maintenance,
+            ephemeral: true
+        });
+        return false;
+    }
     if(!client.stations) {
         message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
         interaction.reply({
@@ -24,14 +31,6 @@ module.exports = function (client, interaction, command) {
         });
         return false;
     }
-    if(!command.permission == 'none'){
+
-        if (!permissions.has(command.permission)) {
+    return true;
-            message.noPerms = client.messages.noPerms.replace("%command.permission%", command.permission);
-            interaction.reply({
-                content: client.messageEmojis["error"] + message.noPerms,
-                ephemeral: true
-            });
-            return false;
-        } else return true;
-    } else return true;
 };

src/client/funcs/checkFetchStatus.js

@@ -1,7 +0,0 @@
-module.exports = function (response) {
-    if (response.ok) { // res.status >= 200 && res.status < 300
-        return response;
-    } else {
-        throw new Error(response.status + " " + response.statusText);
-    }
-}

src/client/funcs/isDev.js

@@ -1,4 +1,4 @@
-module.exports = function (devList, authorID){
+module.exports = function isDev(devList, authorID){
     let response = false;
     Object.keys(devList).forEach(function(oneDev) {
         let devID = devList[oneDev];
@@ -7,4 +7,4 @@ module.exports = function (devList, authorID){
         }
     });
     return response;
-}
+}

src/client/funcs/listStations.js

@@ -1,6 +1,6 @@
 import Discord from "discord.js";
 
-module.exports = function (client, interaction){
+module.exports = function listStations(client, interaction){
     let stations = new Array();
     let options = new Array();
 
@@ -30,4 +30,4 @@ module.exports = function (client, interaction){
         components: [menu],
         ephemeral: true
     });
-}
+}

src/client/funcs/loadState.js

@@ -4,7 +4,9 @@ module.exports = function loadState(client, guild){
     let state;
 
     state = data.state;
+    if(!state) return;
+
     data.state = {};
     client.datastore.updateEntry(guild, data);
     return state;
-}
+}

src/client/funcs/logger.js

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

src/client/funcs/msToTime.js

@@ -9,4 +9,4 @@ module.exports = function msToTime(duration) {
         : +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

@@ -1,39 +1,15 @@
 import Discord from "discord.js";
-const {
-    createAudioResource
-} = require("@discordjs/voice");
 
-module.exports = async function play(interaction, guild, client, url) {
+module.exports = async function play(client, interaction, guild, station) {
     let message = {};
     const radio = client.radio.get(guild.id);
-    const resource = createAudioResource(url);
+    const audioPlayer = client.streamer.listen(station);
-    radio.connection.subscribe(radio.audioPlayer);
+    radio.connection.subscribe(audioPlayer);
-    radio.audioPlayer.play(resource);
+    client.funcs.logger('Radio', guild.id + " / " + "Play" + " / " + radio.station.name);
-    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(client.messages.errorPlaying);
-        });
 
     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("%radio.station.owner%", radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "");
     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("**", "");
 
@@ -44,7 +20,7 @@ module.exports = async function play(interaction, guild, client, url) {
         .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()
@@ -80,14 +56,19 @@ module.exports = async function play(interaction, guild, client, url) {
     if(!radio.message){
         radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
     } else {
-        radio.message.edit({ embeds: [embed], components: [buttons] });
+        if(radio.textChannel.id == radio.message.channel.id){
+            radio.message.edit({ embeds: [embed], components: [buttons] });
+        } else {
+            radio.message?.delete();
+            radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+        }
     }
 
     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

@@ -1,62 +0,0 @@
-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

@@ -1,20 +0,0 @@
-module.exports =  async 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) {
-            await client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
-            await 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

@@ -1,6 +1,6 @@
 module.exports = function saveState(client, guild, radio){
     client.datastore.checkEntry(guild.id);
-    
+
     let date = new Date();
 
     let data = client.datastore.getEntry(guild.id);
@@ -15,4 +15,4 @@ module.exports = function saveState(client, guild, radio){
     data.state.station.owner = radio.station.owner;
 
     client.datastore.updateEntry(guild, data);
-}
+}

src/client/funcs/searchStation.js

@@ -1,62 +0,0 @@
-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

@@ -1,22 +0,0 @@
-module.exports = function statisticsUpdate(client, guild, radio) {
-    
-    client.datastore.checkEntry(guild.id);
-    
-    radio.datastore = client.datastore.getEntry(guild.id);
-    
-    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.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
-    
-    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

@@ -11,7 +11,7 @@ module.exports = {
     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)%",
+    nowplayingDescription: "**%radio.station.name%**" + "\n" + "%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.",
@@ -29,12 +29,13 @@ module.exports = {
     sendedMaintenanceMessage: "This bot is going to be under maintenance!",
     footerText: "EximiaBots by Warén Group",
     statusTitle: "%client.user.username% Status",
-    statusField1: "Bot Latency",
+    statusField1: ":clock1: Bot Uptime",
-    statusField2: "API Latency",
+    statusField2: ":floppy_disk: Bot Version",
-    statusField3: "Uptime",
+    statusField3: ":heartbeat: WebSocket Ping",
-    statusField4: "Version",
+    statusField4: ":hourglass: Latency",
-    statusField5: "Hosted by",
+    statusField5: ":globe_with_meridians: Hosted by",
     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."
+    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.",
-};
+    maintenance: "Shhhh... We are now sleeping and dreaming about new features to implement. Will be back soon."
+};

src/client/utils/typings.ts

@@ -1,3 +1,3 @@
 export interface command { }
 
-export interface radio {}
+export interface radio {}

src/config.js

@@ -6,7 +6,7 @@ module.exports = {
     token: process.env.DISCORD_TOKEN,
 
     //radio stations
-    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json",
+    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://git.cwinfo.net/cwchristerw/radio/raw/branch/master/playlist.json",
 
     //support
     supportGuild: "https://discord.gg/rRA65Mn",
@@ -20,7 +20,9 @@ module.exports = {
     hostedBy: "[Warén Group](https://waren.io)",
 
     //Settings
-    version: process.env.RADIOX_VERSION || process.env.npm_package_version,
+    version: process.env.DEV_MODE ? process.env.npm_package_version + "-dev" : process.env.npm_package_version,
-    debug: process.env.DEBUG_MODE || false
+    debug: process.env.DEBUG_MODE || false,
-
+    devMode: process.env.DEV_MODE || false,
-}
+    maintenanceMode: false,
+    streamerMode: process.env.STREAMER_MODE || "manual"
+}