Merge pull request #41 from warengroup/develop

Version 0.3.4
Updated category in next and prev command
2025-07-01 10:23:37 +00:00 · 2021-09-05 06:30:15 +03:00 · 2021-09-05 06:26:34 +03:00 · 2021-09-05 06:22:47 +03:00 · 2021-09-05 06:15:54 +03:00 · 2021-09-05 05:41:22 +03:00
37 changed files with 833 additions and 461 deletions
--- a/.env_example
+++ b/.env_example
@ -1,3 +1,2 @@
 DISCORD_TOKEN=
 RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
-RADIOX_PREFIX=rx-
--- a/README.md
+++ b/README.md
@ -4,12 +4,9 @@ Internet Radio to your Discord guild
 ## [Radio Stations List](https://gitea.cwinfo.org/cwchristerw/radio)
 This bot is using Gitea repo to get radio stations from [playlist.json](https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json) file. List is currently maintained by Christer Warén. You can use alternative list with same format when using RADIOX_STATIONSLISTURL environment variable.

-## PREFIX
-Default prefix is "rx-" and you can change it with using RADIOX_PREFIX environment variable.
-
 ## Docker
 1. `docker build -t warengroup/eximiabots-radiox .`
-2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -e RADIOX_PREFIX="rx-" -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`
+2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`

 ## Join our Discord Server
 https://discord.gg/rRA65Mn
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "eximiabots-radiox",
-  "version": "0.3.0",
+  "version": "0.3.4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "eximiabots-radiox",
-      "version": "0.3.0",
+      "version": "0.3.4",
      "license": "MIT",
      "dependencies": {
        "@discordjs/builders": "^0.6.0",
@ -460,9 +460,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "16.7.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "version": "16.7.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
    },
    "node_modules/@types/ws": {
      "version": "7.4.7",
@ -797,12 +797,15 @@
      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
    },
    "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
      "dependencies": {
        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
      }
    },
    "node_modules/arg": {
@ -1158,11 +1161,6 @@
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
    "node_modules/create-require": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@ -1230,9 +1228,9 @@
      }
    },
    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
      "dev": true
    },
    "node_modules/defer-to-connect": {
@ -2246,11 +2244,6 @@
      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
      "dev": true
    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
    "node_modules/isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -2650,11 +2643,11 @@
      }
    },
    "node_modules/npmlog": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz",
-      "integrity": "sha512-ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
      "dependencies": {
-        "are-we-there-yet": "^1.1.5",
+        "are-we-there-yet": "^2.0.0",
        "console-control-strings": "^1.1.0",
        "gauge": "^3.0.0",
        "set-blocking": "^2.0.0"
@ -2874,11 +2867,6 @@
        "node": ">= 0.6.0"
      }
    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
    "node_modules/progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@ -2985,17 +2973,16 @@
      }
    },
    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
      }
    },
    "node_modules/readdirp": {
@ -3121,9 +3108,23 @@
      }
    },
    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
    },
    "node_modules/semver": {
      "version": "7.3.5",
@ -3254,11 +3255,11 @@
      }
    },
    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
      "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
      }
    },
    "node_modules/string-argv": {
@ -4236,9 +4237,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "16.7.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "version": "16.7.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
    },
    "@types/ws": {
      "version": "7.4.7",
@ -4456,12 +4457,12 @@
      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
    },
    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
      "requires": {
        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "readable-stream": "^3.6.0"
      }
    },
    "arg": {
@ -4740,11 +4741,6 @@
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
    "create-require": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@ -4792,9 +4788,9 @@
      "dev": true
    },
    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
      "dev": true
    },
    "defer-to-connect": {
@ -5562,11 +5558,6 @@
      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
      "dev": true
    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -5881,11 +5872,11 @@
      "dev": true
    },
    "npmlog": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz",
-      "integrity": "sha512-ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
      "requires": {
-        "are-we-there-yet": "^1.1.5",
+        "are-we-there-yet": "^2.0.0",
        "console-control-strings": "^1.1.0",
        "gauge": "^3.0.0",
        "set-blocking": "^2.0.0"
@ -6046,11 +6037,6 @@
      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
    "progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@ -6124,17 +6110,13 @@
      }
    },
    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
      }
    },
    "readdirp": {
@ -6215,9 +6197,9 @@
      }
    },
    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
    },
    "semver": {
      "version": "7.3.5",
@ -6319,11 +6301,11 @@
      }
    },
    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
      "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
      }
    },
    "string-argv": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "eximiabots-radiox",
