Merge pull request #36 from warengroup/develop

Version 0.3.2

.env_example

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

.github/workflows/typescript-build.yml

@@ -2,7 +2,6 @@ name: TypeScript Build
 
 on:
   push:
-  pull_request:
 
 jobs:
   tsc:
@@ -14,8 +13,6 @@ jobs:
       uses: actions/setup-node@v2.3.1
       with:
         node-version: 16
-    - name: npm install -g npm
-      run: npm install -g npm
     - name: npm install
       run: npm install
     - name: tsc

Dockerfile

@@ -10,8 +10,6 @@ WORKDIR /usr/src/app
 
 COPY / /usr/src/app/
 
-RUN npm install -g npm
-
 RUN npm install
 
 RUN npm run build

README.md

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

package-lock.json

@@ -1,15 +1,17 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.2.4",
+  "version": "0.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "eximiabots-radiox",
-      "version": "0.2.4",
+      "version": "0.3.2",
       "license": "MIT",
       "dependencies": {
+        "@discordjs/builders": "^0.6.0",
         "@discordjs/opus": "^0.6.0",
+        "@discordjs/rest": "^0.1.1-canary.0",
         "@discordjs/voice": "^0.6.0",
         "discord-api-types": "^0.22.0",
         "discord.js": "^13.1.0",
@@ -19,19 +21,19 @@
         "path": "^0.12.7"
       },
       "devDependencies": {
-        "@types/node": "^16.6.1",
+        "@types/node": "^16.7.8",
         "@types/ws": "^7.4.7",
-        "@typescript-eslint/eslint-plugin": "^4.29.2",
+        "@typescript-eslint/eslint-plugin": "^4.29.3",
-        "@typescript-eslint/parser": "^4.29.2",
+        "@typescript-eslint/parser": "^4.29.3",
         "eslint": "^7.32.0",
         "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-prettier": "^3.4.1",
+        "eslint-plugin-prettier": "^4.0.0",
         "nodemon": "^2.0.12",
         "prettier": "^2.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.2.1",
         "tsc-watch": "^4.5.0",
-        "typescript": "^4.3.5"
+        "typescript": "^4.4.2"
       },
       "engines": {
         "node": ">=16.6.0",
@@ -163,15 +165,15 @@
       }
     },
     "node_modules/@discordjs/builders": {
-      "version": "0.5.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
-      "integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
+      "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
       "dependencies": {
         "@sindresorhus/is": "^4.0.1",
         "discord-api-types": "^0.22.0",
         "ow": "^0.27.0",
         "ts-mixer": "^6.0.0",
-        "tslib": "^2.3.0"
+        "tslib": "^2.3.1"
       },
       "engines": {
         "node": ">=14.0.0",
@@ -231,6 +233,24 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@discordjs/rest": {
+      "version": "0.1.1-canary.0",
+      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.1-canary.0.tgz",
+      "integrity": "sha512-zUhGBok8eVJYkQjhOVTxVKwglQd0lElhkwCfvRus5xVD46zyz4h0UzoZFVpeAb9GNaAmEazcw/j/2s07DnQcnw==",
+      "dependencies": {
+        "@discordjs/collection": "^0.2.1",
+        "@sapphire/async-queue": "^1.1.4",
+        "@sapphire/snowflake": "^2.0.0",
+        "abort-controller": "^3.0.0",
+        "discord-api-types": "^0.22.0",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.1",
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/@discordjs/voice": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@@ -377,6 +397,15 @@
         "npm": ">=6"
       }
     },
+    "node_modules/@sapphire/snowflake": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-2.0.0.tgz",
+      "integrity": "sha512-gPSOQKmEWeuif2ftmW7gyToCnOoqpDqTSNrxX7HsoMwGNLtrT9p5DHcQolkBg5CEK3ooDFy5DNEFKUshQU7vyQ==",
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
     "node_modules/@sindresorhus/is": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@@ -431,9 +460,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.7.8",
+      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
     },
     "node_modules/@types/ws": {
       "version": "7.4.7",
@@ -604,6 +633,17 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -757,12 +797,15 @@
       "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
     },
     "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "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": {
@@ -1118,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",
@@ -1273,6 +1311,22 @@
         "npm": ">=7.0.0"
       }
     },
