Merge pull request #53 from warengroup/develop

Version 0.3.7

.github/dependabot.yml

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

.github/labeler.yml

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

.github/workflows/codeql-analyze.yml

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

.github/workflows/docker-build.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1.5.1
+      uses: docker/setup-buildx-action@v1.6.0
       id: buildx
       with:
         install: true

.github/workflows/labeler.yml

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

.github/workflows/typescript-build.yml

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

README.md

@@ -5,7 +5,7 @@ Internet Radio to your Discord guild
 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.
 
 ## Docker
-1. `docker build -t warengroup/eximiabots-radiox .`
+1. `docker build -t warengroup/eximiabots-radiox . --pull`
 2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`
 
 ## Join our Discord Server

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.3",
+  "version": "0.3.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "eximiabots-radiox",
-      "version": "0.3.3",
+      "version": "0.3.7",
       "license": "MIT",
       "dependencies": {
         "@discordjs/builders": "^0.6.0",
@@ -17,14 +17,14 @@
         "discord.js": "^13.1.0",
         "dotenv": "^10.0.0",
         "libsodium-wrappers": "^0.7.9",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.2",
         "path": "^0.12.7"
       },
       "devDependencies": {
-        "@types/node": "^16.7.8",
+        "@types/node": "^16.7.13",
         "@types/ws": "^7.4.7",
-        "@typescript-eslint/eslint-plugin": "^4.29.3",
+        "@typescript-eslint/eslint-plugin": "^4.31.0",
-        "@typescript-eslint/parser": "^4.29.3",
+        "@typescript-eslint/parser": "^4.31.0",
         "eslint": "^7.32.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-prettier": "^4.0.0",
@@ -36,7 +36,7 @@
         "typescript": "^4.4.2"
       },
       "engines": {
-        "node": ">=16.6.0",
+        "node": ">=16.8.0",
         "npm": ">=7.0.0"
       }
     },
@@ -460,9 +460,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.7.10",
+      "version": "16.7.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
-      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
+      "integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
     },
     "node_modules/@types/ws": {
       "version": "7.4.7",
@@ -473,13 +473,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz",
-      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
+      "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -504,15 +504,15 @@
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz",
-      "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+      "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/typescript-estree": "4.31.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -528,14 +528,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz",
-      "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
+      "integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/typescript-estree": "4.31.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -555,13 +555,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz",
-      "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
+      "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/visitor-keys": "4.30.0"
+        "@typescript-eslint/visitor-keys": "4.31.0"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -572,9 +572,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz",
-      "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+      "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -585,13 +585,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz",
-      "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
+      "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/visitor-keys": "4.30.0",
+        "@typescript-eslint/visitor-keys": "4.31.0",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -612,12 +612,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz",
-      "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
+      "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -666,9 +666,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.1.1",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -1228,9 +1228,9 @@
       }
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
+      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "node_modules/defer-to-connect": {
@@ -2535,9 +2535,9 @@
       "dev": true
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
+      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
       "engines": {
         "node": "4.x || >=6.0.0"
       }
@@ -3549,9 +3549,9 @@
       }
     },
     "node_modules/ts-node/node_modules/acorn": {
-      "version": "8.4.1",
+      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -4237,9 +4237,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.7.10",
+      "version": "16.7.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
-      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
+      "integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
     },
     "@types/ws": {
       "version": "7.4.7",
@@ -4250,13 +4250,13 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz",
-      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
+      "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -4265,55 +4265,55 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz",
-      "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+      "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/typescript-estree": "4.31.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz",
-      "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
+      "integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.0",
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/typescript-estree": "4.31.0",
         "debug": "^4.3.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz",
-      "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
+      "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/visitor-keys": "4.30.0"
+        "@typescript-eslint/visitor-keys": "4.31.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz",
-      "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+      "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz",
-      "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
+      "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
-        "@typescript-eslint/visitor-keys": "4.30.0",
+        "@typescript-eslint/visitor-keys": "4.31.0",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -4322,12 +4322,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.30.0",
+      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz",
-      "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
+      "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.0",
         "eslint-visitor-keys": "^2.0.0"
       }
     },
@@ -4358,9 +4358,9 @@
       "requires": {}
     },
     "acorn-walk": {
-      "version": "8.1.1",
+      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true
     },
     "agent-base": {
@@ -4788,9 +4788,9 @@
       "dev": true
     },
     "deep-is": {
-      "version": "0.1.3",
+      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "defer-to-connect": {
@@ -5797,9 +5797,9 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.1",
+      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
     },
     "nodemon": {
       "version": "2.0.12",
@@ -6516,9 +6516,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.4.1",
+          "version": "8.5.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-          "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+          "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
           "dev": true
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.3",
+  "version": "0.3.7",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -26,14 +26,14 @@
     "discord.js": "^13.1.0",
     "dotenv": "^10.0.0",
     "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.2",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.7.8",
+    "@types/node": "^16.7.13",
     "@types/ws": "^7.4.7",
-    "@typescript-eslint/eslint-plugin": "^4.29.3",
+    "@typescript-eslint/eslint-plugin": "^4.31.0",
-    "@typescript-eslint/parser": "^4.29.3",
+    "@typescript-eslint/parser": "^4.31.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -45,7 +45,7 @@
     "typescript": "^4.4.2"
   },
   "engines": {
-      "node": ">=16.6.0",
+      "node": ">=16.8.0",
       "npm": ">=7.0.0"
   }
 }

src/Client.ts

@@ -39,6 +39,11 @@ class RadioClient extends Client {
         this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
         this.funcs.saveState = require("./client/funcs/saveState.js");
         this.funcs.loadState = require("./client/funcs/loadState.js");
+        this.funcs.searchStation = require("./client/funcs/searchStation.js");
+        this.funcs.play = require("./client/funcs/play.js");
+        this.funcs.listStations = require("./client/funcs/listStations.js");
+        this.funcs.restoreRadios = require("./client/funcs/restoreRadios.js");
+        this.funcs.saveRadios = require("./client/funcs/saveRadios.js");
 
         console.log('RadioX ' + this.config.version);
         console.log('Internet Radio to your Discord guild');
@@ -80,6 +85,10 @@ class RadioClient extends Client {
         process.on('SIGTERM', () => {
             require(`${events}SIGTERM`).execute(this);
         });
+
+        process.on('uncaughtException', (error) => {
+            require(`${events}uncaughtException`).execute(this, error);
+        });
         
         this.on("error", error => {
             console.error(error);

src/client/commands.js

@@ -20,6 +20,7 @@ module.exports = {
             if(command.options) {
                 command.options.forEach(function(option) {
                     if(option.type == "STRING") option.type = 3;
+                    if(option.type == "NUMBER") option.type = 10;
                     command.data.options.push(option);
                 });
             }
@@ -44,16 +45,18 @@ module.exports = {
                         try {
                             await rest.put(
                                 Routes.applicationGuildCommands(client.user.id, guild.id),
-                                { body: commands },
+                                { body: commands }
                             );
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Successful' + "\n" + guild.id + " / " + guild.name);
                         } catch (DiscordAPIError) {
-
+                            client.funcs.logger('Slash Commands', 'Guild Applications – Failed' + "\n" + guild.id + " / " + guild.name);
+                            if(DiscordAPIError.name != "DiscordAPIError[50001]") console.error(DiscordAPIError.message + "\n\n");
                         }
                     });
                 } else {
                     await rest.put(
                         Routes.applicationCommands(client.user.id),
-                        { body: commands },
+                        { body: commands }
                     );
                 }
 

src/client/commands/bug.js

@@ -1,11 +1,10 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'bug',
-    alias: 'none',
-    usage: '',
     description: 'Report a bug',
-    permission: 'none',
     category: 'info',
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
 
         message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);

src/client/commands/help.js

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

src/client/commands/invite.js

@@ -1,11 +1,10 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'invite',
-    alias: 'i',
-    usage: '',
     description: 'Invite Bot',
-    permission: 'none',
     category: 'info',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
         message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
         const embed = new Discord.MessageEmbed()

src/client/commands/list.js

@@ -1,63 +1,23 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'list',
-    alias: 'l',
-    usage: '',
     description: 'List radio stations',
-    permission: 'none',
     category: 'radio',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
         
         const radio = client.radio.get(interaction.guild.id);
         
         if(radio){
-            let menu = [];
+            client.funcs.listStations(client, interaction);
-
-            let stations = new Array();
-
-            let options = new Array();
-            options[1] = new Array();
-            options[2] = new Array();
-
-            stations[1] = client.stations.slice(0,24).forEach(station => {
-                station = {
-                    label: station.name,
-                    description: station.owner,
-                    value: station.name
-                };
-                options[1].push(station);
-            });
-
-            stations[2] = client.stations.slice(25).forEach(station => {
-                station = {
-                    label: station.name,
-                    description: station.owner,
-                    value: station.name
-                };
-                options[2].push(station);
-            });
-
-            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;

src/client/commands/maintenance.js

@@ -1,15 +1,139 @@
+import Discord from "discord.js";
+import fetch from "node-fetch";
+
 module.exports = {
     name: 'maintenance',
-    alias: 'm',
-    usage: '',
     description: 'Bot Maintenance',
-    permission: 'none',
     category: 'info',
-    execute(interaction, client, Discord, command) {
+    options: [
+        { type: "NUMBER", name: "action", description: "Select action", required: false}
+    ],
+    async execute(interaction, client) {
         let message = {};
 
-        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply(client.messageEmojis["error"] + client.messages.notAllowed);
+        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.notAllowed,
+            ephemeral: true
+        });
+        let action = interaction.options?.getNumber("action") ?? interaction.values?.[0];
+        const options = new Array(
+            {
+                emoji: "🌀",
+                label: "Restart Bot",
+                description: "",
+                value: "0"
+            },
+            {
+                emoji: "<:RadioXStop:688541155377414168>",
+                label: "Save Radios",
+                description: "",
+                value: "4"
+            },
+            {
+                emoji: "<:RadioXPlay:688541155712827458>",
+                label: "Restore Radios",
+                description: "",
+                value: "5"
+            },
+            {
+                emoji: "#️⃣",
+                label: "Reload Commands",
+                description: "",
+                value: "6"
+            },
+            {
+                emoji: "<:RadioXList:688541155519889482>",
+                label: "Reload Stations",
+                description: "",
+                value: "7"
+            },
+            {
+                emoji: "<:dnd:746069698139127831>",
+                label: "Enable Maintenance Mode",
+                description: "",
+                value: "8"
+            },
+            {
+                emoji: "<:online:746069731836035098>",
+                label: "Disable Maintenance Mode",
+                description: "",
+                value: "9"
+            }
+        );
+        
+        const menu = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageSelectMenu()
+                .setCustomId('maintenance')
+                .setPlaceholder('Select action')
+                .addOptions(options)
+        );
 
+        if(!action){
+            return interaction.reply({
+                content: "**" + client.messages.maintenanceTitle + "**",
+                components: [menu],
+                ephemeral: true
+            });
+        }
+
+        client.funcs.logger('Maintenance', options.find(option => option.value == action).label);
+
+        const embed = new Discord.MessageEmbed()
+            .setTitle(client.messages.maintenanceTitle)
+            .setColor(client.config.embedColor)
+            .setDescription(options.find(option => option.value == action).label)
+            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+        
+        interaction.reply({
+            embeds: [embed],
+            ephemeral: true
+        });
+
+        switch(action){
+            case "0":
+                process.emit('SIGINT');
+                break;
+            case "4":
+                client.user.setStatus('idle');
+                client.funcs.saveRadios(client);
+                client.user.setStatus('online');
+                break;
+            case "5":
+                client.user.setStatus('idle');
+                let guilds = await client.guilds.fetch();
+                client.funcs.restoreRadios(client, guilds);
+                client.user.setStatus('online');
+                break;
+            case "6":
+                client.user.setStatus('idle');
+                require(`../commands.js`).execute(client);
+                client.user.setStatus('online');
+                break;
+            case "7":
+                try {
+                    client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
+                    client.stations = await fetch(client.config.stationslistUrl)
+                        .then(client.funcs.checkFetchStatus)
+                        .then(response => response.json());
+    
+                    client.funcs.logger('Stations', 'Successfully fetched list');
+                } catch (error) {
+                    client.funcs.logger('Stations', 'Fetching list failed');
+                }
+                break;
+            case "8":
+                client.user.setStatus('dnd');
+                break;
+            case "9":
+                client.user.setStatus('online');
+                break;
+            default:
+
+        }
+
+        
+        /*
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
@@ -47,6 +171,7 @@ module.exports = {
         interaction.reply({
             embeds: [embed],
             ephemeral: true
-        });
+        });*/
+
     }
 };

src/client/commands/next.js

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

src/client/commands/nowplaying.js

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

src/client/commands/play.js

@@ -1,104 +1,60 @@
 const {
     createAudioPlayer,
-    createAudioResource,
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
 
 module.exports = {
     name: "play",
-    alias: "p",
     usage: "<song name>",
     description: "Play radio",
     options: [
         { type: "STRING", name: "query", description: "Select station", required: false}
     ],
-    permission: "none",
     category: "radio",
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
-        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
+        if(!client.stations) {
-        if(!query){
+            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            if(!client.stations) {
-                message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-                return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-            }
-
-            let stations = 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 interaction.reply({
-                    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 interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,
                 ephemeral: true
             });
         }
-        if (!query) return interaction.reply(client.messages.noQuery);
+
+        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
+        if(!query){
+            return client.funcs.listStations(client, interaction);
+        }
+        let url = query ? query.replace(/<(.+)>/g, "$1") : "";
+        const radio = client.radio.get(interaction.guild.id);
+        const voiceChannel = interaction.member.voice.channel;
+        if (!voiceChannel) return interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
+            ephemeral: true
+        });
+        if (radio) {
+            if (voiceChannel !== radio.voiceChannel) return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
+                ephemeral: true
+            });
+        }
+        if (!query) return interaction.reply({
+            content: client.messages.noQuery,
+            ephemeral: true
+        });
         const permissions = voiceChannel.permissionsFor(interaction.client.user);
         if (!permissions.has("CONNECT")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsConnect);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsConnect,
+                ephemeral: true
+            });
         }
         if (!permissions.has("SPEAK")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsSpeak);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsSpeak,
+                ephemeral: true
+            });
         }
         let station;
         const number = parseInt(query - 1);
@@ -118,17 +74,15 @@ module.exports = {
                 station = client.stations[number];
             }
         } else {
-            if (query.length < 3)
+            if (query.length < 3) return interaction.reply({
-                return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.tooShortSearch,
-                    content: client.messageEmojis["error"] + client.messages.tooShortSearch,
+                ephemeral: true
-                    ephemeral: true
+            });
-                });
+            const sstation = await client.funcs.searchStation(query, client);
-            const sstation = await searchStation(query, client);
+            if (!sstation) return interaction.reply({
-            if (!sstation)
+                content: client.messageEmojis["error"] + client.messages.noSearchResults,
-                return interaction.reply({
+                ephemeral: true
-                    content: client.messageEmojis["error"] + client.messages.noSearchResults,
+            });
-                    ephemeral: true
-                });
             url = sstation.stream[sstation.stream.default];
             station = sstation;
         }
@@ -141,7 +95,7 @@ module.exports = {
             radio.station = station;
             radio.textChannel = interaction.channel;
             radio.startTime = date.getTime();
-            play(interaction, interaction.guild, client, url, Discord);
+            client.funcs.play(interaction, interaction.guild, client, url);
 
             return;
         }
@@ -167,7 +121,7 @@ module.exports = {
             construct.connection = connection;
             let date = new Date();
             construct.startTime = date.getTime();
-            play(interaction, interaction.guild, client, url, Discord);
+            client.funcs.play(interaction, interaction.guild, client, url);
 
             client.datastore.checkEntry(interaction.guild.id);
             construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
@@ -181,161 +135,10 @@ module.exports = {
         } catch (error) {
             console.log(error);
             client.radio.delete(interaction.guild.id);
-            return interaction.reply(client.messageEmojis["error"] + `An error occured: ${error}`);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + `An error occured: ${error}`,
+                ephemeral: true
+            });
         }
     }
-};
+};
-
-async function play(interaction, guild, client, url, Discord) {
-    let message = {};
-    const radio = client.radio.get(guild.id);
-    const resource = createAudioResource(url);
-    radio.connection.subscribe(radio.audioPlayer);
-    radio.audioPlayer.play(resource);
-    resource.playStream
-        .on("readable", () => {
-            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
-        })
-        .on("finish", () => {
-            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
-            client.funcs.statisticsUpdate(client, guild, radio);
-            radio.connection?.destroy();
-            radio.audioPlayer?.stop();
-            client.radio.delete(guild.id);
-            return;
-        })
-        .on("error", error => {
-            client.funcs.logger('Radio', 'Stream errored');
-            console.error(error);
-            radio.connection?.destroy();
-            radio.audioPlayer?.stop();
-            client.radio.delete(guild.id);
-            return interaction.reply(client.messages.errorPlaying);
-        });
-
-    message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
-    message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
-    message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
-    message.nowplayingDescription = message.nowplayingDescription.replace("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);
-    
-    interaction.reply({
-        content: client.messageEmojis["play"] + message.play,
-        ephemeral: true
-    });
-    
-}
-
-function searchStation(key, client) {
-    if (client.stations === null) return false;
-    let foundStations = [];
-    if (!key) return false;
-    if (key == "radio") return false;
-
-    client.stations
-        .filter(
-            x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
-        )
-        .forEach(x =>
-            foundStations.push({ station: x, name: x.name, probability: 100 })
-        );
-
-    if (key.startsWith("radio ")) key = key.slice(6);
-    const probabilityIncrement = 100 / key.split(" ").length / 2;
-    for (let i = 0; i < key.split(" ").length; i++) {
-        client.stations
-            .filter(
-                x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
-            )
-            .forEach(x =>
-                foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
-            );
-    }
-    if (foundStations.length === 0) return false;
-    for (let i = 0; i < foundStations.length; i++) {
-        for (let j = 0; j < foundStations.length; j++) {
-            if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
-        }
-    }
-    for (let i = 0; i < foundStations.length; i++) {
-        if (foundStations[i].name.length > key.length) {
-            foundStations[i].probability -=
-                (foundStations[i].name.split(" ").length - key.split(" ").length) *
-                (probabilityIncrement * 0.5);
-        } else if (foundStations[i].name.length === key.length) {
-            foundStations[i].probability += probabilityIncrement * 0.9;
-        }
-
-        for (let j = 0; j < key.split(" ").length; j++) {
-            if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
-                foundStations[i].probability -= probabilityIncrement * 0.5;
-            }
-        }
-    }
-    let highestProbabilityStation;
-    for (let i = 0; i < foundStations.length; i++) {
-        if (
-            !highestProbabilityStation ||
-            highestProbabilityStation.probability < foundStations[i].probability
-        )
-            highestProbabilityStation = foundStations[i];
-        if (
-            highestProbabilityStation &&
-            highestProbabilityStation.probability === foundStations[i].probability
-        ) {
-            highestProbabilityStation = foundStations[i].station;
-        }
-    }
-    return highestProbabilityStation;
-}

src/client/commands/prev.js

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

src/client/commands/statistics.js

@@ -1,29 +1,37 @@
+import Discord from "discord.js";
+
+
 module.exports = {
     name: 'statistics',
-    alias: 'stats',
-    usage: '',
     description: 'Show statistics',
-    permission: 'none',
     category: 'info',
-    execute(interaction, client, Discord, command) {
+    execute(interaction, client) {
         let message = {};
         let stations = client.stations;
         let currentGuild = client.datastore.getEntry(interaction.guild.id);
+        let global = client.datastore.getEntry("global");
         let statistics = "";
         
         if(!client.stations) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
         }
 
         if(!currentGuild || currentGuild && !currentGuild.statistics){
-            statistics = "You have not listened any radio station";
+            statistics = "You have not listened any radio stations";
         } else {
             Object.keys(stations).forEach(function(station) {
                 if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){
-                    statistics += `**${parseInt(station) + 1}** ` + stations[station].name + " \n";
+                    statistics += `**${parseInt(station) + 1}. ` + stations[station].name + "** \n";
-                    statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + "\n";
+                    if(global && global.statistics[stations[station].name] && global.statistics[stations[station].name].time && parseInt(global.statistics[stations[station].name].time) > 0 && global.statistics[stations[station].name].used && parseInt(global.statistics[stations[station].name].used) > 0){
-                    statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
+                        statistics += "Guild – Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " (" + ((currentGuild.statistics[stations[station].name].time / global.statistics[stations[station].name].time) * 100).toFixed(0) + "%" + ")" + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + " (" + ((currentGuild.statistics[stations[station].name].used / global.statistics[stations[station].name].used) * 100).toFixed(0) + "%" + ")" + "\n";
+                        statistics += "Global – Time: " + client.funcs.msToTime(global.statistics[stations[station].name].time) + " / " + "Used: " + global.statistics[stations[station].name].used + "\n\n";
+                    } else {
+                        statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + "\n\n";
+                    }
                 }
             });
         }

src/client/commands/status.js

@@ -1,11 +1,10 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'status',
-    alias: 'st',
-    usage: '',
     description: 'Bot Status',
-    permission: 'none',
     category: 'info',
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client) {
         let message = {};
 
         message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username);

src/client/commands/stop.js

@@ -1,11 +1,10 @@
+import Discord from "discord.js";
+
 module.exports = {
     name: 'stop',
     description: 'Stop radio',
-    alias: 's',
-    usage: '',
-    permission: 'none',
     category: 'radio',
-    async execute(interaction, client, Discord, command) {
+    async execute(interaction, client, command) {
         const radio = client.radio.get(interaction.guild.id);
         if (client.funcs.check(client, interaction, command)) {
             client.funcs.statisticsUpdate(client, interaction.guild, radio);

src/client/events/SIGINT.js

@@ -1,65 +1,18 @@
-const { REST } = require('@discordjs/rest');
-const { Routes } = require('discord-api-types/v9');
-const { token, version } = require('../../config.js');
-
 module.exports = {
     name: 'SIGINT',
-    async execute(client) {
+    execute(client) {
         client.user.setStatus('dnd');
 
         console.log("\n");
         client.funcs.logger("Bot", "Closing");
         console.log("\n");
+
+        client.funcs.saveRadios(client);
         
-        setTimeout(async function () {
+        setInterval(() => {
-            let message = {};
+            if(client.radio.size == 0){
-
+                process.exit();
-            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();
             }
-
+        }, 500);
-            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

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

src/client/events/interactionCreate.js

@@ -1,11 +1,14 @@
-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 (!permissions.has('VIEW_CHANNEL')) return;
+        
+        if (!permissions.has('EMBED_LINKS')) return interaction.reply({
+            content: client.messages.noPermsEmbed,
+            ephemeral: true
+        });
 
         if(interaction.isCommand()){
             const commandName = interaction.commandName;
@@ -13,7 +16,7 @@ module.exports = {
             if (!command) return;
     
             try {
-                command.execute(interaction, client, Discord, command);
+                command.execute(interaction, client);
             } catch (error) {
                 interaction.reply({
                     content: client.messages.runningCommandFailed,
@@ -27,7 +30,7 @@ module.exports = {
             if (!command) return;
 
             try {
-                command.execute(interaction, client, Discord, command);
+                command.execute(interaction, client, command);
             } catch (error) {
                 interaction.reply({
                     content: client.messages.runningCommandFailed,

src/client/events/messageCreate.js

@@ -22,7 +22,7 @@ module.exports = {
         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);
+        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
         if (!command && message.content !== `${prefix}`) return;
         const permissions = message.channel.permissionsFor(message.client.user);
         if (!permissions.has('EMBED_LINKS')) return message.channel.send(client.messages.noPermsEmbed);
@@ -41,8 +41,11 @@ module.exports = {
 
             let msg = await message.channel.send({ embeds: [embed] });
 
-            setTimeout(function() {
+            setTimeout(async function() {
-                msg.delete();
+                try {
+                    await msg.delete();
+                } catch (DiscordAPIError) {
+                }
             }, 30000);
         } catch (error) {
             message.reply({

src/client/events/ready.js

@@ -94,8 +94,8 @@ module.exports = {
         require(`../commands.js`).execute(client);
 
         setTimeout(function () {
-            /*RESTORE RADIO*/
+            /*RESTORE RADIOS*/
-            require(`../restoreradio.js`).execute(client, guilds);
+            client.funcs.restoreRadios(client, guilds);
         }, 5000);
 
     }

src/client/events/uncaughtException.js

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

src/client/funcs/check.js

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

src/client/funcs/listStations.js

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

src/client/funcs/play.js

@@ -0,0 +1,96 @@
+import Discord from "discord.js";
+const {
+    createAudioResource
+} = require("@discordjs/voice");
+
+module.exports = async function play(interaction, guild, client, url) {
+    let message = {};
+    const radio = client.radio.get(guild.id);
+    const resource = createAudioResource(url);
+    radio.connection.subscribe(radio.audioPlayer);
+    radio.audioPlayer.play(resource);
+    resource.playStream
+        .on("readable", () => {
+            client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
+        })
+        .on("finish", () => {
+            client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
+            client.funcs.statisticsUpdate(client, guild, radio);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+            return;
+        })
+        .on("error", error => {
+            client.funcs.logger('Radio', 'Stream errored');
+            console.error(error);
+            radio.connection?.destroy();
+            radio.audioPlayer?.stop();
+            client.radio.delete(guild.id);
+            return interaction.reply({
+                content: client.messages.errorPlaying,
+                ephemeral: true
+            });
+        });
+
+    message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
+    message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
+    message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("Owner: ", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
+
+    const embed = new Discord.MessageEmbed()
+        .setTitle(client.user.username)
+        .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
+        .setColor(client.config.embedColor)
+        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
+        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
+        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+    
+    const buttons = new Discord.MessageActionRow()
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('list')
+                .setEmoji(client.messageEmojis["list"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('prev')
+                .setEmoji(client.messageEmojis["prev"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('stop')
+                .setEmoji(client.messageEmojis["stop"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('next')
+                .setEmoji(client.messageEmojis["next"])
+                .setStyle('SECONDARY')
+        )
+        .addComponents(
+            new Discord.MessageButton()
+                .setCustomId('statistics')
+                .setEmoji(client.messageEmojis["statistics"])
+                .setStyle('SECONDARY')
+        );
+
+    if(!radio.message){
+        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+    } else {
+        radio.message.edit({ embeds: [embed], components: [buttons] });
+    }
+
+    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
+    
+    interaction?.reply({
+        content: client.messageEmojis["play"] + message.play,
+        ephemeral: true
+    });
+    
+}

src/client/funcs/restoreRadios.js

@@ -0,0 +1,62 @@
+import Discord from "discord.js";
+const {
+    createAudioPlayer,
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = async function restoreRadios(client, guilds) {
+    if(!client.stations) return;
+
+    guilds.forEach(async guild => {
+        let state = client.funcs.loadState(client, guild);
+        if(!state) return;
+        if(!state.station || !state.channels.voice || !state.channels.text) return;
+        let voiceChannel = client.channels.cache.get(state.channels.voice);
+        if(!voiceChannel) return;
+        if(voiceChannel.members.size === 0) return;
+
+
+        const sstation = await client.funcs.searchStation(state.station.name, client);
+        let url = sstation.stream[sstation.stream.default];
+        let station = sstation;
+
+        const construct = {
+            textChannel: client.channels.cache.get(state.channels.text),
+            voiceChannel: client.channels.cache.get(state.channels.voice),
+            connection: null,
+            message: null,
+            audioPlayer: createAudioPlayer(),
+            station: station
+        };
+        client.radio.set(guild.id, construct);
+
+        try {
+            const connection =
+                getVoiceConnection(guild.id) ??
+                joinVoiceChannel({
+                    channelId: voiceChannel.id,
+                    guildId: voiceChannel.guild.id,
+                    adapterCreator: voiceChannel.guild.voiceAdapterCreator
+                });
+
+            construct.connection = connection;
+            let date = new Date();
+            construct.startTime = date.getTime();
+            
+            client.funcs.play(null, guild, client, url, Discord);
+
+            client.datastore.checkEntry(guild.id);
+            construct.datastore = client.datastore.getEntry(guild.id);
+
+            if (!construct.datastore.statistics[construct.station.name]) {
+                construct.datastore.statistics[construct.station.name] = {};
+                construct.datastore.statistics[construct.station.name].time = 0;
+                construct.datastore.statistics[construct.station.name].used = 0;
+                client.datastore.updateEntry(guild, construct.datastore);
+            }
+        } catch (error) {
+            console.log(error);
+        }
+    });
+}

src/client/funcs/saveRadios.js

@@ -0,0 +1,20 @@
+module.exports =  function saveRadios(client) {
+    let currentRadios = client.radio.keys();
+    let radio = currentRadios.next();
+    
+    while (!radio.done) {
+        let currentRadio = client.radio.get(radio.value);
+        currentRadio.guild = client.datastore.getEntry(radio.value).guild;
+    
+        if (currentRadio) {
+            client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
+            client.funcs.saveState(client, currentRadio.guild, currentRadio);
+            currentRadio.connection?.destroy();
+            currentRadio.audioPlayer?.stop();
+            currentRadio.message?.delete();
+            client.radio.delete(radio.value);
+        }
+        
+        radio = currentRadios.next();
+    }
+}

src/client/funcs/searchStation.js

@@ -0,0 +1,62 @@
+module.exports = function searchStation(key, client) {
+    if (client.stations === null) return false;
+    let foundStations = [];
+    if (!key) return false;
+    if (key == "radio") return false;
+
+    client.stations
+        .filter(
+            x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
+        )
+        .forEach(x =>
+            foundStations.push({ station: x, name: x.name, probability: 100 })
+        );
+
+    if (key.startsWith("radio ")) key = key.slice(6);
+    const probabilityIncrement = 100 / key.split(" ").length / 2;
+    for (let i = 0; i < key.split(" ").length; i++) {
+        client.stations
+            .filter(
+                x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
+            )
+            .forEach(x =>
+                foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
+            );
+    }
+    if (foundStations.length === 0) return false;
+    for (let i = 0; i < foundStations.length; i++) {
+        for (let j = 0; j < foundStations.length; j++) {
+            if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
+        }
+    }
+    for (let i = 0; i < foundStations.length; i++) {
+        if (foundStations[i].name.length > key.length) {
+            foundStations[i].probability -=
+                (foundStations[i].name.split(" ").length - key.split(" ").length) *
+                (probabilityIncrement * 0.5);
+        } else if (foundStations[i].name.length === key.length) {
+            foundStations[i].probability += probabilityIncrement * 0.9;
+        }
+
+        for (let j = 0; j < key.split(" ").length; j++) {
+            if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
+                foundStations[i].probability -= probabilityIncrement * 0.5;
+            }
+        }
+    }
+    let highestProbabilityStation;
+    for (let i = 0; i < foundStations.length; i++) {
+        if (
+            !highestProbabilityStation ||
+            highestProbabilityStation.probability < foundStations[i].probability
+        )
+            highestProbabilityStation = foundStations[i];
+        if (
+            highestProbabilityStation &&
+            highestProbabilityStation.probability === foundStations[i].probability
+        ) {
+            highestProbabilityStation = foundStations[i].station;
+        }
+    }
+    return highestProbabilityStation;
+}

src/client/restoreradio.js

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