-  "version": "0.3.0",
+  "version": "0.3.4",
  "description": "Internet Radio to your Discord guild",
  "main": "index.js",
  "scripts": {
--- a/src/Client.ts
+++ b/src/Client.ts
@ -1,16 +1,18 @@
 import Discord, { Client, Collection } from "discord.js";
 import fs from "fs";
-const events = "./client/events/";
 import Datastore from "./client/datastore.js";
 import { command, radio } from "./client/utils/typings.js";
 import config from "./config.js";
 import messages from "./client/messages.js";
 import path from "path";

+const events = "./client/events/";
+
 const GatewayIntents = new Discord.Intents();
 GatewayIntents.add(
    1 << 0, // GUILDS
    1 << 7, // GUILD_VOICE_STATES
+    1 << 9 // GUILD_MESSAGES
 );

 class RadioClient extends Client {
@ -35,6 +37,18 @@ class RadioClient extends Client {
        this.funcs.logger = require("./client/funcs/logger.js");
        this.funcs.msToTime = require("./client/funcs/msToTime.js");
        this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
+        this.funcs.saveState = require("./client/funcs/saveState.js");
+        this.funcs.loadState = require("./client/funcs/loadState.js");
+        this.funcs.searchStation = require("./client/funcs/searchStation.js");
+        this.funcs.play = require("./client/funcs/play.js");
+        this.funcs.listStations = require("./client/funcs/listStations.js");
+
+        console.log('RadioX ' + this.config.version);
+        console.log('Internet Radio to your Discord guild');
+        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        console.log('');
+
+        this.funcs.logger("Bot", "Starting");

        const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
        for (const file of commandFiles) {
@ -44,14 +58,32 @@ class RadioClient extends Client {

        this.on("ready", () => {
            require(`${events}ready`).execute(this);
-            this.datastore = new Datastore();
        });
+
+        this.on("messageCreate", msg => {
+            require(`${events}messageCreate`).execute(this, msg);
+        });
+
+        this.on("messageDelete", msg => {
+            require(`${events}messageDelete`).execute(this, msg);
+        });
+
        this.on("interactionCreate", interaction => {
            require(`${events}interactionCreate`).execute(this, interaction);
        });
+        
        this.on("voiceStateUpdate", (oldState, newState) => {
            require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
        });
+        
+        process.on('SIGINT', () => {
+            require(`${events}SIGINT`).execute(this);
+        });
+
+        process.on('SIGTERM', () => {
+            require(`${events}SIGTERM`).execute(this);
+        });
+        
        this.on("error", error => {
            console.error(error);
        });
--- a/src/client/commands.js
+++ b/src/client/commands.js
@ -44,16 +44,17 @@ module.exports = {
                        try {
                            await rest.put(
                                Routes.applicationGuildCommands(client.user.id, guild.id),
-                                { body: commands },
+                                { body: commands }
                            );
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Successful' + "\n" + guild.id + " / " + guild.name);
                        } catch (DiscordAPIError) {
-
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Failed' + "\n" + guild.id + " / " + guild.name);
                        }
                    });
                } else {
                    await rest.put(
                        Routes.applicationCommands(client.user.id),
-                        { body: commands },
+                        { body: commands }
                    );
                }

--- a/src/client/commands/bug.js
+++ b/src/client/commands/bug.js
@ -1,21 +1,22 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'bug',
-    alias: 'none',
-    usage: '',
    description: 'Report a bug',
    permission: 'none',
    category: 'info',
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
        let message = {};

        message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);
-        message.bugDescription = message.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);
+        message.bugDescription = client.messages.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);

        const embed = new Discord.MessageEmbed()
            .setTitle(message.bugTitle)
            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
            .setColor(client.config.embedColor)
            .setDescription(message.bugDescription)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));

        interaction.reply({
--- a/src/client/commands/help.js
+++ b/src/client/commands/help.js
@ -1,11 +1,11 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'help',
-    alias: 'h',
-    usage: '<command(opt)>',
    description: 'Get help using bot',
    permission: 'none',
    category: 'info',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
        let message = {};

        const categories = [];
@ -19,13 +19,13 @@ module.exports = {

        message.helpTitle = client.messages.helpTitle.replace("%client.user.username%", client.user.username);
        message.helpDescription = client.messages.helpDescription.replace("%commands%", commands);
-        message.helpDescription = message.helpDescription.replace("%client.config.prefix%", client.config.prefix);

        const embed = new Discord.MessageEmbed()
            .setTitle(message.helpTitle)
            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
            .setColor(client.config.embedColor)
            .setDescription(message.helpDescription)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
        
        interaction.reply({
--- a/src/client/commands/invite.js
+++ b/src/client/commands/invite.js
@ -1,17 +1,18 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'invite',
-    alias: 'i',
-    usage: '',
    description: 'Invite Bot',
    permission: 'none',
    category: 'info',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
        let message = {};
        message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
        const embed = new Discord.MessageEmbed()
            .setTitle(message.inviteTitle)
            .setColor(client.config.embedColor)
-            .setURL("https://discordapp.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
+            .setURL("https://discord.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
+            .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({
--- a/src/client/commands/list.js
+++ b/src/client/commands/list.js
@ -1,32 +1,40 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'list',
-    alias: 'l',
-    usage: '',
    description: 'List radio stations',
    permission: 'none',
    category: 'radio',
-    execute(interaction, client, Discord, command) {
+    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);
        }
-        let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
-        const hashs = stations.split('**#**').length;
-        for (let i = 0; i < hashs; i++) {
-            stations = stations.replace('**#**', `**${i + 1}.**`);
+        
+        const radio = client.radio.get(interaction.guild.id);
+        
+        if(radio){
+            client.funcs.listStations(client, interaction);
+        } else {
+            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
+            const hashs = stations.split('**#**').length;
+            for (let i = 0; i < hashs; i++) {
+                stations = stations.replace('**#**', `**${i + 1}.**`);
+            }
+
+            let embed = new Discord.MessageEmbed()
+                .setTitle(client.messages.listTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(stations)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            interaction.reply({
+                embeds: [embed],
+                ephemeral: true
+            });
        }
-
-        const embed = new Discord.MessageEmbed()
-            .setTitle(client.messages.listTitle)
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
-            .setColor(client.config.embedColor)
-            .setDescription(stations)
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
    }
 };
--- a/src/client/commands/maintenance.js
+++ b/src/client/commands/maintenance.js
@ -1,57 +1,62 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'maintenance',
-    alias: 'm',
-    usage: '',
    description: 'Bot Maintenance',
    permission: 'none',
    category: 'info',
-    execute(interaction, client, Discord, command) {
+    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.stations) {
-            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-        }
+        if(client.config.version.includes("-dev")){
+            interaction.reply({
+                content: "Maintenance Initiated",
+                ephemeral: true
+            });

-        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.currentGuild.guild, currentRadio);
-                currentRadio.connection?.destroy();
-                currentRadio.audioPlayer?.stop();
-                const cembed = new Discord.MessageEmbed()
-                    .setTitle(client.messages.maintenanceTitle)
-                    .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
-                    .setColor(client.config.embedColor)
-                    .setDescription(client.messages.sendedMaintenanceMessage)
-                    .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-                currentRadio.textChannel.send({ embeds: [cembed] });
-                client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.currentGuild.guild.name + "\n";
+            process.emit('SIGINT');
+        } else {
+            if(!client.stations) {
+                message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+                return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
            }
-            radio = currentRadios.next();
+            
+            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
+            });
        }

-        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)
-        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
    }
 };
--- a/src/client/commands/next.js
+++ b/src/client/commands/next.js
@ -0,0 +1,35 @@
+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;
+
+            let station = client.stations[index];
+
+            if(!station) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
+
+            interaction.deferUpdate();
+
+            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);
+
+        }
+    }
+}
--- a/src/client/commands/nowplaying.js
+++ b/src/client/commands/nowplaying.js
@ -1,38 +1,36 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'nowplaying',
-    alias: 'np',
-    usage: '',
    description: 'Current Radio Station',
    permission: 'none',
    category: 'radio',
-    async execute(interaction, client, Discord, command) {
-        let message = {};
-        const radio = client.radio.get(interaction.guild.id);
-        if (!radio) return interaction.reply('There is nothing playing.');
-        if(!client.stations) {
-            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+    async execute(interaction, client, command) {
+        if (client.funcs.check(client, interaction, command)) {
+            let message = {};
+            const radio = client.radio.get(interaction.guild.id);
+
+            let date = new Date();
+            radio.currentTime = date.getTime();
+            radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
+            const completed = (radio.playTime);
+
+            message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
+            message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
+            message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));
+
+            const embed = new Discord.MessageEmbed()
+                .setTitle(client.messages.nowplayingTitle)
+                .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
+                .setColor(client.config.embedColor)
+                .setDescription(message.nowplayingDescription)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+            
+            interaction.reply({
+                embeds: [embed],
+                ephemeral: true
+            });
        }
-
-        let date = new Date();
-        radio.currentTime = date.getTime();
-        radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
-        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("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));
-
-        const embed = new Discord.MessageEmbed()
-            .setTitle(client.messages.nowplayingTitle)
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))
-            .setColor(client.config.embedColor)
-            .setDescription(message.nowplayingDescription)
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
    }
 };