+    "node_modules/discord.js/node_modules/@discordjs/builders": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
+      "integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.1",
+        "discord-api-types": "^0.22.0",
+        "ow": "^0.27.0",
+        "ts-mixer": "^6.0.0",
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=14.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1437,9 +1491,9 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "3.4.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0"
@@ -1448,8 +1502,8 @@
         "node": ">=6.0.0"
       },
       "peerDependencies": {
-        "eslint": ">=5.0.0",
+        "eslint": ">=7.28.0",
-        "prettier": ">=1.13.0"
+        "prettier": ">=2.0.0"
       },
       "peerDependenciesMeta": {
         "eslint-config-prettier": {
@@ -1632,6 +1686,14 @@
         "through": "~2.3.1"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1724,6 +1786,19 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
@@ -2169,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",
@@ -2573,11 +2643,11 @@
       }
     },
     "node_modules/npmlog": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ==",
+      "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"
@@ -2797,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",
@@ -2908,17 +2973,16 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "2.3.7",
+      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dependencies": {
-        "core-util-is": "~1.0.0",
+        "inherits": "^2.0.3",
-        "inherits": "~2.0.3",
+        "string_decoder": "^1.1.1",
-        "isarray": "~1.0.0",
+        "util-deprecate": "^1.0.1"
-        "process-nextick-args": "~2.0.0",
+      },
-        "safe-buffer": "~5.1.1",
+      "engines": {
-        "string_decoder": "~1.1.1",
+        "node": ">= 6"
-        "util-deprecate": "~1.0.1"
       }
     },
     "node_modules/readdirp": {
@@ -3044,9 +3108,23 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
+      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "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",
@@ -3177,11 +3255,11 @@
       }
     },
     "node_modules/string_decoder": {
-      "version": "1.1.1",
+      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/string-argv": {
@@ -3940,15 +4018,15 @@
       }
     },
     "@discordjs/builders": {
-      "version": "0.5.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
-      "integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
+      "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
       "requires": {
         "@sindresorhus/is": "^4.0.1",
         "discord-api-types": "^0.22.0",
         "ow": "^0.27.0",
         "ts-mixer": "^6.0.0",
-        "tslib": "^2.3.0"
+        "tslib": "^2.3.1"
       }
     },
     "@discordjs/collection": {
@@ -3991,6 +4069,21 @@
         "node-addon-api": "^4.0.0"
       }
     },
+    "@discordjs/rest": {
+      "version": "0.1.1-canary.0",
+      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.1-canary.0.tgz",
+      "integrity": "sha512-zUhGBok8eVJYkQjhOVTxVKwglQd0lElhkwCfvRus5xVD46zyz4h0UzoZFVpeAb9GNaAmEazcw/j/2s07DnQcnw==",
+      "requires": {
+        "@discordjs/collection": "^0.2.1",
+        "@sapphire/async-queue": "^1.1.4",
+        "@sapphire/snowflake": "^2.0.0",
+        "abort-controller": "^3.0.0",
+        "discord-api-types": "^0.22.0",
+        "form-data": "^4.0.0",
+        "node-fetch": "^2.6.1",
+        "tslib": "^2.3.0"
+      }
+    },
     "@discordjs/voice": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@@ -4094,6 +4187,11 @@
       "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.4.tgz",
       "integrity": "sha512-fFrlF/uWpGOX5djw5Mu2Hnnrunao75WGey0sP0J3jnhmrJ5TAPzHYOmytD5iN/+pMxS+f+u/gezqHa9tPhRHEA=="
     },
+    "@sapphire/snowflake": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-2.0.0.tgz",
+      "integrity": "sha512-gPSOQKmEWeuif2ftmW7gyToCnOoqpDqTSNrxX7HsoMwGNLtrT9p5DHcQolkBg5CEK3ooDFy5DNEFKUshQU7vyQ=="
+    },
     "@sindresorhus/is": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@@ -4139,9 +4237,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.7.8",
+      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg=="
+      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
     },
     "@types/ws": {
       "version": "7.4.7",
@@ -4238,6 +4336,14 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -4351,12 +4457,12 @@
       "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
     },
     "are-we-there-yet": {
-      "version": "1.1.5",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
       "requires": {
         "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "readable-stream": "^3.6.0"
       }
     },
     "arg": {
@@ -4635,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",
@@ -4746,6 +4847,20 @@
         "discord-api-types": "^0.22.0",
         "node-fetch": "^2.6.1",
         "ws": "^7.5.1"
+      },
+      "dependencies": {
+        "@discordjs/builders": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
+          "integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
+          "requires": {
+            "@sindresorhus/is": "^4.0.1",
+            "discord-api-types": "^0.22.0",
+            "ow": "^0.27.0",
+            "ts-mixer": "^6.0.0",
+            "tslib": "^2.3.0"
+          }
+        }
       }
     },
     "doctrine": {
@@ -4893,9 +5008,9 @@
       "requires": {}
     },
     "eslint-plugin-prettier": {
-      "version": "3.4.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
@@ -5012,6 +5127,11 @@
         "through": "~2.3.1"
       }
     },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5092,6 +5212,16 @@
       "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
       "dev": true
     },
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
     "from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
@@ -5428,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",
@@ -5747,11 +5872,11 @@
       "dev": true
     },
     "npmlog": {
-      "version": "5.0.0",
+      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ==",
+      "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"
@@ -5912,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",
@@ -5990,17 +6110,13 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
+      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "requires": {
-        "core-util-is": "~1.0.0",
+        "inherits": "^2.0.3",
-        "inherits": "~2.0.3",
+        "string_decoder": "^1.1.1",
-        "isarray": "~1.0.0",
+        "util-deprecate": "^1.0.1"
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -6081,9 +6197,9 @@
       }
     },
     "safe-buffer": {
-      "version": "5.1.2",
+      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "semver": {
       "version": "7.3.5",
@@ -6185,11 +6301,11 @@
       }
     },
     "string_decoder": {
-      "version": "1.1.1",
+      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
       }
     },
     "string-argv": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.2.4",
+  "version": "0.3.2",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,9 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
+    "@discordjs/builders": "^0.6.0",
     "@discordjs/opus": "^0.6.0",
+    "@discordjs/rest": "^0.1.1-canary.0",
     "@discordjs/voice": "^0.6.0",
     "discord-api-types": "^0.22.0",
     "discord.js": "^13.1.0",
@@ -28,19 +30,19 @@
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.6.1",
+    "@types/node": "^16.7.8",
     "@types/ws": "^7.4.7",
-    "@typescript-eslint/eslint-plugin": "^4.29.2",
+    "@typescript-eslint/eslint-plugin": "^4.29.3",
-    "@typescript-eslint/parser": "^4.29.2",
+    "@typescript-eslint/parser": "^4.29.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.12",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.2.1",
     "tsc-watch": "^4.5.0",