--- a/src/client/commands/play.js
+++ b/src/client/commands/play.js
@ -1,13 +1,11 @@
 const {
    createAudioPlayer,
-    createAudioResource,
    getVoiceConnection,
    joinVoiceChannel
 } = require("@discordjs/voice");

 module.exports = {
    name: "play",
-    alias: "p",
    usage: "<song name>",
    description: "Play radio",
    options: [
@ -15,7 +13,7 @@ module.exports = {
    ],
    permission: "none",
    category: "radio",
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
        let message = {};
        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
        if(!query){
@ -24,47 +22,7 @@ module.exports = {
                return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
            }

-            let stations = new Array();
-
-            let options = new Array();
-            options[1] = new Array();
-            options[2] = new Array();
-
-            stations[1] = client.stations.slice(0,24).forEach(station => {
-                station = {
-                    label: station.name,
-                    description: station.owner,
-                    value: station.name
-                };
-                options[1].push(station);
-            });
-
-            stations[2] = client.stations.slice(25).forEach(station => {
-                station = {
-                    label: station.name,
-                    description: station.owner,
-                    value: station.name
-                };
-                options[2].push(station);
-            });
-
-            const menu = new Discord.MessageActionRow()
-                .addComponents(
-                    new Discord.MessageSelectMenu()
-                        .setCustomId('play')
-                        .setPlaceholder('Nothing selected')
-                        .addOptions(options[1])
-                        .addOptions(options[2])
-                );
-
-            stations = null;
-            options = null;
-
-		    return interaction.reply({
-                content: '**Select station:**',
-                components: [menu],
-                ephemeral: true
-            });
+            client.funcs.listStations(client, interaction);
        }
        let url = query ? query.replace(/<(.+)>/g, "$1") : "";
        const radio = client.radio.get(interaction.guild.id);
@ -123,7 +81,7 @@ module.exports = {
                    content: client.messageEmojis["error"] + client.messages.tooShortSearch,
                    ephemeral: true
                });
-            const sstation = await searchStation(query, client);
+            const sstation = await client.funcs.searchStation(query, client);
            if (!sstation)
                return interaction.reply({
                    content: client.messageEmojis["error"] + client.messages.noSearchResults,
@ -137,9 +95,11 @@ module.exports = {
            client.funcs.statisticsUpdate(client, interaction.guild, radio);
            radio.audioPlayer.stop();
            
+            let date = new Date();
            radio.station = station;
            radio.textChannel = interaction.channel;
-            play(interaction, interaction.guild, client, url, Discord);
+            radio.startTime = date.getTime();
+            client.funcs.play(interaction, interaction.guild, client, url);

            return;
        }
@ -165,7 +125,7 @@ module.exports = {
            construct.connection = connection;
            let date = new Date();
            construct.startTime = date.getTime();
-            play(interaction, interaction.guild, client, url, Discord);
+            client.funcs.play(interaction, interaction.guild, client, url);

            client.datastore.checkEntry(interaction.guild.id);
            construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
@ -183,155 +143,3 @@ module.exports = {
        }
    }
 };
-
-async function play(interaction, guild, client, url, Discord) {
-    let message = {};
-    const radio = client.radio.get(guild.id);
-    const resource = createAudioResource(url);
-    radio.connection.subscribe(radio.audioPlayer);
-    radio.audioPlayer.play(resource);
-    resource.playStream
-        .on("readable", () => {
-            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
-        })
-        .on("finish", () => {
-            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
-            client.funcs.statisticsUpdate(client, guild, radio);
-            radio.connection?.destroy();
-            radio.audioPlayer?.stop();
-            client.radio.delete(guild.id);
-            return;
-        })
-        .on("error", error => {
-            client.funcs.logger('Radio', 'Stream errored');
-            console.error(error);
-            radio.connection?.destroy();
-            radio.audioPlayer?.stop();
-            client.radio.delete(guild.id);
-            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("%client.funcs.msToTime(completed)%", "");
-    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
-    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
-
-    const embed = new Discord.MessageEmbed()
-        .setTitle(client.user.username)
-        .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))
-        .setColor(client.config.embedColor)
-        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
-        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-    
-    const buttons = new Discord.MessageActionRow()
-        .addComponents(
-            new Discord.MessageButton()
-                .setCustomId('list')
-                .setEmoji(client.messageEmojis["list"])
-                .setStyle('SECONDARY')
-        )
-        .addComponents(
-            new Discord.MessageButton()
-                .setCustomId('prev')
-                .setEmoji(client.messageEmojis["prev"])
-                .setStyle('SECONDARY')
-                .setDisabled(true)
-        )
-        .addComponents(
-            new Discord.MessageButton()
-                .setCustomId('stop')
-                .setEmoji(client.messageEmojis["stop"])
-                .setStyle('SECONDARY')
-        )
-        .addComponents(
-            new Discord.MessageButton()
-                .setCustomId('next')
-                .setEmoji(client.messageEmojis["next"])
-                .setStyle('SECONDARY')
-                .setDisabled(true)
-        )
-        .addComponents(
-            new Discord.MessageButton()
-                .setCustomId('statistics')
-                .setEmoji(client.messageEmojis["statistics"])
-                .setStyle('SECONDARY')
-        );
-
-    if(!radio.message){
-        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
-    } else {
-        radio.message.edit({ embeds: [embed], components: [buttons] });
-    }
-
-    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
-    
-    interaction.reply({
-        content: client.messageEmojis["play"] + message.play,
-        ephemeral: true
-    });
-    
-}
-
-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;
-}
--- a/src/client/commands/prev.js
+++ b/src/client/commands/prev.js
@ -0,0 +1,35 @@
+module.exports = {
+    name: 'prev',
+    description: 'Previous 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 == -1) index = client.stations.length - 1;
+
+            let station = client.stations[index];
+
+            if(!station) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
+                ephemeral: true
+            });
+
+            interaction.deferUpdate();
+
+            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);
+
+        }
+    }
+}
--- a/src/client/commands/statistics.js
+++ b/src/client/commands/statistics.js
@ -1,14 +1,15 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'statistics',
-    alias: 'stats',
-    usage: '',
    description: 'Show statistics',
    permission: 'none',
    category: 'info',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
        let message = {};
        let stations = client.stations;
        let currentGuild = client.datastore.getEntry(interaction.guild.id);
+        let global = client.datastore.getEntry("global");
        let statistics = "";
        
        if(!client.stations) {
@ -21,9 +22,13 @@ module.exports = {
        } else {
            Object.keys(stations).forEach(function(station) {
                if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){
-                    statistics += `**${parseInt(station) + 1}** ` + stations[station].name + " \n";
-                    statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + "\n";
-                    statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
+                    statistics += `**${parseInt(station) + 1}. ` + stations[station].name + "** \n";
+                    if(global && global.statistics[stations[station].name] && global.statistics[stations[station].name].time && parseInt(global.statistics[stations[station].name].time) > 0 && global.statistics[stations[station].name].used && parseInt(global.statistics[stations[station].name].used) > 0){
+                        statistics += "Guild – Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " (" + ((currentGuild.statistics[stations[station].name].time / global.statistics[stations[station].name].time) * 100) + "%" + ")" + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + " (" + ((currentGuild.statistics[stations[station].name].used / global.statistics[stations[station].name].used) * 100) + "%" + ")" + "\n";
+                        statistics += "Global – Time: " + client.funcs.msToTime(global.statistics[stations[station].name].time) + " / " + "Used: " + global.statistics[stations[station].name].used + "\n\n";
+                    } else {
+                        statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + "\n\n";
+                    }
                }
            });
        }