-    "typescript": "^4.3.5"
+    "typescript": "^4.4.2"
   },
   "engines": {
       "node": ">=16.6.0",

src/Client.ts

@@ -1,11 +1,12 @@
 import Discord, { Client, Collection } from "discord.js";
 import fs from "fs";
-const events = "./client/events/";
 import Datastore from "./client/datastore.js";
 import { command, radio } from "./client/utils/typings.js";
 import config from "./config.js";
 import messages from "./client/messages.js";
-import path from "path"
+import path from "path";
+
+const events = "./client/events/";
 
 const GatewayIntents = new Discord.Intents();
 GatewayIntents.add(
@@ -16,7 +17,6 @@ GatewayIntents.add(
 
 class RadioClient extends Client {
     readonly commands: Collection<string, command>;
-    readonly commandAliases: Collection<string, command>;
     readonly radio: Map<string, radio>;
     public funcs: any;
     readonly config = config;
@@ -27,7 +27,6 @@ class RadioClient extends Client {
             intents: GatewayIntents
         });
         this.commands = new Collection();
-        this.commandAliases = new Collection();
         this.radio = new Map();
         this.datastore = null;
 
@@ -35,27 +34,53 @@ class RadioClient extends Client {
         this.funcs.check = require("./client/funcs/check.js");
         this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js");
         this.funcs.isDev = require("./client/funcs/isDev.js");
+        this.funcs.logger = require("./client/funcs/logger.js");
         this.funcs.msToTime = require("./client/funcs/msToTime.js");
         this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
+        this.funcs.saveState = require("./client/funcs/saveState.js");
+        this.funcs.loadState = require("./client/funcs/loadState.js");
+
+        console.log('RadioX ' + this.config.version);
+        console.log('Internet Radio to your Discord guild');
+        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        console.log('');
+
+        this.funcs.logger("Bot", "Starting");
 
         const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
         for (const file of commandFiles) {
             const command = require(`./client/commands/${file}`);
-            command.uses = 0;
             this.commands.set(command.name, command);
-            this.commandAliases.set(command.alias, command);
         }
 
         this.on("ready", () => {
-            require(`${events}ready`).execute(this, Discord);
+            require(`${events}ready`).execute(this);
-            this.datastore = new Datastore();
         });
+
         this.on("messageCreate", msg => {
-            require(`${events}msg`).execute(this, msg, Discord);
+            require(`${events}messageCreate`).execute(this, msg);
         });
+
+        this.on("messageDelete", msg => {
+            require(`${events}messageDelete`).execute(this, msg);
+        });
+
+        this.on("interactionCreate", interaction => {
+            require(`${events}interactionCreate`).execute(this, interaction);
+        });
+        
         this.on("voiceStateUpdate", (oldState, newState) => {
             require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
         });
+        
+        process.on('SIGINT', () => {
+            require(`${events}SIGINT`).execute(this);
+        });
+
+        process.on('SIGTERM', () => {
+            require(`${events}SIGTERM`).execute(this);
+        });
+        
         this.on("error", error => {
             console.error(error);
         });

src/client/commands.js

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

src/client/commands/bug.js

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

src/client/commands/help.js

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

src/client/commands/invite.js

@@ -5,14 +5,19 @@ module.exports = {
     description: 'Invite Bot',
     permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client, Discord, command) {
         let message = {};
         message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
         const embed = new Discord.MessageEmbed()
             .setTitle(message.inviteTitle)
             .setColor(client.config.embedColor)
-            .setURL("https://discordapp.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=3427328&scope=bot")
+            .setURL("https://discord.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
+            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/list.js

@@ -2,27 +2,81 @@ module.exports = {
     name: 'list',
     alias: 'l',
     usage: '',
-    description: 'List radio stations.',
+    description: 'List radio stations',
     permission: 'none',
     category: 'radio',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client, Discord, command) {
         let message = {};
-		if(!client.stations) {
+        if(!client.stations) {
-			message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-			return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-		}
-        let 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){
+            let menu = [];
 
-        const embed = new Discord.MessageEmbed()
+            let stations = new Array();
-            .setTitle(client.messages.listTitle)
+
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
+            let options = new Array();
-            .setColor(client.config.embedColor)
+            options[1] = new Array();
-            .setDescription(stations)
+            options[2] = new Array();
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
-        return msg.channel.send({ embeds: [embed] });
+            stations[1] = client.stations.slice(0,24).forEach(station => {
+                station = {
+                    label: station.name,
+                    description: station.owner,
+                    value: station.name
+                };
+                options[1].push(station);
+            });
+
+            stations[2] = client.stations.slice(25).forEach(station => {
+                station = {
+                    label: station.name,
+                    description: station.owner,
+                    value: station.name
+                };
+                options[2].push(station);
+            });
+
+            menu = new Discord.MessageActionRow()
+                .addComponents(
+                    new Discord.MessageSelectMenu()
+                        .setCustomId('play')
+                        .setPlaceholder('Change station')
+                        .addOptions(options[1])
+                        .addOptions(options[2])
+                );
+
+            stations = null;
+            options = null;
+
+            interaction.reply({
+                content: '**Select station:**',
+                components: [menu],
+                ephemeral: true
+            });
+        } else {
+            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
+            const hashs = stations.split('**#**').length;
+            for (let i = 0; i < hashs; i++) {
+                stations = stations.replace('**#**', `**${i + 1}.**`);
+            }
+
+            let embed = new Discord.MessageEmbed()
+                .setTitle(client.messages.listTitle)
+                .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
+                .setColor(client.config.embedColor)
+                .setDescription(stations)
+                .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+
+            interaction.reply({
+                embeds: [embed],
+                ephemeral: true
+            });
+        }
     }
 };

src/client/commands/maintenance.js

@@ -5,14 +5,14 @@ module.exports = {
     description: 'Bot Maintenance',
     permission: 'none',
     category: 'info',
-    execute(msg, args, client, Discord, command) {
+    execute(interaction, client, Discord, command) {
         let message = {};
 
-        if(!client.funcs.isDev(client.config.devId, msg.author.id)) return msg.channel.send(client.messageEmojis["error"] + client.messages.notAllowed);
+        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply(client.messageEmojis["error"] + client.messages.notAllowed);
 
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
         }
         
         let currentRadios = client.radio.keys();
@@ -26,18 +26,12 @@ module.exports = {
             currentRadio.guild = client.datastore.getEntry(radio.value).guild;
 
             if(currentRadio){
-                client.funcs.statisticsUpdate(client, currentRadio.currentGuild.guild, currentRadio);
+                client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
-                currentRadio.connection.destroy();
+                currentRadio.connection?.destroy();
-                currentRadio.audioPlayer.stop();
+                currentRadio.audioPlayer?.stop();
-                const cembed = new Discord.MessageEmbed()
+                currentRadio.message?.delete();
-                    .setTitle(client.messages.maintenanceTitle)
-                    .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
-                    .setColor(client.config.embedColor)
-                    .setDescription(client.messages.sendedMaintenanceMessage)
-                    .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-                currentRadio.textChannel.send({ embeds: [cembed] });
                 client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.currentGuild.guild.name + "\n";
+                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
             }
             radio = currentRadios.next();
         }
@@ -47,7 +41,12 @@ module.exports = {
         .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
         .setColor(client.config.embedColor)
         .setDescription("Stopped all radios" + "\n" + stoppedRadios)
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
         .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-        return msg.channel.send({ embeds: [embed] });
+
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/nowplaying.js

@@ -5,26 +5,35 @@ module.exports = {
     description: 'Current Radio Station',
     permission: 'none',
     category: 'radio',
-    async execute(msg, args, client, Discord, command) {
+    async execute(interaction, client, Discord, command) {
         let message = {};
-        const radio = client.radio.get(msg.guild.id);
+        const radio = client.radio.get(interaction.guild.id);
-        if (!radio) return msg.channel.send('There is nothing playing.');
+        if (!radio) return interaction.reply('There is nothing playing.');
-		if(!client.stations) {
+        if(!client.stations) {
-			message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-			return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-		}
+        }
-        const completed = (radio.connection.dispatcher.streamTime.toFixed(0));
+
+        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, \"hh:mm:ss\")%", client.funcs.msToTime(completed, "hh:mm:ss"));
+        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, ''))
+            .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, ''));
-        return msg.channel.send({ embeds: [embed] });
+        
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
     }
 };

src/client/commands/play.js

@@ -9,88 +9,152 @@ module.exports = {
     name: "play",
     alias: "p",
     usage: "<song name>",
-    description: "Play some music.",
+    description: "Play radio",
+    options: [
+        { type: "STRING", name: "query", description: "Select station", required: false}
+    ],
     permission: "none",
     category: "radio",
-    async execute(msg, args, client, Discord, command) {
+    async execute(interaction, client, Discord, command) {
         let message = {};
-        let url = args[1] ? args[1].replace(/<(.+)>/g, "$1") : "";
+        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
-        const radio = client.radio.get(msg.guild.id);
+        if(!query){
-        const voiceChannel = msg.member.voice.channel;
+            if(!client.stations) {
-        if (!radio) {
+                message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            if (!msg.member.voice.channel)
+                return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-                return msg.channel.send(
+            }
-                    client.messageEmojis["error"] + client.messages.noVoiceChannel
+
+            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
+            });
+        }
+        let url = query ? query.replace(/<(.+)>/g, "$1") : "";
+        const radio = client.radio.get(interaction.guild.id);
+        const voiceChannel = interaction.member.voice.channel;
+        if (!radio) {
+            if (!interaction.member.voice.channel)
+                return interaction.reply({
+                    content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
+                    ephemeral: true
+                });
         } else {
             if (voiceChannel !== radio.voiceChannel)
-                return msg.channel.send(
+                return interaction.reply({
-                    client.messageEmojis["error"] + client.messages.wrongVoiceChannel
+                    content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
-                );
+                    ephemeral: true
+                });
         }
         if (!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace(
                 "%client.config.supportGuild%",
                 client.config.supportGuild
             );
-            return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
-        if (!args[1]) return msg.channel.send(client.messages.noQuery);
+        if (!query) return interaction.reply(client.messages.noQuery);
-        const permissions = voiceChannel.permissionsFor(msg.client.user);
+        const permissions = voiceChannel.permissionsFor(interaction.client.user);
         if (!permissions.has("CONNECT")) {
-            return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsConnect);
+            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsConnect);
         }
         if (!permissions.has("SPEAK")) {
-            return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsSpeak);
+            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsSpeak);
         }
         let station;
-        const number = parseInt(args[1] - 1);
+        const number = parseInt(query - 1);
         if (url.startsWith("http")) {
-            return msg.channel.send(
+            return interaction.reply({
-                client.messageEmojis["error"] + client.messages.errorStationURL
+                content: client.messageEmojis["error"] + client.messages.errorStationURL,
-            );
+                ephemeral: true
+            });
         } else if (!isNaN(number)) {
             if (number > client.stations.length - 1) {
-                return msg.channel.send(
+                return interaction.reply({
-                    client.messageEmojis["error"] + client.messages.wrongStationNumber
+                    content: client.messageEmojis["error"] + client.messages.wrongStationNumber,
-                );
+                    ephemeral: true
+                });
             } else {
                 url = client.stations[number].stream[client.stations[number].stream.default];
                 station = client.stations[number];
             }
         } else {
-            if (args[1].length < 3)
+            if (query.length < 3)
-                return msg.channel.send(
+                return interaction.reply({
-                    client.messageEmojis["error"] + client.messages.tooShortSearch
+                    content: client.messageEmojis["error"] + client.messages.tooShortSearch,
-                );
+                    ephemeral: true
-            const sstation = await searchStation(args.slice(1).join(" "), client);
+                });
+            const sstation = await searchStation(query, client);
             if (!sstation)
-                return msg.channel.send(
+                return interaction.reply({
-                    client.messageEmojis["error"] + client.messages.noSearchResults
+                    content: client.messageEmojis["error"] + client.messages.noSearchResults,
-                );
+                    ephemeral: true
+                });
             url = sstation.stream[sstation.stream.default];
             station = sstation;
         }
 
         if (radio) {
-            client.funcs.statisticsUpdate(client, msg.guild, radio);
+            client.funcs.statisticsUpdate(client, interaction.guild, radio);
             radio.audioPlayer.stop();
             
+            let date = new Date();
             radio.station = station;
-            radio.textChannel = msg.channel;
+            radio.textChannel = interaction.channel;
-            play(msg.guild, client, url);
+            radio.startTime = date.getTime();
+            play(interaction, interaction.guild, client, url, Discord);
 
             return;
         }
 
         const construct = {
-            textChannel: msg.channel,
+            textChannel: interaction.channel,
             voiceChannel: voiceChannel,
             connection: null,
+            message: null,
             audioPlayer: createAudioPlayer(),
             station: station
         };
-        client.radio.set(msg.guild.id, construct);
+        client.radio.set(interaction.guild.id, construct);
 
         try {
             const connection =
@@ -103,25 +167,26 @@ module.exports = {
             construct.connection = connection;
             let date = new Date();
             construct.startTime = date.getTime();
-            play(msg.guild, client, url);
+            play(interaction, interaction.guild, client, url, Discord);
 
-            client.datastore.checkEntry(msg.guild.id);
+            client.datastore.checkEntry(interaction.guild.id);
-            construct.currentGuild = client.datastore.getEntry(msg.guild.id);
+            construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
 
             if (!construct.currentGuild.statistics[construct.station.name]) {
                 construct.currentGuild.statistics[construct.station.name] = {};
                 construct.currentGuild.statistics[construct.station.name].time = 0;
                 construct.currentGuild.statistics[construct.station.name].used = 0;
-                client.datastore.updateEntry(msg.guild, construct.currentGuild);
+                client.datastore.updateEntry(interaction.guild, construct.currentGuild);
             }
         } catch (error) {
             console.log(error);
-            client.radio.delete(msg.guild.id);
+            client.radio.delete(interaction.guild.id);
-            return msg.channel.send(client.messageEmojis["error"] + `An error occured: ${error}`);
+            return interaction.reply(client.messageEmojis["error"] + `An error occured: ${error}`);
         }
     }
 };
-function play(guild, client, url) {
+
+async function play(interaction, guild, client, url, Discord) {
     let message = {};
     const radio = client.radio.get(guild.id);
     const resource = createAudioResource(url);
@@ -129,24 +194,87 @@ function play(guild, client, url) {
     radio.audioPlayer.play(resource);
     resource.playStream
         .on("readable", () => {
-            console.log("Stream started");
+            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
         })
         .on("finish", () => {
-            console.log("Stream finished");
+            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
             client.funcs.statisticsUpdate(client, guild, radio);
-            radio.connection.destroy();
+            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.connection?.destroy();
+            radio.audioPlayer?.stop();
             client.radio.delete(guild.id);
-            return radio.textChannel.send(client.messages.errorPlaying);
+            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')
+                .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);
-    radio.textChannel.send(client.messageEmojis["play"] + message.play);
+    
+    interaction.reply({
+        content: client.messageEmojis["play"] + message.play,
+        ephemeral: true
+    });
+    
 }
 
 function searchStation(key, client) {
@@ -154,6 +282,15 @@ function searchStation(key, client) {
     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++) {

src/client/commands/statistics.js

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

src/client/commands/status.js

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

src/client/commands/stop.js

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

src/client/datastore.js

@@ -80,6 +80,7 @@ module.exports = class {
         newData.guild = {};
         newData.guild.id = id;
         newData.statistics = {};
+        newData.state = {};
         this.map.set(id, newData);
         this.saveEntry(id, newData);
     }
@@ -90,6 +91,10 @@ module.exports = class {
     
     updateEntry(guild, newData) {
         newData.guild.name = guild.name;
+
+        let date = new Date();
+        newData.updated = date.toISOString().substring(0, 10)
+        
         this.map.set(guild.id, newData);
         this.saveEntry(guild.id, newData);
         //this.showEntry(this.getEntry(guild.id));
@@ -110,6 +115,9 @@ module.exports = class {
                     "time": 0,
                     "used": 0
                 }
+            },
+            "state": {
+
             }
         }
         
@@ -118,7 +126,7 @@ module.exports = class {
     
     saveEntry(file, data) {
         data = JSON.stringify(data, null, 4);
-        
+
         fs.writeFile(path.join(path.dirname(__dirname), '../datastore') + "/" + file + ".json", data, 'utf8', function(err) {
             if (err) {
                 //console.log(err);

src/client/emojis.js

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

src/client/events/SIGINT.js

@@ -0,0 +1,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);
+    }
+}

src/client/events/SIGTERM.js

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

src/client/events/interactionCreate.js

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

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)) || client.commandAliases.get(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);
+        }
+    }
+}

src/client/events/messageDelete.js

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

src/client/events/msg.js

@@ -1,27 +0,0 @@
-module.exports = {
-    name: 'message',
-    async execute(client, msg, Discord) {
-        if (msg.author.bot || !msg.guild) return;
-        let prefix = client.config.prefix;
-        if(msg.mentions.members.first()){
-            if(msg.mentions.members.first().user.id === client.user.id){
-                prefix = "<@!" + client.user.id + "> ";
-            }
-        }
-        const args = msg.content.slice(prefix.length).split(' ');
-        if (!msg.content.startsWith(prefix)) return;
-        if (!args[0]) return;
-        const commandName = args[0].toLowerCase();
-        if (commandName === 'none') return;
-        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
-        if (!command && msg.content !== `${prefix}`) return;
-        const permissions = msg.channel.permissionsFor(msg.client.user);
-        if (!permissions.has('EMBED_LINKS')) return msg.channel.send(client.messages.noPermsEmbed);
-        try {
-            command.execute(msg, args, client, Discord, command);
-        } catch (error) {
-            msg.reply(client.messages.runningCommandFailed);
-            console.error(error);
-        }
-    }
-}

src/client/events/ready.js

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

src/client/events/voiceStateUpdate.js

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

src/client/funcs/check.js

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

src/client/funcs/loadState.js

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

src/client/funcs/logger.js

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

src/client/funcs/msToTime.js

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

src/client/funcs/saveState.js

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

src/client/funcs/statisticsUpdate.js

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

src/client/messages.js

@@ -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, \"hh:mm:ss\")%",
+    nowplayingDescription: "**%radio.station.name%**" + "\n" + "Owner: %radio.station.owner%" + "\n" + "%client.funcs.msToTime(completed)%",
     noVoiceChannel: "You need to be in a voice channel to play radio!",
     noQuery: "You need to use a number or search for a supported station!",
     noPermsConnect: "I cannot connect to your voice channel.",
@@ -36,5 +34,7 @@ module.exports = {
     statusField3: "Uptime",
     statusField4: "Version",
     statusField5: "Hosted by",
-    errorStationURL: "Station can't be URL"
+    errorStationURL: "Station can't be URL",
+    messageCommandsDeprecatedTitle: "%client.user.username%",
+    messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
 };

src/client/restoreradio.js

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

src/config.js

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