@ -33,6 +38,7 @@ module.exports = {
            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
            .setColor(client.config.embedColor)
            .setDescription(statistics)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));

        interaction.reply({
--- a/src/client/commands/status.js
+++ b/src/client/commands/status.js
@ -1,11 +1,11 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'status',
-    alias: 'st',
-    usage: '',
    description: 'Bot Status',
    permission: 'none',
    category: 'info',
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
        let message = {};

        message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username);
@ -20,6 +20,7 @@ module.exports = {
            .addField(client.messages.statusField3, uptime, true)
            .addField(client.messages.statusField4, client.config.version, true)
            .addField(client.messages.statusField5, client.config.hostedBy, true)
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));

        interaction.reply({
--- a/src/client/commands/stop.js
+++ b/src/client/commands/stop.js
@ -1,11 +1,11 @@
+import Discord from "discord.js";
+
 module.exports = {
    name: 'stop',
    description: 'Stop radio',
-    alias: 's',
-    usage: '',
    permission: 'none',
    category: 'radio',
-    async execute(interaction, client, Discord, command) {
+    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);
@ -18,16 +18,17 @@ module.exports = {
                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["stop"].replace(/[^0-9]+/g, ''))
                .setColor(client.config.embedColor)
                .addField(client.messages.nowplayingTitle, "-", true)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));

            if(!radio.message){
-                radio.message = await radio.textChannel.send({ embeds: [embed], components: [] });
+                radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
            } else {
                radio.message.edit({ embeds: [embed], components: [] });
            }

-            setTimeout(function() {
-                radio.message.delete();
+            setTimeout(async function() {
+                await radio.message?.delete();
            }, 5000);

            client.radio.delete(interaction.guild.id);
--- a/src/client/datastore.js
+++ b/src/client/datastore.js
@ -80,6 +80,7 @@ module.exports = class {
        newData.guild = {};
        newData.guild.id = id;
        newData.statistics = {};
+        newData.state = {};
        this.map.set(id, newData);
        this.saveEntry(id, newData);
    }
@ -90,6 +91,10 @@ module.exports = class {
    
    updateEntry(guild, newData) {
        newData.guild.name = guild.name;
+
+        let date = new Date();
+        newData.updated = date.toISOString().substring(0, 10)
+        
        this.map.set(guild.id, newData);
        this.saveEntry(guild.id, newData);
        //this.showEntry(this.getEntry(guild.id));
@ -110,6 +115,9 @@ module.exports = class {
                    "time": 0,
                    "used": 0
                }
+            },
+            "state": {
+
            }
        }
        
--- a/src/client/events/SIGINT.js
+++ b/src/client/events/SIGINT.js
@ -0,0 +1,65 @@
+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) {
+        client.user.setStatus('dnd');
+
+        console.log("\n");
+        client.funcs.logger("Bot", "Closing");
+        console.log("\n");
+        
+        setTimeout(async function () {
+            let message = {};
+
+            if (!client.stations) return process.exit();
+
+            let currentRadios = client.radio.keys();
+            let radio = currentRadios.next();
+
+            while (!radio.done) {
+                let currentRadio = client.radio.get(radio.value);
+                currentRadio.guild = client.datastore.getEntry(radio.value).guild;
+
+                if (currentRadio) {
+                    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();
+            }
+
+            /*const rest = new REST({ version: '9' }).setToken(token);
+            if(version.includes("-dev")){
+                await rest.put(
+                    Routes.applicationCommands(client.user.id),
+                    { body: [] },
+                );
+
+                let guilds = await client.guilds.fetch();
+                guilds.forEach(async guild => {
+                    try {
+                        await rest.put(
+                            Routes.applicationGuildCommands(client.user.id, guild.id),
+                            { body: [] }
+                        );
+                    } catch (DiscordAPIError) {
+
+                    }
+                });
+            }*/
+
+            setInterval(() => {
+                if(radio.done){
+                    process.exit();
+                }
+            }, 1000);
+        }, 5000);
+    }
+}
--- a/src/client/events/SIGTERM.js
+++ b/src/client/events/SIGTERM.js
@ -0,0 +1,6 @@
+module.exports = {
+    name: 'SIGTERM',
+    async execute(client) {
+        process.emit('SIGINT');
+    }
+}
--- a/src/client/events/interactionCreate.js
+++ b/src/client/events/interactionCreate.js
@ -1,12 +1,9 @@
-import Discord from "discord.js";
-
 module.exports = {
    name: 'interactionCreate',
    async execute(client, interaction) {
-        /*if (!interaction.isCommand()) return;*/

        const permissions = interaction.channel.permissionsFor(interaction.client.user);
-        if (!permissions.has('EMBED_LINKS')) return interaction.send(client.messages.noPermsEmbed);
+        if (!permissions.has('EMBED_LINKS')) return interaction.reply(client.messages.noPermsEmbed);

        if(interaction.isCommand()){
            const commandName = interaction.commandName;
@ -14,9 +11,12 @@ module.exports = {
            if (!command) return;
    
            try {
-                command.execute(interaction, client, Discord, command);
+                command.execute(interaction, client);
            } catch (error) {
-                interaction.reply(client.messages.runningCommandFailed);
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
                console.error(error);
            }
        } else if (interaction.isSelectMenu() || interaction.isButton()){
@ -25,9 +25,12 @@ module.exports = {
            if (!command) return;

            try {
-                command.execute(interaction, client, Discord, command);
+                command.execute(interaction, client, command);
            } catch (error) {
-                interaction.reply(client.messages.runningCommandFailed);
+                interaction.reply({
+                    content: client.messages.runningCommandFailed,
+                    ephemeral: true
+                });
                console.error(error);
            }
        }
--- a/src/client/events/messageCreate.js
+++ b/src/client/events/messageCreate.js
@ -0,0 +1,55 @@
+import Discord from "discord.js";
+module.exports = {
+    name: 'messageCreate',
+    async execute(client, message) {
+
+        if (message.author.bot || !message.guild) return;
+        let prefix = "rx$";
+        if(client.user.username == "RadioX"){
+            prefix = "rx>";
+        } else if (client.user.username == "RadioX Beta"){
+            prefix = "rx-";
+        } else if (client.user.username == "RadioX Dev"){
+            prefix = "rx$";
+        } else if(message.mentions.members.first() && message.mentions.members.first().user.id === client.user.id){
+            prefix = "<@!" + client.user.id + "> ";
+        } else {
+            return;
+        }
+        
+        const args = message.content.slice(prefix.length).split(' ');
+        if (!message.content.startsWith(prefix)) return;
+        if (!args[0]) return;
+        const commandName = args[0].toLowerCase();
+        if (commandName === 'none') return;
+        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
+        if (!command && message.content !== `${prefix}`) return;
+        const permissions = message.channel.permissionsFor(message.client.user);
+        if (!permissions.has('EMBED_LINKS')) return message.channel.send(client.messages.noPermsEmbed);
+        try {
+            let newMessage = {};
+
+            newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
+    
+            const embed = new Discord.MessageEmbed()
+                .setTitle(newMessage.messageCommandsDeprecatedTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(client.messages.messageCommandsDeprecatedDescription)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            let msg = await message.channel.send({ embeds: [embed] });
+
+            setTimeout(function() {
+                msg.delete();
+            }, 30000);
+        } catch (error) {
+            message.reply({
+                content: client.messages.runningCommandFailed,
+                ephemeral: true
+            });
+            console.error(error);
+        }
+    }
+}
--- a/src/client/events/messageDelete.js
+++ b/src/client/events/messageDelete.js
@ -0,0 +1,10 @@
+module.exports = {
+    name: 'messageDelete',
+    async execute(client, msg) {
+        if (!msg.author.bot || !msg.guild) return;
+        const radio = client.radio.get(msg.guild.id);
+        if (!radio) return;
+        if(msg.id != radio.message.id) return;
+        radio.message = null;
+    }
+}
--- a/src/client/events/ready.js
+++ b/src/client/events/ready.js
@ -1,22 +1,32 @@
-const fetch = require('node-fetch');
+import Datastore from "../datastore.js";
+import fetch from "node-fetch";

 module.exports = {
    name: 'ready',
    async execute(client) {

-        console.log('RadioX ' + client.config.version);
-        console.log('Internet Radio to your Discord guild');
-        console.log('(c)2020-2021 EximiaBots by Warén Group');
-        console.log('');
+        client.funcs.logger("Bot", "Ready");
+
+        /*DATASTORE*/
+        client.funcs.logger('Datastore', 'Initialize');
+        client.datastore = new Datastore();
+
+        client.funcs.logger('Datastore');
+        client.datastore.map.forEach(datastore => {
+            console.log("- " + datastore.guild.id + " / " + datastore.guild.name);
+        });
+        console.log("\n");
+
+        client.funcs.logger('Datastore', 'Ready');

        /*DEVELOPERS*/
-        client.funcs.logger('Developers', 'List');
+        client.funcs.logger('Developers');
        
        client.developers = "";
        let user = "";
        for (let i = 0; i < client.config.devId.length; i++) {
            user = await client.users.fetch(client.config.devId[i]);
-            console.log("   - " + user.tag);
+            console.log("- " + user.tag);
            if (i == client.config.devId.length - 1) {
                client.developers += user.tag;
            } else {
@ -32,9 +42,9 @@ module.exports = {
                .then(client.funcs.checkFetchStatus)
                .then(response => response.json());

-            client.funcs.logger('Stations', 'List');
+            client.funcs.logger('Stations');
            client.stations.forEach(station => {
-                console.log("   - " + station.name);
+                console.log("- " + station.name);
            });
            console.log("\n");

@ -65,10 +75,10 @@ module.exports = {
        /*GUILDS*/
        client.funcs.logger('Guilds', 'Started fetching list');

-        client.funcs.logger('Guilds', 'List');
+        client.funcs.logger('Guilds');
        let guilds = await client.guilds.fetch();
        guilds.forEach(guild => {
-            console.log("   - " + guild.id + ": " + guild.name);
+            console.log("- " + guild.id + " / " + guild.name);
        });
        console.log("\n");

@ -83,5 +93,10 @@ module.exports = {
        /*COMMANDS*/
        require(`../commands.js`).execute(client);

+        setTimeout(function () {
+            /*RESTORE RADIO*/
+            require(`../restoreradio.js`).execute(client, guilds);
+        }, 5000);
+
    }
 }
--- a/src/client/events/voiceStateUpdate.js
+++ b/src/client/events/voiceStateUpdate.js
@ -17,6 +17,7 @@ module.exports = {
                client.funcs.statisticsUpdate(client, newState.guild, radio);
                radio.connection?.destroy();
                radio.audioPlayer?.stop();
+                radio.message?.delete();
                client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                return client.radio.delete(newState.guild.id);
            }
@ -39,6 +40,7 @@ module.exports = {
                    client.funcs.statisticsUpdate(client, newState.guild, radio);
                    radio.connection?.destroy();
                    radio.audioPlayer?.stop();
+                    radio.message?.delete();
                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                    client.radio.delete(oldState.guild.id);
                }
@ -58,6 +60,7 @@ module.exports = {
                    client.funcs.statisticsUpdate(client, newState.guild, radio);
                    radio.connection?.destroy();
                    radio.audioPlayer?.stop();
+                    radio.message?.delete();
                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
                    client.radio.delete(newState.guild.id);
                }
--- a/src/client/funcs/check.js
+++ b/src/client/funcs/check.js
@ -2,6 +2,14 @@ module.exports = function (client, interaction, command) {
    let message = {};
    const radio = client.radio.get(interaction.guild.id);
    const permissions = interaction.channel.permissionsFor(interaction.user);
+    if(!client.stations) {
+        message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+        interaction.reply({
+            content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+            ephemeral: true
+        });
+        return false;
+    }
    if (!radio) {
        interaction.reply({
            content: client.messageEmojis["error"] + client.messages.notPlaying,
--- a/src/client/funcs/listStations.js
+++ b/src/client/funcs/listStations.js
@ -0,0 +1,45 @@
+import Discord from "discord.js";
+
+module.exports = function (client, interaction){
+    let stations = new Array();
+
+    let options = new Array();
+    options[1] = new Array();
+    options[2] = new Array();
+
+    stations[1] = client.stations.slice(0,24).forEach(station => {
+        station = {
+            label: station.name,
+            description: station.owner,
+            value: station.name
+        };
+        options[1].push(station);
+    });
+
+    stations[2] = client.stations.slice(25).forEach(station => {
+        station = {
+            label: station.name,
+            description: station.owner,
+            value: station.name
+        };
+        options[2].push(station);
+    });
+
+    const menu = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageSelectMenu()
+                .setCustomId('play')
+                .setPlaceholder('Nothing selected')
+                .addOptions(options[1])
+                .addOptions(options[2])
+        );
+
+    stations = null;
+    options = null;
+
+    return interaction.reply({
+        content: '**Select station:**',
+        components: [menu],
+        ephemeral: true
+    });
+}
--- a/src/client/funcs/loadState.js
+++ b/src/client/funcs/loadState.js
@ -0,0 +1,10 @@
+module.exports = function loadState(client, guild){
+    let data = client.datastore.getEntry(guild.id);
+    if(!data) return;
+    let state;
+
+    state = data.state;
+    data.state = {};
+    client.datastore.updateEntry(guild, data);
+    return state;
+}
--- a/src/client/funcs/logger.js
+++ b/src/client/funcs/logger.js
@ -1,4 +1,5 @@
 module.exports = function (area, text){
    let date = new Date();
-    console.log('[' + area + '] – ' + date.toISOString() + '\n' + text + '\n');
+    console.log('[' + area + '] – ' + date.toISOString());
+    if(text)  console.log(text + '\n');
 }
--- a/src/client/funcs/play.js
+++ b/src/client/funcs/play.js
@ -0,0 +1,93 @@
+import Discord from "discord.js";
+const {
+    createAudioResource
+} = require("@discordjs/voice");
+
+module.exports = async function play(interaction, guild, client, url) {
+    let message = {};
+    const radio = client.radio.get(guild.id);
+    const resource = createAudioResource(url);
+    radio.connection.subscribe(radio.audioPlayer);
+    radio.audioPlayer.play(resource);
+    resource.playStream
+        .on("readable", () => {
+            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
+        })
+        .on("finish", () => {
+            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
+            client.funcs.statisticsUpdate(client, guild, radio);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+            return;
+        })
+        .on("error", error => {
+            client.funcs.logger('Radio', 'Stream errored');
+            console.error(error);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+            return interaction.reply(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("%client.funcs.msToTime(completed)%", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("Owner: ", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+
+    const embed = new Discord.MessageEmbed()
+        .setTitle(client.user.username)
+        .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
+        .setColor(client.config.embedColor)
+        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+    
+    const buttons = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('list')
+                .setEmoji(client.messageEmojis["list"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('prev')
+                .setEmoji(client.messageEmojis["prev"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('stop')
+                .setEmoji(client.messageEmojis["stop"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('next')
+                .setEmoji(client.messageEmojis["next"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('statistics')
+                .setEmoji(client.messageEmojis["statistics"])
+                .setStyle('SECONDARY')
+        );
+
+    if(!radio.message){
+        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+    } else {
+        radio.message.edit({ embeds: [embed], components: [buttons] });
+    }
+
+    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
+    
+    interaction?.reply({
+        content: client.messageEmojis["play"] + message.play,
+        ephemeral: true
+    });
+    
+}
--- a/src/client/funcs/saveState.js
+++ b/src/client/funcs/saveState.js
@ -0,0 +1,18 @@
+module.exports = function saveState(client, guild, radio){
+    client.datastore.checkEntry(guild.id);
+    
+    let date = new Date();
+
+    let data = client.datastore.getEntry(guild.id);
+
+    data.state = {};
+    data.state.channels = {};
+    data.state.channels.text = radio.textChannel.id;
+    data.state.channels.voice = radio.voiceChannel.id;
+    data.state.date = date.toISOString();
+    data.state.station = {};
+    data.state.station.name = radio.station.name;
+    data.state.station.owner = radio.station.owner;
+
+    client.datastore.updateEntry(guild, data);
+}
--- a/src/client/funcs/searchStation.js
+++ b/src/client/funcs/searchStation.js
@ -0,0 +1,62 @@
+module.exports = function searchStation(key, client) {
+    if (client.stations === null) return false;
+    let foundStations = [];
+    if (!key) return false;
+    if (key == "radio") return false;
+
+    client.stations
+        .filter(
+            x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
+        )
+        .forEach(x =>
+            foundStations.push({ station: x, name: x.name, probability: 100 })
+        );
+
+    if (key.startsWith("radio ")) key = key.slice(6);
+    const probabilityIncrement = 100 / key.split(" ").length / 2;
+    for (let i = 0; i < key.split(" ").length; i++) {
+        client.stations
+            .filter(
+                x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
+            )
+            .forEach(x =>
+                foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
+            );
+    }
+    if (foundStations.length === 0) return false;
+    for (let i = 0; i < foundStations.length; i++) {
+        for (let j = 0; j < foundStations.length; j++) {
+            if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
+        }
+    }
+    for (let i = 0; i < foundStations.length; i++) {
+        if (foundStations[i].name.length > key.length) {
+            foundStations[i].probability -=
+                (foundStations[i].name.split(" ").length - key.split(" ").length) *
+                (probabilityIncrement * 0.5);
+        } else if (foundStations[i].name.length === key.length) {
+            foundStations[i].probability += probabilityIncrement * 0.9;
+        }
+
+        for (let j = 0; j < key.split(" ").length; j++) {
+            if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
+                foundStations[i].probability -= probabilityIncrement * 0.5;
+            }
+        }
+    }
+    let highestProbabilityStation;
+    for (let i = 0; i < foundStations.length; i++) {
+        if (
+            !highestProbabilityStation ||
+            highestProbabilityStation.probability < foundStations[i].probability
+        )
+            highestProbabilityStation = foundStations[i];
+        if (
+            highestProbabilityStation &&
+            highestProbabilityStation.probability === foundStations[i].probability
+        ) {
+            highestProbabilityStation = foundStations[i].station;
+        }
+    }
+    return highestProbabilityStation;
+}
--- a/src/client/funcs/statisticsUpdate.js
+++ b/src/client/funcs/statisticsUpdate.js
@ -2,21 +2,21 @@ module.exports = function statisticsUpdate(client, guild, radio) {
    
    client.datastore.checkEntry(guild.id);
    
-    radio.currentGuild = client.datastore.getEntry(guild.id);
+    radio.datastore = client.datastore.getEntry(guild.id);
    
-    if(!radio.currentGuild.statistics[radio.station.name]){
-        radio.currentGuild.statistics[radio.station.name] = {};
-        radio.currentGuild.statistics[radio.station.name].time = 0;
-        radio.currentGuild.statistics[radio.station.name].used = 0;
-        client.datastore.updateEntry(guild, radio.currentGuild);
+    if(!radio.datastore.statistics[radio.station.name]){
+        radio.datastore.statistics[radio.station.name] = {};
+        radio.datastore.statistics[radio.station.name].time = 0;
+        radio.datastore.statistics[radio.station.name].used = 0;
+        client.datastore.updateEntry(guild, radio.datastore);
    }
    
    let date = new Date();
    radio.currentTime = date.getTime();
    radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
-    radio.currentGuild.statistics[radio.station.name].time = parseInt(radio.currentGuild.statistics[radio.station.name].time)+parseInt(radio.playTime);
+    radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
    
-    radio.currentGuild.statistics[radio.station.name].used = parseInt(radio.currentGuild.statistics[radio.station.name].used)+1;
-    client.datastore.updateEntry(guild, radio.currentGuild);
+    radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
+    client.datastore.updateEntry(guild, radio.datastore);
    client.datastore.calculateGlobal(client);
 }
--- a/src/client/messages.js
+++ b/src/client/messages.js
@ -5,15 +5,13 @@ module.exports = {
    runningCommandFailed: "Running this command failed!",
    noPermsEmbed: "I cannot send embeds (Embed links).",
    bugTitle: "Found a bug with %client.user.username%?",
-    bugDescription: "Join the support server \n %client.config.supportGuild%",
+    bugDescription: "Join the support server" + "\n" + "%client.config.supportGuild%",
    helpTitle: "%client.user.username% help:",
    helpDescription: "%commands%",
-    helpCommandTitle: "%client.config.prefix%%command.name% %command.usage%",
-    helpCommandDescription: "%command.description% \n Command Alias: %command.alias%",
    inviteTitle: "Invite %client.user.username% to your Discord server!",
    listTitle: "Radio Stations",
    nowplayingTitle: "Now Playing",
-    nowplayingDescription: "**%radio.station.name%** \n Owner: %radio.station.owner% \n %client.funcs.msToTime(completed)%",
+    nowplayingDescription: "**%radio.station.name%**" + "\n" + "Owner: %radio.station.owner%" + "\n" + "%client.funcs.msToTime(completed)%",
    noVoiceChannel: "You need to be in a voice channel to play radio!",
    noQuery: "You need to use a number or search for a supported station!",
    noPermsConnect: "I cannot connect to your voice channel.",
@ -36,5 +34,7 @@ module.exports = {
    statusField3: "Uptime",
    statusField4: "Version",
    statusField5: "Hosted by",
-    errorStationURL: "Station can't be URL"
+    errorStationURL: "Station can't be URL",
+    messageCommandsDeprecatedTitle: "%client.user.username%",
+    messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
 };
--- a/src/client/restoreradio.js
+++ b/src/client/restoreradio.js
@ -0,0 +1,61 @@
+import Discord from "discord.js";
+const {
+    createAudioPlayer,
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = {
+    async execute(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;
+
+            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 {
+                let voiceChannel = client.channels.cache.get(state.channels.voice);
+                const connection =
+                    getVoiceConnection(guild.id) ??
+                    joinVoiceChannel({
+                        channelId: voiceChannel.id,
+                        guildId: voiceChannel.guild.id,
+                        adapterCreator: voiceChannel.guild.voiceAdapterCreator
+                    });
+
+                construct.connection = connection;
+                let date = new Date();
+                construct.startTime = date.getTime();
+                
+                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);
+            }
+        });
+    }
+}
--- a/src/config.js
+++ b/src/config.js
@ -20,7 +20,6 @@ module.exports = {
    hostedBy: "[Warén Group](https://waren.io)",

    //Settings
-    prefix: process.env.RADIOX_PREFIX || "rx-",
    version: process.env.RADIOX_VERSION || process.env.npm_package_version,
    debug: process.env.DEBUG_MODE || false
Author	SHA1	Message	Date
Christer Warén	a86cf0c769	Merge pull request #41 from warengroup/develop Version 0.3.4	2021-09-05 06:30:15 +03:00
Christer Warén	7a0a3e0d50	Updated category in next and prev command	2021-09-05 06:26:34 +03:00
Christer Warén	479c0ee13d	Fixed check function	2021-09-05 06:22:47 +03:00
Christer Warén	b280981e1c	Updated statistics command	2021-09-05 06:15:54 +03:00
Christer Warén	933140502d	Updated prev command	2021-09-05 05:41:22 +03:00
Christer Warén	dfada15b00	Updated next command	2021-09-05 05:41:13 +03:00
Christer Warén	8fdcdd0116	Updated next & prev command	2021-09-05 04:42:11 +03:00
Christer Warén	11573a5113	Updated commands.js	2021-09-05 04:41:53 +03:00
Christer Warén	7e3a83743d	Disabled removing commands when bot is going offline	2021-09-05 04:36:32 +03:00
Christer Warén	38af503626	Fixed bug replated to sending error message in interactionCreate.js	2021-09-05 03:44:28 +03:00
Christer Warén	534bc74936	Updated code	2021-09-05 03:37:03 +03:00
Christer Warén	ea2be5d5fb	Updated check function	2021-09-05 03:33:48 +03:00
Christer Warén	38a8571ddc	Updated nowplaying command	2021-09-05 03:33:15 +03:00
Christer Warén	2d41c7a76b	Updated commands and interactionCreate event	2021-09-05 03:17:21 +03:00
Christer Warén	16bc2aab52	Updated play function	2021-09-05 03:12:23 +03:00
Christer Warén	17132cd51a	Moved listStations into funcs folder	2021-09-05 03:11:51 +03:00
Christer Warén	ec6ea7e839	Removed unused variable command from commands.	2021-09-05 03:06:47 +03:00
Christer Warén	c81dbddab1	Renamed previous to prev command	2021-09-05 02:54:56 +03:00
Christer Warén	e0226c5cfe	Updated multiple command's metadata	2021-09-05 02:49:03 +03:00
Christer Warén	3f12bafee0	Updated Dependencies	2021-09-05 02:46:13 +03:00
Christer Warén	3fc28a79cb	Moved createAudioResource from discord.js/voice to play function	2021-09-05 02:39:59 +03:00
Christer Warén	72d0054d25	Made interaction nullable when replying in play function	2021-09-05 02:36:52 +03:00
Christer Warén	25356be323	Moved play function to funcs folder	2021-09-05 02:35:36 +03:00
Christer Warén	e8d90f8a3c	Fixed file name searchStations to searchStation	2021-09-05 02:23:26 +03:00
Christer Warén	c724ae502f	Moved searchStations function into funcs folder	2021-09-05 02:16:58 +03:00
Christer Warén	a3efdbf3cb	Enabled next and previous buttons in restoreradio.js	2021-09-05 02:13:39 +03:00
Christer Warén	2857b6886f	Enabled prev & next buttons in play command	2021-09-05 02:13:18 +03:00
Christer Warén	1e24e89568	Updated maintenance command	2021-09-05 02:12:57 +03:00
Christer Warén	3609e6af10	Added empty next and previous command	2021-09-05 02:12:43 +03:00
Christer Warén	d5fefcdbbc	Removed commandAliases collection in messageCreate.js	2021-09-05 02:12:10 +03:00
Christer Warén	8860952c07	Bumb version	2021-09-04 14:18:58 +03:00
Christer Warén	d27cdf6ee5	Merge pull request #40 from warengroup/develop Version 0.3.3	2021-09-04 13:59:01 +03:00
Christer Warén	0d4c46cfd4	Fixed typo in bug.js	2021-09-04 13:56:05 +03:00
Christer Warén	9ef6b3f36f	Fixed bug command	2021-09-04 13:41:53 +03:00
Christer Warén	1a5caf244f	Ephemeral replies in nowplaying.js	2021-09-03 06:00:31 +03:00
Christer Warén	9040b84050	Bumb Version	2021-09-03 05:19:09 +03:00
Christer Warén	1518ff7809	Merge pull request #36 from warengroup/develop Version 0.3.2	2021-09-03 04:52:27 +03:00
Christer Warén	ba5b142bbe	Updated messageCreate event	2021-09-03 04:42:12 +03:00
Christer Warén	4ccace9450	Added station logo to now playing command	2021-09-03 04:34:02 +03:00
Christer Warén	711e6d48fb	Updated messages.js	2021-09-03 04:33:19 +03:00
Christer Warén	83cfec4678	Updated messages	2021-09-03 04:25:59 +03:00
Christer Warén	90f47825b6	Updated restoreradio.js	2021-09-03 04:06:46 +03:00
Christer Warén	b0270e651e	Updated restoreradio.js	2021-09-03 03:50:14 +03:00
Christer Warén	238a67c267	Updated SIGINT.js	2021-09-03 03:47:22 +03:00
Christer Warén	2e5f0a781a	Added station logo into thumbnail	2021-09-03 03:47:09 +03:00
Christer Warén	d9e57a47e9	Added empty image to make embeds same size	2021-09-03 03:46:44 +03:00
Christer Warén	13a085b9de	Updated SIGINT.js	2021-09-03 03:04:44 +03:00
Christer Warén	fddc57d90e	Updated SIGINT.js	2021-09-03 03:03:50 +03:00
Christer Warén	9d9ae80dbe	Updated ready.js	2021-09-03 03:03:19 +03:00
Christer Warén	314c744527	Remove slash commands when ending process in Dev bot	2021-09-03 02:45:42 +03:00
Christer Warén	555b4d14f0	Updated Dependencies	2021-09-03 02:45:04 +03:00
Christer Warén	0f4e0b952b	Merge pull request #34 from warengroup/develop Version 0.3.1	2021-09-03 01:55:50 +03:00
Christer Warén	3ec1892a09	Updated ready.js	2021-09-03 01:26:00 +03:00
Christer Warén	7d4fb50351	Update startTime when changing stations in play.js	2021-09-03 01:24:21 +03:00
Christer Warén	179914a2f2	Updated statisticsUpdate.js	2021-09-03 01:23:35 +03:00
Christer Warén	a8fc38ffca	Updated ready.js	2021-09-03 01:23:17 +03:00
Christer Warén	329986be53	Added restoreradio.js	2021-09-03 01:22:47 +03:00
Christer Warén	5ec4ea6aae	Updated SIGINT.js	2021-09-03 01:22:25 +03:00
Christer Warén	e546001be8	Added saveState & loadState functions	2021-09-03 01:21:55 +03:00
Christer Warén	f2158ba8ae	Updated datastore.js	2021-09-03 01:21:11 +03:00
Christer Warén	a1f85a0d19	Updated SIGINT.js	2021-09-02 19:25:04 +03:00
Christer Warén	430e0f9e51	Added SIGTERM event	2021-09-02 19:18:20 +03:00
Christer Warén	45b23722fa	Updated maintenance command	2021-09-02 18:58:23 +03:00
Christer Warén	66ace838c6	Remove unnecessary lines in SIGINT.js	2021-09-02 18:45:45 +03:00
Christer Warén	8e9546097f	Updated Client.ts	2021-09-02 18:18:37 +03:00
Christer Warén	61981a5b0b	Updated SIGINT event	2021-09-02 17:58:31 +03:00
Christer Warén	65f83bc522	Updated SIGINT event	2021-09-02 17:57:37 +03:00
Christer Warén	74239f71a7	Updated SIGINT event	2021-09-02 17:37:07 +03:00
Christer Warén	46237fd91e	Updated ready.js	2021-09-02 16:50:45 +03:00
Christer Warén	bf0811945a	Fixed statisticsUpdate in maintenance.js	2021-09-02 16:50:16 +03:00
Christer Warén	706e65bc06	Added SIGINT event	2021-09-02 16:50:01 +03:00
Christer Warén	12337f499b	Updated list command	2021-09-02 15:00:04 +03:00
Christer Warén	da71137f68	Updated stop.js	2021-09-02 14:40:55 +03:00
Christer Warén	45bd690c05	Updated logger function	2021-09-02 14:40:26 +03:00
Christer Warén	eba7551329	Edited loggers in ready.js	2021-09-02 14:40:12 +03:00
Christer Warén	fea24ec1aa	Edited message in play.js	2021-09-02 14:39:52 +03:00
Christer Warén	1fd6c2c691	Added messageDelete event	2021-09-02 14:39:23 +03:00
Christer Warén	492df398ff	Removed unnecessary messages in messages.js	2021-09-02 13:16:42 +03:00
Christer Warén	a1d4e356a6	Removed comment in interactionCreate.js	2021-09-02 13:12:52 +03:00
Christer Warén	c4fb1d5147	Updated interactionCreate & messageCreate events	2021-09-02 12:54:39 +03:00
Christer Warén	b6c47d7c6f	Updated messageCommandsDeprecatedDescription in messages.js	2021-09-02 12:49:08 +03:00
Christer Warén	5208a3feb1	Remove deprecation message after 30 seconds.	2021-09-02 12:11:16 +03:00
Christer Warén	8a10697edd	Adding deprecation message when using message commands.	2021-09-02 12:08:19 +03:00
Christer Warén	f786abebe4	Restoring capability to use messageCreate event.	2021-09-02 12:07:08 +03:00
Christer Warén	5e53a908e7	Removed prefix from code	2021-09-02 09:38:15 +03:00
Christer Warén	0d795a6efb	Added radio.message?.delete in voiceStateUpdate	2021-09-01 17:56:27 +03:00
Christer Warén	01514454bf	Updated Invite link	2021-09-01 17:55:28 +03:00
Christer Warén	3dd5b9d36e	Updated Dependencies	2021-09-01 17:55:03 +03:00