Merge pull request #63 from warengroup/develop

Version 0.3.9
Update play function
2025-07-01 14:23:41 +00:00 · 2021-09-17 12:55:56 +03:00 · 2021-09-17 12:52:37 +03:00 · 2021-09-17 12:47:00 +03:00 · 2021-09-17 12:46:46 +03:00 · 2021-09-17 12:46:35 +03:00
62 changed files with 1408 additions and 820 deletions
--- a/.env_example
+++ b/.env_example
@ -1,2 +1,5 @@
 DISCORD_TOKEN=
 RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
+DEV_MODE=false
+DEBUG_MODE=false
+STREAMER_MODE=manual
--- a/.github/dependabot.yml
+++ b/.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"
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -0,0 +1,9 @@
+dependencies:
+- package-lock.json
+
+documentation:
+- README.md
+- SECURITY.md
+- CONTRIBUTING.md
+- LICENSE
+- .env_example
--- a/.github/workflows/codeql-analyze.yml
+++ b/.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
--- a/.github/workflows/docker-build.yml
+++ b/.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
--- a/.github/workflows/labeler.yml
+++ b/.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
--- a/.github/workflows/typescript-build.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,5 @@
 datastore/
 node_modules/
 npm-debug.log
-.vscode/
 .env
 build/
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,6 @@
+{
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "editor.renderFinalNewline": false
+}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,27 @@
+# Contributing
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+If you haven't already, come find us in [Discord](https://waren.io/r/eximiabots-discord). We want you working on things you're excited about.
+
+Here are some important resources:
+
+    * [Discord](https://waren.io/r/eximiabots-discord) Join our Discord guild.
+
+## Coding
+
+### Pull Requests
+    * Open a new PR from your fork's new branch into develop branch.
+    * Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+    * Try to fix all merge conflicts.
+
+### Coding conventions
+    * We indent using four spaces (soft tabs)
+    * We ALWAYS put spaces after list items and method parameters (`[1, 2, 3]`, not `[1,2,3]`), around operators (`x += 1`, not `x+=1`), and around hash arrows.
+    * This is open source software. Consider the people who will read your code, and make it look nice for them. It's sort of like driving a car: Perhaps you love doing donuts when you're alone, but with passengers the goal is to make the ride as smooth as possible.
+
+## Testing
+
+We have currently automated testing in Github Workflows, you can suggest new Github Workflows to us by making PR.
+
+Every release is manually tested by [cwchristerw](https://github.com/cwchristerw) or [MatteZ02](https://github.com/MatteZ02).
--- a/README.md
+++ b/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
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.3.x   | :white_check_mark: |
+| 0.2.x   | :x:                |
+| 0.1.x   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.
--- a/package-lock.json
+++ b/package-lock.json
@ -1,42 +1,42 @@
 {
  "name": "eximiabots-radiox",
-  "version": "0.3.5",
+  "version": "0.3.9",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "eximiabots-radiox",
-      "version": "0.3.5",
+      "version": "0.3.9",
      "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-api-types": "^0.23.1",
        "discord.js": "^13.1.0",
        "dotenv": "^10.0.0",
        "libsodium-wrappers": "^0.7.9",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^3.0.0",
        "path": "^0.12.7"
      },
      "devDependencies": {
-        "@types/node": "^16.7.8",
+        "@types/node": "^16.9.1",
        "@types/ws": "^7.4.7",
-        "@typescript-eslint/eslint-plugin": "^4.29.3",
-        "@typescript-eslint/parser": "^4.29.3",
+        "@typescript-eslint/eslint-plugin": "^4.31.1",
+        "@typescript-eslint/parser": "^4.31.1",
        "eslint": "^7.32.0",
        "eslint-config-prettier": "^8.3.0",
        "eslint-plugin-prettier": "^4.0.0",
        "nodemon": "^2.0.12",
-        "prettier": "^2.3.2",
+        "prettier": "^2.4.1",
        "rimraf": "^3.0.2",
        "ts-node": "^10.2.1",
        "tsc-watch": "^4.5.0",
        "typescript": "^4.4.2"
      },
      "engines": {
-        "node": ">=16.6.0",
+        "node": ">=16.9.1",
        "npm": ">=7.0.0"
      }
    },
@ -180,6 +180,14 @@
        "npm": ">=7.0.0"
      }
    },
+    "node_modules/@discordjs/builders/node_modules/discord-api-types": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@discordjs/collection": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
@ -220,6 +228,14 @@
        "node-pre-gyp": "bin/node-pre-gyp"
      }
    },
+    "node_modules/@discordjs/node-pre-gyp/node_modules/node-fetch": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
    "node_modules/@discordjs/opus": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.6.0.tgz",
@ -251,6 +267,22 @@
        "node": ">=16.0.0"
      }
    },
+    "node_modules/@discordjs/rest/node_modules/discord-api-types": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@discordjs/rest/node_modules/node-fetch": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
    "node_modules/@discordjs/voice": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@ -281,6 +313,14 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/@discordjs/voice/node_modules/discord-api-types": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@discordjs/voice/node_modules/node-addon-api": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@ -407,9 +447,9 @@
      }
    },
    "node_modules/@sindresorhus/is": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
+      "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
      "engines": {
        "node": ">=10"
      },
@ -460,9 +500,9 @@
      "dev": true
    },
    "node_modules/@types/node": {
-      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
+      "version": "16.9.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz",
+      "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
    },
    "node_modules/@types/ws": {
      "version": "7.4.7",
@ -473,13 +513,13 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
-      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz",
+      "integrity": "sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.1",
+        "@typescript-eslint/scope-manager": "4.31.1",
        "debug": "^4.3.1",
        "functional-red-black-tree": "^1.0.1",
        "regexpp": "^3.1.0",
@ -504,15 +544,15 @@
      }
    },
    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
-      "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz",
+      "integrity": "sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==",
      "dev": true,
      "dependencies": {
        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.30.0",
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.1",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/typescript-estree": "4.31.1",
        "eslint-scope": "^5.1.1",
        "eslint-utils": "^3.0.0"
      },
@ -528,14 +568,14 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
-      "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.1.tgz",
+      "integrity": "sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/scope-manager": "4.30.0",
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.1",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/typescript-estree": "4.31.1",
        "debug": "^4.3.1"
      },
      "engines": {
@ -555,13 +595,13 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
-      "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz",
+      "integrity": "sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/visitor-keys": "4.30.0"
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/visitor-keys": "4.31.1"
      },
      "engines": {
        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@ -572,9 +612,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
-      "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.1.tgz",
+      "integrity": "sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==",
      "dev": true,
      "engines": {
        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@ -585,13 +625,13 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
-      "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz",
+      "integrity": "sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/visitor-keys": "4.30.0",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/visitor-keys": "4.31.1",
        "debug": "^4.3.1",
        "globby": "^11.0.3",
        "is-glob": "^4.0.1",
@ -612,12 +652,12 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
-      "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz",
+      "integrity": "sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==",
      "dev": true,
      "dependencies": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.1",
        "eslint-visitor-keys": "^2.0.0"
      },
      "engines": {
@ -666,9 +706,9 @@
      }
    },
    "node_modules/acorn-walk": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
-      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
      "dev": true,
      "engines": {
        "node": ">=0.4.0"
@ -755,9 +795,9 @@
      }
    },
    "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
      "dev": true,
      "engines": {
        "node": ">=8"
@ -1190,6 +1230,14 @@
        "node": ">=8"
      }
    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/debug": {
      "version": "4.3.2",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@ -1285,9 +1333,9 @@
      }
    },
    "node_modules/discord-api-types": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
-      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
+      "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==",
      "engines": {
        "node": ">=12"
      }
@ -1327,6 +1375,22 @@
        "npm": ">=7.0.0"
      }
    },
+    "node_modules/discord.js/node_modules/discord-api-types": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/discord.js/node_modules/node-fetch": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
    "node_modules/doctrine": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@ -1735,14 +1799,35 @@
      "dev": true
    },
    "node_modules/fastq": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz",
-      "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
      "dev": true,
      "dependencies": {
        "reusify": "^1.0.4"
      }
    },
+    "node_modules/fetch-blob": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.2.tgz",
+      "integrity": "sha512-hunJbvy/6OLjCD0uuhLdp0mMPzP/yd2ssd1t2FCJsaA7wkWhpbp9xfuNVpv7Ll4jFhzp6T4LAupSiV9uOeg0VQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
    "node_modules/file-entry-cache": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@ -2479,9 +2564,9 @@
      "dev": true
    },
    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
      "dependencies": {
        "yallist": "^4.0.0"
      },
@ -2535,11 +2620,19 @@
      "dev": true
    },
    "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0.tgz",
+      "integrity": "sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==",
+      "dependencies": {
+        "data-uri-to-buffer": "^3.0.1",
+        "fetch-blob": "^3.1.2"
+      },
      "engines": {
-        "node": "4.x || >=6.0.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
      }
    },
    "node_modules/nodemon": {
@ -2836,9 +2929,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+      "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
      "dev": true,
      "bin": {
        "prettier": "bin-prettier.js"
@ -3188,9 +3281,9 @@
      }
    },
    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz",
+      "integrity": "sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="
    },
    "node_modules/slash": {
      "version": "3.0.0",
@ -3356,9 +3449,9 @@
      }
    },
    "node_modules/table/node_modules/ajv": {
-      "version": "8.6.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
      "dev": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
@ -3549,9 +3642,9 @@
      }
    },
    "node_modules/ts-node/node_modules/acorn": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+      "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
      "dev": true,
      "bin": {
        "acorn": "bin/acorn"
@ -3642,9 +3735,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
-      "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
+      "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@ -3783,6 +3876,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz",
+      "integrity": "sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
    "node_modules/which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@ -3874,9 +3975,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
-      "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
      "engines": {
        "node": ">=8.3.0"
      },
@ -4027,6 +4128,13 @@
        "ow": "^0.27.0",
        "ts-mixer": "^6.0.0",
        "tslib": "^2.3.1"
+      },
+      "dependencies": {
+        "discord-api-types": {
+          "version": "0.22.0",
+          "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+          "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+        }
      }
    },
    "@discordjs/collection": {
@ -4058,6 +4166,13 @@
        "rimraf": "^3.0.2",
        "semver": "^7.3.5",
        "tar": "^6.1.8"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+          "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
+        }
      }
    },
    "@discordjs/opus": {
@ -4082,6 +4197,18 @@
        "form-data": "^4.0.0",
        "node-fetch": "^2.6.1",
        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "discord-api-types": {
+          "version": "0.22.0",
+          "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+          "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+        },
+        "node-fetch": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+          "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
+        }
      }
    },
    "@discordjs/voice": {
@ -4107,6 +4234,11 @@
            "node-addon-api": "^3.2.1"
          }
        },
+        "discord-api-types": {
+          "version": "0.22.0",
+          "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+          "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+        },
        "node-addon-api": {
          "version": "3.2.1",
          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
@ -4193,9 +4325,9 @@
      "integrity": "sha512-gPSOQKmEWeuif2ftmW7gyToCnOoqpDqTSNrxX7HsoMwGNLtrT9p5DHcQolkBg5CEK3ooDFy5DNEFKUshQU7vyQ=="
    },
    "@sindresorhus/is": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
-      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
+      "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
    },
    "@szmarczak/http-timer": {
      "version": "1.1.2",
@ -4237,9 +4369,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "16.7.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz",
-      "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="
+      "version": "16.9.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz",
+      "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w=="
    },
    "@types/ws": {
      "version": "7.4.7",
@ -4250,13 +4382,13 @@
      }
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
-      "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz",
+      "integrity": "sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "4.30.0",
-        "@typescript-eslint/scope-manager": "4.30.0",
+        "@typescript-eslint/experimental-utils": "4.31.1",
+        "@typescript-eslint/scope-manager": "4.31.1",
        "debug": "^4.3.1",
        "functional-red-black-tree": "^1.0.1",
        "regexpp": "^3.1.0",
@ -4265,55 +4397,55 @@
      }
    },
    "@typescript-eslint/experimental-utils": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
-      "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz",
+      "integrity": "sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==",
      "dev": true,
      "requires": {
        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.30.0",
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.1",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/typescript-estree": "4.31.1",
        "eslint-scope": "^5.1.1",
        "eslint-utils": "^3.0.0"
      }
    },
    "@typescript-eslint/parser": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
-      "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.1.tgz",
+      "integrity": "sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/scope-manager": "4.30.0",
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/typescript-estree": "4.30.0",
+        "@typescript-eslint/scope-manager": "4.31.1",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/typescript-estree": "4.31.1",
        "debug": "^4.3.1"
      }
    },
    "@typescript-eslint/scope-manager": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
-      "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz",
+      "integrity": "sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/visitor-keys": "4.30.0"
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/visitor-keys": "4.31.1"
      }
    },
    "@typescript-eslint/types": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
-      "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.1.tgz",
+      "integrity": "sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==",
      "dev": true
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
-      "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz",
+      "integrity": "sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "4.30.0",
-        "@typescript-eslint/visitor-keys": "4.30.0",
+        "@typescript-eslint/types": "4.31.1",
+        "@typescript-eslint/visitor-keys": "4.31.1",
        "debug": "^4.3.1",
        "globby": "^11.0.3",
        "is-glob": "^4.0.1",
@ -4322,12 +4454,12 @@
      }
    },
    "@typescript-eslint/visitor-keys": {
-      "version": "4.30.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
-      "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
+      "version": "4.31.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz",
+      "integrity": "sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/types": "4.30.0",
+        "@typescript-eslint/types": "4.31.1",
        "eslint-visitor-keys": "^2.0.0"
      }
    },
@ -4358,9 +4490,9 @@
      "requires": {}
    },
    "acorn-walk": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
-      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
      "dev": true
    },
    "agent-base": {
@ -4427,9 +4559,9 @@
      "dev": true
    },
    "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
      "dev": true
    },
    "ansi-styles": {
@ -4764,6 +4896,11 @@
      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
      "dev": true
    },
+    "data-uri-to-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="
+    },
    "debug": {
      "version": "4.3.2",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
@ -4830,9 +4967,9 @@
      }
    },
    "discord-api-types": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
-      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
+      "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ=="
    },
    "discord.js": {
      "version": "13.1.0",
@ -4860,6 +4997,16 @@
            "ts-mixer": "^6.0.0",
            "tslib": "^2.3.0"
          }
+        },
+        "discord-api-types": {
+          "version": "0.22.0",
+          "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+          "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+        },
+        "node-fetch": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+          "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="
        }
      }
    },
@ -5170,14 +5317,22 @@
      "dev": true
    },
    "fastq": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz",
-      "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
      "dev": true,
      "requires": {
        "reusify": "^1.0.4"
      }
    },
+    "fetch-blob": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.2.tgz",
+      "integrity": "sha512-hunJbvy/6OLjCD0uuhLdp0mMPzP/yd2ssd1t2FCJsaA7wkWhpbp9xfuNVpv7Ll4jFhzp6T4LAupSiV9uOeg0VQ==",
+      "requires": {
+        "web-streams-polyfill": "^3.0.3"
+      }
+    },
    "file-entry-cache": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@ -5753,9 +5908,9 @@
      "dev": true
    },
    "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
      "requires": {
        "yallist": "^4.0.0"
      }
@ -5797,9 +5952,13 @@
      "dev": true
    },
    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0.tgz",
+      "integrity": "sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==",
+      "requires": {
+        "data-uri-to-buffer": "^3.0.1",
+        "fetch-blob": "^3.1.2"
+      }
    },
    "nodemon": {
      "version": "2.0.12",
@ -6018,9 +6177,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
-      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+      "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
      "dev": true
    },
    "prettier-linter-helpers": {
@ -6247,9 +6406,9 @@
      "dev": true
    },
    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz",
+      "integrity": "sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="
    },
    "slash": {
      "version": "3.0.0",
@ -6377,9 +6536,9 @@
      },
      "dependencies": {
        "ajv": {
-          "version": "8.6.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-          "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+          "version": "8.6.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
          "dev": true,
          "requires": {
            "fast-deep-equal": "^3.1.1",
@ -6516,9 +6675,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "8.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-          "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+          "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
          "dev": true
        }
      }
@ -6583,9 +6742,9 @@
      }
    },
    "typescript": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
-      "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
+      "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
      "dev": true
    },
    "undefsafe": {
@ -6705,6 +6864,11 @@
      "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
      "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY="
    },
+    "web-streams-polyfill": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz",
+      "integrity": "sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q=="
+    },
    "which": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@ -6780,9 +6944,9 @@
      }
    },
    "ws": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
-      "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
      "requires": {}
    },
    "xdg-basedir": {
--- a/package.json
+++ b/package.json
@ -1,12 +1,12 @@
 {
  "name": "eximiabots-radiox",
-  "version": "0.3.5",
+  "version": "0.3.9",
  "description": "Internet Radio to your Discord guild",
  "main": "index.js",
  "scripts": {
    "build": "rimraf ./build && tsc",
-    "start": "node build/index.js",
-    "start:dev": "npm run build && node build/index.js"
+    "start": "node --no-warnings build/index.js",
+    "start:dev": "npm run build && node --no-warnings build/index.js"
  },
  "repository": {
    "type": "git",
@ -22,30 +22,30 @@
    "@discordjs/opus": "^0.6.0",
    "@discordjs/rest": "^0.1.1-canary.0",
    "@discordjs/voice": "^0.6.0",
-    "discord-api-types": "^0.22.0",
+    "discord-api-types": "^0.23.1",
    "discord.js": "^13.1.0",
    "dotenv": "^10.0.0",
    "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.0.0",
    "path": "^0.12.7"
  },
  "devDependencies": {
-    "@types/node": "^16.7.8",
+    "@types/node": "^16.9.1",
    "@types/ws": "^7.4.7",
-    "@typescript-eslint/eslint-plugin": "^4.29.3",
-    "@typescript-eslint/parser": "^4.29.3",
+    "@typescript-eslint/eslint-plugin": "^4.31.1",
+    "@typescript-eslint/parser": "^4.31.1",
    "eslint": "^7.32.0",
    "eslint-config-prettier": "^8.3.0",
    "eslint-plugin-prettier": "^4.0.0",
    "nodemon": "^2.0.12",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.1",
    "rimraf": "^3.0.2",
    "ts-node": "^10.2.1",
    "tsc-watch": "^4.5.0",
    "typescript": "^4.4.2"
  },
  "engines": {
-      "node": ">=16.6.0",
+      "node": ">=16.9.1",
      "npm": ">=7.0.0"
  }
 }
--- a/src/Client.ts
+++ b/src/Client.ts
@ -1,6 +1,10 @@
 import Discord, { Client, Collection } from "discord.js";
+import Datastore from "./client/classes/Datastore.js";
+import Radio from "./client/classes/Radio.js";
+import Stations from "./client/classes/Stations.js";
+import Streamer from "./client/classes/Streamer.js";
+import Statistics from "./client/classes/Statistics.js";
 import fs from "fs";
-import Datastore from "./client/datastore.js";
 import { command, radio } from "./client/utils/typings.js";
 import config from "./config.js";
 import messages from "./client/messages.js";
@ -17,33 +21,34 @@ GatewayIntents.add(

 class RadioClient extends Client {
    readonly commands: Collection<string, command>;
-    readonly radio: Map<string, radio>;
    public funcs: any;
    readonly config = config;
    readonly messages = messages;
    public datastore: Datastore | null;
+    public stations: Stations | null;
+    public streamer: Streamer | null;
+    public statistics: Statistics | null;
+    public radio: Radio | null;
    constructor() {
        super({
            intents: GatewayIntents
        });
        this.commands = new Collection();
-        this.radio = new Map();
        this.datastore = null;
+        this.stations = null;
+        this.streamer = null;
+        this.statistics = null;
+        this.radio = null;

        this.funcs = {};
        this.funcs.check = require("./client/funcs/check.js");
-        this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js");
        this.funcs.isDev = require("./client/funcs/isDev.js");
        this.funcs.logger = require("./client/funcs/logger.js");
        this.funcs.msToTime = require("./client/funcs/msToTime.js");
-        this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
        this.funcs.saveState = require("./client/funcs/saveState.js");
        this.funcs.loadState = require("./client/funcs/loadState.js");
-        this.funcs.searchStation = require("./client/funcs/searchStation.js");
        this.funcs.play = require("./client/funcs/play.js");
        this.funcs.listStations = require("./client/funcs/listStations.js");
-        this.funcs.restoreRadios = require("./client/funcs/restoreRadios.js");
-        this.funcs.saveRadios = require("./client/funcs/saveRadios.js");

        console.log('RadioX ' + this.config.version);
        console.log('Internet Radio to your Discord guild');
@ -52,11 +57,8 @@ class RadioClient extends Client {

        this.funcs.logger("Bot", "Starting");

-        const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
-        for (const file of commandFiles) {
-            const command = require(`./client/commands/${file}`);
-            this.commands.set(command.name, command);
-        }
+        this.funcs.logger("Maintenance Mode", "Enabled");
+        this.config.maintenanceMode = true;

        this.on("ready", () => {
            require(`${events}ready`).execute(this);
@ -78,6 +80,12 @@ class RadioClient extends Client {
            require(`${events}voiceStateUpdate`).execute(this, oldState, newState);
        });

+        this.on("error", error => {
+            this.funcs.logger("Discord Client / Error");
+            console.error(error);
+            console.log('');
+        });
+
        process.on('SIGINT', () => {
            require(`${events}SIGINT`).execute(this);
        });
@ -86,11 +94,23 @@ class RadioClient extends Client {
            require(`${events}SIGTERM`).execute(this);
        });

-        this.on("error", error => {
-            console.error(error);
+        process.on('uncaughtException', (error) => {
+            require(`${events}uncaughtException`).execute(this, error);
        });

-        this.login(this.config.token).catch(err => console.log("Failed to login: " + err));
+        process.on('exit', () => {
+            this.funcs.logger("Bot", "Stopping");
+        });
+
+        process.on('warning', (warning) => {
+            require(`${events}warning`).execute(this, warning);
+        });
+
+        this.login(this.config.token).catch((err) => {
+            this.funcs.logger("Discord Client / Error");
+            console.log(err);
+            console.log('');
+        });
    }
 }

--- a/src/client/classes/Datastore.js
+++ b/src/client/classes/Datastore.js
@ -0,0 +1,103 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+        this.loadData();
+    }
+
+    loadData() {
+        const dir = path.join(path.dirname(__dirname), '../../datastore');
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir);
+        }
+        //console.log("");
+        const dataFiles = fs.readdirSync(path.join(path.dirname(__dirname), '../../datastore')).filter(f => f.endsWith('.json'));
+        for (const file of dataFiles) {
+            try {
+                const json = require(`../../../datastore/${file}`);
+                this.map.set(json.guild.id, json);
+                //console.log('[LOADED] ' + file + " (" + json.guild.id + ")");
+                //console.log(JSON.stringify(json, null, 4));
+            } catch (error) {
+                //console.log('[ERROR] Loading ' + file + ' failed');
+            }
+        }
+        //console.log("");
+    }
+
+    checkEntry(id){
+        this.loadEntry(id);
+        if(!this.map.has(id)){
+            this.createEntry(id);
+            //this.showEntry(this.getEntry(id));
+        } else {
+            //this.showEntry(this.getEntry(id));
+        }
+    }
+
+    createEntry(id){
+        let newData = {};
+        newData.guild = {};
+        newData.guild.id = id;
+        newData.statistics = {};
+        newData.state = {};
+        this.map.set(id, newData);
+        this.saveEntry(id, newData);
+    }
+
+    loadEntry(id){
+        const json = require(`../../../datastore/` + id + '.json');
+        this.map.set(id, json);
+    }
+
+    getEntry(id){
+        return this.map.get(id);
+    }
+
+    updateEntry(guild, newData) {
+        newData.guild.name = guild.name;
+
+        let date = new Date();
+        newData.updated = date.toISOString().substring(0, 10)
+
+        this.map.set(guild.id, newData);
+        this.saveEntry(guild.id, newData);
+        //this.showEntry(this.getEntry(guild.id));
+    }
+
+    showEntry(data){
+        console.log(data);
+    }
+
+    createTestFile () {
+        let newData = {
+            "guild": {
+                "id": "test",
+                "name": "Test"
+            },
+            "statistics": {
+                "test": {
+                    "time": 0,
+                    "used": 0
+                }
+            },
+            "state": {
+
+            }
+        }
+
+        this.updateEntry(newData.guild, newData);
+    }
+
+    saveEntry(file, data) {
+        data = JSON.stringify(data, null, 4);
+
+        fs.writeFile(path.join(path.dirname(__dirname), '../../datastore') + "/" + file + ".json", data, 'utf8', function(err) {
+            if (err) {
+                //console.log(err);
+            }
+        });
+    }
+};
--- a/src/client/classes/Radio.js
+++ b/src/client/classes/Radio.js
@ -0,0 +1,86 @@
+const {
+    getVoiceConnection,
+    joinVoiceChannel
+} = require("@discordjs/voice");
+
+module.exports = class Radio extends Map {
+    constructor() {
+        super();
+    }
+
+    save(client) {
+        let currentRadios = this.keys();
+        let radio = currentRadios.next();
+
+        while (!radio.done) {
+            let currentRadio = this.get(radio.value);
+
+            if (currentRadio) {
+                currentRadio.guild = client.datastore.getEntry(radio.value).guild;
+
+                client.statistics.update(client, currentRadio.guild, currentRadio);
+                client.funcs.saveState(client, currentRadio.guild, currentRadio);
+                currentRadio.connection?.destroy();
+                currentRadio.message?.delete();
+                this.delete(radio.value);
+            }
+
+            radio = currentRadios.next();
+        }
+    }
+
+    restore(client, guilds) {
+        if(!client.stations) return;
+
+        guilds.forEach(async guild => {
+            let state = client.funcs.loadState(client, guild);
+            if(!state) return;
+            if(!state.station || !state.channels.voice || !state.channels.text) return;
+            let voiceChannel = client.channels.cache.get(state.channels.voice);
+            if(!voiceChannel) return;
+            if(voiceChannel.members.filter(member => !member.user.bot).size === 0) return;
+
+
+            const sstation = await client.stations.search(state.station.name);
+            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,
+                station: station
+            };
+            this.set(guild.id, construct);
+
+            try {
+                const connection =
+                    getVoiceConnection(guild.id) ??
+                    joinVoiceChannel({
+                        channelId: voiceChannel.id,
+                        guildId: voiceChannel.guild.id,
+                        adapterCreator: voiceChannel.guild.voiceAdapterCreator
+                    });
+
+                construct.connection = connection;
+                let date = new Date();
+                construct.startTime = date.getTime();
+
+                client.funcs.play(client, null, guild, station);
+
+                client.datastore.checkEntry(guild.id);
+                construct.datastore = client.datastore.getEntry(guild.id);
+
+                if (!construct.datastore.statistics[construct.station.name]) {
+                    construct.datastore.statistics[construct.station.name] = {};
+                    construct.datastore.statistics[construct.station.name].time = 0;
+                    construct.datastore.statistics[construct.station.name].used = 0;
+                    client.datastore.updateEntry(guild, construct.datastore);
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        });
+    }
+
+};
--- a/src/client/classes/Stations.js
+++ b/src/client/classes/Stations.js
@ -0,0 +1,109 @@
+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));
+
+module.exports = class Stations extends Array {
+    constructor() {
+        super();
+        this.logger = require("../funcs/logger.js");
+    }
+
+    async fetch(options){
+        try {
+            this.logger('Stations', 'Started fetching list – ' + options.url);
+            let list = await fetch(options.url)
+                .then(this.checkFetchStatus)
+                .then(response => response.json());
+
+            if(list){
+                this.logger('Stations');
+                this.forEach(oldStation => {
+                    if(list.findIndex(station => station.name == oldStation.name)) return;
+                    delete this[this.findIndex(station => station.name == oldStation.name)];
+                });
+                list.forEach(station => {
+                    console.log("- " + station.name);
+                    this.push(station);
+                });
+                console.log("\n");
+            }
+
+            this.logger('Stations', 'Successfully fetched list');
+        } catch (error) {
+            this.logger('Stations', 'Fetching list failed');
+            console.error(error + "\n");
+
+            this.fetch(options);
+        }
+    }
+
+    checkFetchStatus(response) {
+        if (response.ok) { // res.status >= 200 && res.status < 300
+            return response;
+        } else {
+            throw new Error(response.status + " " + response.statusText);
+        }
+    }
+
+    search(key) {
+        if (this === null) return false;
+        let foundStations = [];
+        if (!key) return false;
+        if (key == "radio") return false;
+
+        this
+            .filter(
+                x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
+            )
+            .forEach(x =>
+                foundStations.push({ station: x, name: x.name, probability: 100 })
+            );
+
+        if (key.startsWith("radio ")) key = key.slice(6);
+        const probabilityIncrement = 100 / key.split(" ").length / 2;
+        for (let i = 0; i < key.split(" ").length; i++) {
+            this
+                .filter(
+                    x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
+                )
+                .forEach(x =>
+                    foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
+                );
+        }
+        if (foundStations.length === 0) return false;
+        for (let i = 0; i < foundStations.length; i++) {
+            for (let j = 0; j < foundStations.length; j++) {
+                if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
+            }
+        }
+        for (let i = 0; i < foundStations.length; i++) {
+            if (foundStations[i].name.length > key.length) {
+                foundStations[i].probability -=
+                    (foundStations[i].name.split(" ").length - key.split(" ").length) *
+                    (probabilityIncrement * 0.5);
+            } else if (foundStations[i].name.length === key.length) {
+                foundStations[i].probability += probabilityIncrement * 0.9;
+            }
+
+            for (let j = 0; j < key.split(" ").length; j++) {
+                if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
+                    foundStations[i].probability -= probabilityIncrement * 0.5;
+                }
+            }
+        }
+        let highestProbabilityStation;
+        for (let i = 0; i < foundStations.length; i++) {
+            if (
+                !highestProbabilityStation ||
+                highestProbabilityStation.probability < foundStations[i].probability
+            )
+                highestProbabilityStation = foundStations[i];
+            if (
+                highestProbabilityStation &&
+                highestProbabilityStation.probability === foundStations[i].probability
+            ) {
+                highestProbabilityStation = foundStations[i].station;
+            }
+        }
+        return highestProbabilityStation;
+    }
+};
--- a/src/client/classes/Statistics.js
+++ b/src/client/classes/Statistics.js
@ -0,0 +1,70 @@
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+    }
+
+    update(client, guild, radio) {
+
+        client.datastore.checkEntry(guild.id);
+
+        radio.datastore = client.datastore.getEntry(guild.id);
+
+        if(!radio.datastore.statistics[radio.station.name]){
+            radio.datastore.statistics[radio.station.name] = {};
+            radio.datastore.statistics[radio.station.name].time = 0;
+            radio.datastore.statistics[radio.station.name].used = 0;
+            client.datastore.updateEntry(guild, radio.datastore);
+        }
+
+        let date = new Date();
+        radio.currentTime = date.getTime();
+        radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
+        radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
+
+        radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
+        client.datastore.updateEntry(guild, radio.datastore);
+        this.calculateGlobal(client);
+    }
+
+    calculateGlobal(client){
+        if(!client.stations) return;
+        if(!client.datastore.map) return;
+
+        let guilds = client.datastore.map.keys();
+        let stations = client.stations;
+        let statistics = {};
+
+        if(!client.stations) return;
+
+        let calculation = guilds.next();
+
+        while (!calculation.done) {
+            let currentGuild = client.datastore.getEntry(calculation.value);
+            if(calculation.value != 'global'){
+                if(stations){
+                    Object.keys(stations).forEach(function(station) {
+                        if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) != 0  && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) != 0){
+                            if(!statistics[stations[station].name]){
+                                statistics[stations[station].name] = {};
+                                statistics[stations[station].name].time = 0;
+                                statistics[stations[station].name].used = 0;
+                            }
+
+                            statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
+                            statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
+                        }
+                    });
+                }
+            }
+            calculation = guilds.next();
+        }
+
+        let newData = {};
+        newData.guild = {};
+        newData.guild.id = "global";
+        newData.guild.name = "global";
+        newData.statistics = statistics;
+        client.datastore.updateEntry(newData.guild, newData);
+    }
+
+};
--- a/src/client/classes/Streamer.js
+++ b/src/client/classes/Streamer.js
@ -0,0 +1,128 @@
+const {
+    createAudioPlayer,
+    createAudioResource,
+    AudioPlayerStatus,
+    NoSubscriberBehavior
+} = require("@discordjs/voice");
+
+module.exports = class {
+    constructor() {
+        this.map = new Map();
+        this.mode = null;
+        this.logger = require("../funcs/logger.js");
+    }
+
+    init(client){
+        if(!client.config.streamerMode) return;
+
+        switch(client.config.streamerMode){
+            case "manual":
+                this.mode = "manual";
+                break;
+            case "auto":
+                this.mode = "auto";
+                break;
+            default:
+                this.mode = "manual";
+        }
+
+        if(this.mode == "auto"){
+            if(!client.stations) return;
+
+            client.stations.forEach(station => {
+                this.play(station);
+            });
+        }
+    }
+
+    refresh(client){
+        this.init(client);
+
+        let streamers = this.map.keys();
+        streamers.forEach(streamer => {
+            if(client.stations.findIndex(station => station.name == streamer)) return;
+            this.stop(streamer);
+        });
+    }
+
+    play(station) {
+        let audioPlayer = this.map.get(station.name);
+        if(!audioPlayer) {
+            audioPlayer = createAudioPlayer({
+                behaviors: {
+                    noSubscriber: NoSubscriberBehavior.Play,
+                    maxMissedFrames: Math.round(5000 / 20),
+                },
+            });
+            this.map.set(station.name, audioPlayer);
+        }
+        const url = station.stream[station.stream.default];
+        const resource = createAudioResource(url);
+        audioPlayer.play(resource);
+        resource.playStream
+            .on("readable", () => {
+                this.logger('Streamer', station.name + " / " + "Readable");
+                this.map.set(station.name, audioPlayer);
+            })
+            .on("finish", () => {
+                this.logger('Streamer', station.name + " / " + "Finished");
+                this.play(station);
+            })
+            .on("error", error => {
+                this.logger('Streamer', station.name + " / " + "Error");
+                this.play(station);
+            });
+
+
+
+        audioPlayer
+            .on('playing', () => {
+	            this.logger('Streamer', station.name + " / " + "Playing");
+            })
+            .on('idle', () => {
+                this.logger('Streamer', station.name + " / " + "Idle");
+                this.play(station);
+            })
+            .on('paused', () => {
+                this.logger('Streamer', station.name + " / " + "Paused");
+                this.play(station);
+            })
+            .on('buffering', () => {
+                this.logger('Streamer', station.name + " / " + "Buffering");
+            })
+            .on('autopaused', () => {
+                this.logger('Streamer', station.name + " / " + "AutoPaused");
+                this.play(station);
+            })
+            .on('error', error => {
+                this.logger('Streamer', station.name + " / " + "Error" + "\n" + error);
+                this.play(station);
+            });
+        return audioPlayer;
+    }
+
+    stop(station){
+        let audioPlayer = this.map.get(station.name);
+        if(audioPlayer){
+            this.logger('Streamer', station.name + " / " + "Stop");
+            audioPlayer.stop();
+        }
+        this.map.delete(station.name);
+    }
+
+    listen(station) {
+        let audioPlayer = this.map.get(station.name);
+        if(!audioPlayer){
+            audioPlayer = this.play(station);
+        }
+        return audioPlayer;
+    }
+
+    leave(client) {
+        if(!client.stations) return;
+
+        client.stations.forEach(station => {
+            this.stop(station);
+        });
+    }
+};
--- a/src/client/commands.js
+++ b/src/client/commands.js
@ -1,17 +1,19 @@
 const { SlashCommandBuilder } = require('@discordjs/builders');
 const { REST } = require('@discordjs/rest');
 const { Routes } = require('discord-api-types/v9');
-const { token, version } = require('../config.js');
 const fs = require('fs');
 const path = require ('path');

 module.exports = {
    async execute(client) {
+
        const commands = [];
        const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));

        for (const file of commandFiles) {
            const command = require(`./commands/${file}`);
+            client.commands.set(command.name, command);
+
            command.data = new SlashCommandBuilder()
                .setName(command.name)
                .setDescription(command.description);
@ -28,13 +30,13 @@ module.exports = {
            commands.push(command.data);
        }

-        const rest = new REST({ version: '9' }).setToken(token);
+        const rest = new REST({ version: '9' }).setToken(client.config.token);

        (async () => {
            try {
                client.funcs.logger('Slash Commands', 'Started refreshing application (/) commands.');

-                if(version.includes("-dev")){
+                if(client.config.devMode){
                    await rest.put(
                        Routes.applicationCommands(client.user.id),
                        { body: [] },
--- a/src/client/commands/bug.js
+++ b/src/client/commands/bug.js
@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'bug',
    description: 'Report a bug',
-    permission: 'none',
    category: 'info',
    async execute(interaction, client) {
        let message = {};
--- a/src/client/commands/help.js
+++ b/src/client/commands/help.js
@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'help',
    description: 'Get help using bot',
-    permission: 'none',
    category: 'info',
    execute(interaction, client) {
        let message = {};
--- a/src/client/commands/invite.js
+++ b/src/client/commands/invite.js
@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'invite',
    description: 'Invite Bot',
-    permission: 'none',
    category: 'info',
    execute(interaction, client) {
        let message = {};
--- a/src/client/commands/list.js
+++ b/src/client/commands/list.js
@ -3,18 +3,21 @@ import Discord from "discord.js";
 module.exports = {
    name: 'list',
    description: 'List radio stations',
-    permission: 'none',
    category: 'radio',
    execute(interaction, client) {
        let message = {};
+
        if(!client.stations) {
            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
        }

        const radio = client.radio.get(interaction.guild.id);

-        if(radio){
+        if(radio && !client.config.maintenanceMode){
            client.funcs.listStations(client, interaction);
        } else {
            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
--- a/src/client/commands/maintenance.js
+++ b/src/client/commands/maintenance.js
@ -1,17 +1,19 @@
 import Discord from "discord.js";
+import Streamer from "../classes/Streamer.js";
+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));

 module.exports = {
    name: 'maintenance',
    description: 'Bot Maintenance',
-    permission: 'none',
    category: 'info',
-    options: [
-        { type: "NUMBER", name: "action", description: "Select action", required: false}
-    ],
    async execute(interaction, client) {
        let message = {};

-        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply(client.messageEmojis["error"] + client.messages.notAllowed);
+        if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.notAllowed,
+            ephemeral: true
+        });
        let action = interaction.options?.getNumber("action") ?? interaction.values?.[0];
        const options = new Array(
            {
@ -38,6 +40,12 @@ module.exports = {
                description: "",
                value: "6"
            },
+            {
+                emoji: "<:RadioXList:688541155519889482>",
+                label: "Reload Stations",
+                description: "",
+                value: "7"
+            },
            {
                emoji: "<:dnd:746069698139127831>",
                label: "Enable Maintenance Mode",
@ -49,6 +57,18 @@ module.exports = {
                label: "Disable Maintenance Mode",
                description: "",
                value: "9"
+            },
+            {
+                emoji: "💤",
+                label: "Streamer Mode – Manual",
+                description: "",
+                value: "10"
+            },
+            {
+                emoji: "📡",
+                label: "Streamer Mode – Auto",
+                description: "",
+                value: "11"
            }
        );

@ -81,80 +101,106 @@ module.exports = {
            ephemeral: true
        });

+        let guilds = await client.guilds.fetch();
+
        switch(action){
            case "0":
+                client.config.maintenanceMode = true;
                process.emit('SIGINT');
                break;
            case "4":
+                client.config.maintenanceMode = true;
                client.user.setStatus('idle');
-                setTimeout(function () {
-                    client.funcs.saveRadios(client);
-                }, 5000);
+                client.radio.save(client);
                client.user.setStatus('online');
+                client.config.maintenanceMode = false;
                break;
            case "5":
+                client.config.maintenanceMode = true;
                client.user.setStatus('idle');
-                let guilds = await client.guilds.fetch();
-                setTimeout(function () {
-                    client.funcs.restoreRadios(client, guilds);
-                }, 5000);
+                client.radio.restore(client, guilds);
                client.user.setStatus('online');
+                client.config.maintenanceMode = false;
                break;
            case "6":
+                client.config.maintenanceMode = true;
                client.user.setStatus('idle');
                require(`../commands.js`).execute(client);
                client.user.setStatus('online');
+                client.config.maintenanceMode = false;
+                break;
+            case "7":
+                try {
+                    client.stations.fetch({
+                        url: client.config.stationslistUrl
+                    });
+                    client.streamer.refresh(client);
+
+                } catch (error) {
+
+                }
                break;
            case "8":
                client.user.setStatus('dnd');
+                client.funcs.logger("Maintenance Mode", "Enabled");
+                client.config.maintenanceMode = true;
                break;
            case "9":
                client.user.setStatus('online');
+                client.funcs.logger("Maintenance Mode", "Disabled");
+                client.config.maintenanceMode = false;
+                break;
+            case "10":
+                client.config.streamerMode = "manual";
+                client.config.maintenanceMode = true;
+
+                client.user.setStatus('idle');
+                client.funcs.saveRadios(client);
+
+                setInterval(() => {
+                    if(client.radio.size == 0 && client.config.streamerMode == "manual" && client.config.maintenanceMode){
+                        client.streamer.leave(client);
+                        client.streamer = new Streamer();
+                        client.streamer.init(client);
+
+                        client.radio.restore(client, guilds);
+                        client.user.setStatus('online');
+                        client.config.maintenanceMode = false;
+                    }
+
+                    if(!client.config.maintenanceMode){
+                        clearInterval();
+                    }
+                }, 500);
+
+                break;
+            case "11":
+                client.config.streamerMode = "auto";
+                client.config.maintenanceMode = true;
+
+                client.user.setStatus('idle');
+                client.funcs.save(client);
+
+                setInterval(() => {
+                    if(client.radio.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){
+                        client.streamer.leave(client);
+                        client.streamer = new Streamer();
+                        client.streamer.init(client);
+
+                        client.radio.restore(client, guilds);
+                        client.user.setStatus('online');
+                        client.config.maintenanceMode = false;
+                    }
+
+                    if(!client.config.maintenanceMode){
+                        clearInterval();
+                    }
+                }, 500);
+
                break;
            default:

        }

-        
-        /*
-        if(!client.stations) {
-            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
-        }
-        
-        let currentRadios = client.radio.keys();
-        let radio = currentRadios.next();
-        let stoppedRadios = "";
-
-        client.user.setStatus('dnd');
-        
-        while (!radio.done) {
-            let currentRadio = client.radio.get(radio.value);
-            currentRadio.guild = client.datastore.getEntry(radio.value).guild;
-
-            if(currentRadio){
-                client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
-                currentRadio.connection?.destroy();
-                currentRadio.audioPlayer?.stop();
-                currentRadio.message?.delete();
-                client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
-            }
-            radio = currentRadios.next();
-        }
-
-        const embed = new Discord.MessageEmbed()
-        .setTitle(client.messages.maintenanceTitle)
-        .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
-        .setColor(client.config.embedColor)
-        .setDescription("Stopped all radios" + "\n" + stoppedRadios)
-        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });*/
-
    }
 };
--- a/src/client/commands/next.js
+++ b/src/client/commands/next.js
@ -1,7 +1,6 @@
 module.exports = {
    name: 'next',
    description: 'Next Station',
-    permission: 'none',
    category: 'radio',
    async execute(interaction, client, command) {
        if (client.funcs.check(client, interaction, command)) {
@ -17,19 +16,20 @@ module.exports = {
                ephemeral: true
            });

-            interaction.deferUpdate();
-
-            let url = station.stream[station.stream.default];
-
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
-            radio.audioPlayer.stop();
+            client.statistics.update(client, interaction.guild, radio);

            let date = new Date();
            radio.station = station;
            radio.textChannel = interaction.channel;
            radio.startTime = date.getTime();
-            client.funcs.play(null, interaction.guild, client, url);

+            if(interaction.isCommand()) {
+                client.funcs.play(client, interaction, interaction.guild, station);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(client, null, interaction.guild, station);
+            }
        }
    }
 }
--- a/src/client/commands/nowplaying.js
+++ b/src/client/commands/nowplaying.js
@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'nowplaying',
    description: 'Current Radio Station',
-    permission: 'none',
    category: 'radio',
    async execute(interaction, client, command) {
        if (client.funcs.check(client, interaction, command)) {
@ -16,7 +15,7 @@ module.exports = {
            const completed = (radio.playTime);

            message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
-            message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
+            message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%" + "\n", radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "");
            message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));

            const embed = new Discord.MessageEmbed()
--- a/src/client/commands/play.js
+++ b/src/client/commands/play.js
@ -1,5 +1,4 @@
 const {
-    createAudioPlayer,
    getVoiceConnection,
    joinVoiceChannel
 } = require("@discordjs/voice");
@ -11,13 +10,23 @@ module.exports = {
    options: [
        { type: "STRING", name: "query", description: "Select station", required: false}
    ],
-    permission: "none",
    category: "radio",
    async execute(interaction, client) {
        let message = {};
+
+        if(client.config.maintenanceMode){
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.maintenance,
+                ephemeral: true
+            });
+        }
+
        if(!client.stations) {
            message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
-            return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + message.errorToGetPlaylist,
+                ephemeral: true
+            });
        }

        let query = interaction.options?.getString("query") ?? interaction.values?.[0];
@ -27,26 +36,32 @@ module.exports = {
        let url = query ? query.replace(/<(.+)>/g, "$1") : "";
        const radio = client.radio.get(interaction.guild.id);
        const voiceChannel = interaction.member.voice.channel;
-        if (!radio) {
-            if (!interaction.member.voice.channel)
-                return interaction.reply({
+        if (!voiceChannel) return interaction.reply({
            content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
            ephemeral: true
        });
-        } else {
-            if (voiceChannel !== radio.voiceChannel)
-                return interaction.reply({
+        if (radio) {
+            if (voiceChannel !== radio.voiceChannel) return interaction.reply({
                content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
                ephemeral: true
            });
        }
-        if (!query) return interaction.reply(client.messages.noQuery);
+        if (!query) return interaction.reply({
+            content: client.messages.noQuery,
+            ephemeral: true
+        });
        const permissions = voiceChannel.permissionsFor(interaction.client.user);
        if (!permissions.has("CONNECT")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsConnect);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsConnect,
+                ephemeral: true
+            });
        }
        if (!permissions.has("SPEAK")) {
-            return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsSpeak);
+            return interaction.reply({
+                content: client.messageEmojis["error"] + client.messages.noPermsSpeak,
+                ephemeral: true
+            });
        }
        let station;
        const number = parseInt(query - 1);
@ -62,34 +77,29 @@ module.exports = {
                    ephemeral: true
                });
            } else {
-                url = client.stations[number].stream[client.stations[number].stream.default];
                station = client.stations[number];
            }
        } else {
-            if (query.length < 3)
-                return interaction.reply({
+            if (query.length < 3) return interaction.reply({
                content: client.messageEmojis["error"] + client.messages.tooShortSearch,
                ephemeral: true
            });
-            const sstation = await client.funcs.searchStation(query, client);
-            if (!sstation)
-                return interaction.reply({
+            const sstation = await client.stations.search(query, client);
+            if (!sstation) return interaction.reply({
                content: client.messageEmojis["error"] + client.messages.noSearchResults,
                ephemeral: true
            });
-            url = sstation.stream[sstation.stream.default];
            station = sstation;
        }

        if (radio) {
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
-            radio.audioPlayer.stop();
+            client.statistics.update(client, interaction.guild, radio);

            let date = new Date();
            radio.station = station;
            radio.textChannel = interaction.channel;
            radio.startTime = date.getTime();
-            client.funcs.play(interaction, interaction.guild, client, url);
+            client.funcs.play(client, interaction, interaction.guild, station);

            return;
        }
@ -99,7 +109,6 @@ module.exports = {
            voiceChannel: voiceChannel,
            connection: null,
            message: null,
-            audioPlayer: createAudioPlayer(),
            station: station
        };
        client.radio.set(interaction.guild.id, construct);
@ -115,21 +124,15 @@ module.exports = {
            construct.connection = connection;
            let date = new Date();
            construct.startTime = date.getTime();
-            client.funcs.play(interaction, interaction.guild, client, url);
-
            client.datastore.checkEntry(interaction.guild.id);
-            construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
-
-            if (!construct.currentGuild.statistics[construct.station.name]) {
-                construct.currentGuild.statistics[construct.station.name] = {};
-                construct.currentGuild.statistics[construct.station.name].time = 0;
-                construct.currentGuild.statistics[construct.station.name].used = 0;
-                client.datastore.updateEntry(interaction.guild, construct.currentGuild);
-            }
+            client.funcs.play(client, interaction, interaction.guild, station);
        } 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
+            });
        }
    }
 };
--- a/src/client/commands/prev.js
+++ b/src/client/commands/prev.js
@ -1,7 +1,6 @@
 module.exports = {
    name: 'prev',
    description: 'Previous Station',
-    permission: 'none',
    category: 'radio',
    async execute(interaction, client, command) {
        if (client.funcs.check(client, interaction, command)) {
@ -17,18 +16,20 @@ module.exports = {
                ephemeral: true
            });

-            interaction.deferUpdate();
-
-            let url = station.stream[station.stream.default];
-
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
-            radio.audioPlayer.stop();
+            client.statistics.update(client, interaction.guild, radio);

            let date = new Date();
            radio.station = station;
            radio.textChannel = interaction.channel;
            radio.startTime = date.getTime();
-            client.funcs.play(null, interaction.guild, client, url);
+
+            if(interaction.isCommand()) {
+                client.funcs.play(client, interaction, interaction.guild, station);
+            }
+            if(interaction.isButton()) {
+                interaction.deferUpdate();
+                client.funcs.play(client, null, interaction.guild, station);
+            }

        }
    }
--- a/src/client/commands/statistics.js
+++ b/src/client/commands/statistics.js
@ -4,7 +4,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'statistics',
    description: 'Show statistics',
-    permission: 'none',
    category: 'info',
    execute(interaction, client) {
        let message = {};
@ -15,7 +14,10 @@ module.exports = {

        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){
--- a/src/client/commands/status.js
+++ b/src/client/commands/status.js
@ -3,7 +3,6 @@ import Discord from "discord.js";
 module.exports = {
    name: 'status',
    description: 'Bot Status',
-    permission: 'none',
    category: 'info',
    async execute(interaction, client) {
        let message = {};
@ -15,11 +14,11 @@ module.exports = {
            .setTitle(message.statusTitle)
            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
            .setColor(client.config.embedColor)
-            .addField(client.messages.statusField1, Date.now() - interaction.createdTimestamp + "ms", true)
-            .addField(client.messages.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)
+            .addField(client.messages.statusField1, uptime, false)
+            .addField(client.messages.statusField2, client.config.version, false)
+            .addField(client.messages.statusField3, Date.now() - interaction.createdTimestamp + "ms", false)
+            .addField(client.messages.statusField4, client.ws.ping + "ms", false)
+            .addField(client.messages.statusField5, client.config.hostedBy, false)
            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));

--- a/src/client/commands/stop.js
+++ b/src/client/commands/stop.js
@ -3,15 +3,13 @@ import Discord from "discord.js";
 module.exports = {
    name: 'stop',
    description: 'Stop radio',
-    permission: 'none',
    category: 'radio',
    async execute(interaction, client, command) {
-        const radio = client.radio.get(interaction.guild.id);
        if (client.funcs.check(client, interaction, command)) {
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            const radio = client.radio.get(interaction.guild.id);
+            client.statistics.update(client, interaction.guild, radio);
            radio.connection?.destroy();
-            radio.audioPlayer?.stop();
-            client.funcs.logger('Radio', 'Stream stopped' + " / " + interaction.guild.id);
+            client.funcs.logger('Radio', interaction.guild.id + " / " + 'Stop');

            const embed = new Discord.MessageEmbed()
                .setTitle(client.user.username)
@ -24,7 +22,11 @@ module.exports = {
            if(!radio.message){
                radio.message = radio.textChannel.send({ embeds: [embed], components: [] });
            } else {
+                if(radio.textChannel.id == radio.message.channel.id){
                    radio.message.edit({ embeds: [embed], components: [] });
+                } else {
+                    radio.message?.delete();
+                }
            }

            setTimeout(async function() {
--- a/src/client/datastore.js
+++ b/src/client/datastore.js
@ -1,136 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-module.exports = class {
-    constructor() {
-        this.map = new Map();
-        this.loadData();
-    }
-    
-    loadData() {
-        const dir = path.join(path.dirname(__dirname), '../datastore');
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir);
-        }
-        //console.log("");
-        const dataFiles = fs.readdirSync(path.join(path.dirname(__dirname), '../datastore')).filter(f => f.endsWith('.json'));
-        for (const file of dataFiles) {
-            try {
-                const json = require(`../../datastore/${file}`);
-                this.map.set(json.guild.id, json);
-                //console.log('[LOADED] ' + file + " (" + json.guild.id + ")");
-                //console.log(JSON.stringify(json, null, 4));
-            } catch (error) {
-                //console.log('[ERROR] Loading ' + file + ' failed');
-            }
-        }
-        //console.log("");
-    }
-
-    calculateGlobal(client){
-        let guilds = this.map.keys();
-        let stations = client.stations;
-        var statistics = {};
-
-        if(!client.stations) return;
-        
-        let calculation = guilds.next();
-
-        while (!calculation.done) {
-            let currentGuild = this.getEntry(calculation.value);
-            if(calculation.value != 'global'){
-                if(stations){
-                    Object.keys(stations).forEach(function(station) {
-                        if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) != 0  && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) != 0){
-                            if(!statistics[stations[station].name]){
-                                statistics[stations[station].name] = {};
-                                statistics[stations[station].name].time = 0;
-                                statistics[stations[station].name].used = 0;
-                            }
-                        
-                            statistics[stations[station].name].time = parseInt(statistics[stations[station].name].time)+parseInt(currentGuild.statistics[stations[station].name].time);
-                            statistics[stations[station].name].used = parseInt(statistics[stations[station].name].used)+parseInt(currentGuild.statistics[stations[station].name].used);
-                        }
-                    });
-                }
-            }
-            calculation = guilds.next();
-        }
-
-        let newData = {};
-        newData.guild = {};
-        newData.guild.id = "global";
-        newData.guild.name = "global";
-        newData.statistics = statistics;
-        this.updateEntry(newData.guild, newData);
-    }
-
-
-    checkEntry(id){
-        if(!this.map.has(id)){
-            this.createEntry(id);
-            //this.showEntry(this.getEntry(id));
-        } else {
-            //this.showEntry(this.getEntry(id));
-        }
-    }
-
-    createEntry(id){
-        let newData = {};
-        newData.guild = {};
-        newData.guild.id = id;
-        newData.statistics = {};
-        newData.state = {};
-        this.map.set(id, newData);
-        this.saveEntry(id, newData);
-    }
-    
-    getEntry(id){
-        return this.map.get(id);
-    }
-    
-    updateEntry(guild, newData) {
-        newData.guild.name = guild.name;
-
-        let date = new Date();
-        newData.updated = date.toISOString().substring(0, 10)
-        
-        this.map.set(guild.id, newData);
-        this.saveEntry(guild.id, newData);
-        //this.showEntry(this.getEntry(guild.id));
-    }
-    
-    showEntry(data){
-        console.log(data);
-    }
-    
-    createTestFile () {
-        let newData = {
-            "guild": {
-                "id": "test",
-                "name": "Test"
-            },
-            "statistics": {
-                "test": {
-                    "time": 0,
-                    "used": 0
-                }
-            },
-            "state": {
-
-            }
-        }
-        
-        this.updateEntry(newData.guild, newData);
-    }
-    
-    saveEntry(file, data) {
-        data = JSON.stringify(data, null, 4);
-
-        fs.writeFile(path.join(path.dirname(__dirname), '../datastore') + "/" + file + ".json", data, 'utf8', function(err) {
-            if (err) {
-                //console.log(err);
-            }
-        });
-    }
-};
--- a/src/client/events/SIGINT.js
+++ b/src/client/events/SIGINT.js
@ -1,23 +1,15 @@
-const { REST } = require('@discordjs/rest');
-const { Routes } = require('discord-api-types/v9');
-const { token, version } = require('../../config.js');
-
 module.exports = {
    name: 'SIGINT',
-    async execute(client) {
+    execute(client) {
        client.user.setStatus('dnd');

-        console.log("\n");
-        client.funcs.logger("Bot", "Closing");
-        console.log("\n");
+        client.streamer.leave(client);
+        client.radio.save(client);

-        setTimeout(async function () {
-            let message = {};
-
-            if (!client.stations) return process.exit();
-
-            await client.funcs.saveRadios(client);
-            await process.exit();
-        }, 5000);
+        setInterval(() => {
+            if(client.radio.size == 0){
+                process.exit();
+            }
+        }, 500);
    }
 }
--- a/src/client/events/SIGTERM.js
+++ b/src/client/events/SIGTERM.js
@ -1,6 +1,6 @@
 module.exports = {
    name: 'SIGTERM',
-    async execute(client) {
+    execute(client) {
        process.emit('SIGINT');
    }
 }
--- a/src/client/events/interactionCreate.js
+++ b/src/client/events/interactionCreate.js
@ -6,7 +6,7 @@ module.exports = {
        if (!permissions.has('VIEW_CHANNEL')) return;

        if (!permissions.has('EMBED_LINKS')) return interaction.reply({
-            content: client.messages.noPermsEmbed,
+            content: client.messageEmojis["error"] + client.messages.noPermsEmbed,
            ephemeral: true
        });

@ -19,7 +19,7 @@ module.exports = {
                command.execute(interaction, client);
            } catch (error) {
                interaction.reply({
-                    content: client.messages.runningCommandFailed,
+                    content: client.messageEmojis["error"] + client.messages.runningCommandFailed,
                    ephemeral: true
                });
                console.error(error);
@ -33,7 +33,7 @@ module.exports = {
                command.execute(interaction, client, command);
            } catch (error) {
                interaction.reply({
-                    content: client.messages.runningCommandFailed,
+                    content: client.messageEmojis["error"] + client.messages.runningCommandFailed,
                    ephemeral: true
                });
                console.error(error);
--- a/src/client/events/messageCreate.js
+++ b/src/client/events/messageCreate.js
@ -41,8 +41,11 @@ module.exports = {

            let msg = await message.channel.send({ embeds: [embed] });

-            setTimeout(function() {
-                msg.delete();
+            setTimeout(async function() {
+                try {
+                    await msg.delete();
+                } catch (DiscordAPIError) {
+                }
            }, 30000);
        } catch (error) {
            message.reply({
--- a/src/client/events/ready.js
+++ b/src/client/events/ready.js
@ -1,5 +1,8 @@
-import Datastore from "../datastore.js";
-import fetch from "node-fetch";
+import Datastore from "../classes/Datastore.js";
+import Radio from "../classes/Radio.js";
+import Stations from "../classes/Stations.js";
+import Streamer from "../classes/Streamer.js";
+import Statistics from "../classes/Statistics.js";

 module.exports = {
    name: 'ready',
@ -36,38 +39,21 @@ module.exports = {
        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.stations = new Stations();

-            client.funcs.logger('Stations');
-            client.stations.forEach(station => {
-                console.log("- " + station.name);
+        await client.stations.fetch({
+            url: client.config.stationslistUrl
        });
-            console.log("\n");
-
-            client.funcs.logger('Stations', 'Successfully fetched list');
-        } catch (error) {
-            client.funcs.logger('Stations', 'Fetching list failed');
-            console.error(error + "\n");
-        }

        setInterval(async () => {
-            try {
-                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');
-                //console.error(error);
-            }
+            await client.stations.fetch({
+                url: client.config.stationslistUrl
+            });
        }, 3600000);

+        client.streamer = new Streamer();
+        client.streamer.init(client);
+
        if(!client.stations) {
            client.user.setStatus('dnd');
        }
@ -85,7 +71,8 @@ module.exports = {
        client.funcs.logger('Guilds', 'Successfully fetched list');

        /*STATISTICS*/
-        client.datastore.calculateGlobal(client);
+        client.statistics = new Statistics();
+        client.statistics.calculateGlobal(client);

        /*EMOJIS*/
        require(`../emojis.js`).execute(client);
@ -93,10 +80,21 @@ module.exports = {
        /*COMMANDS*/
        require(`../commands.js`).execute(client);

+        /*RADIO*/
+        client.radio = new Radio();
+
        setTimeout(function () {
            /*RESTORE RADIOS*/
-            client.funcs.restoreRadios(client, guilds);
+            client.radio.restore(client, guilds);
        }, 5000);

+        setTimeout(function () {
+            if(client.stations) {
+                /*MAINTENANCE MODE*/
+                client.funcs.logger("Maintenance Mode", "Disabled");
+                client.config.maintenanceMode = false;
+            }
+        }, 10000);
+
    }
 }
--- a/src/client/events/uncaughtException.js
+++ b/src/client/events/uncaughtException.js
@ -0,0 +1,10 @@
+module.exports = {
+    name: 'uncaughtException',
+    execute(client, error) {
+        client.funcs.logger("Error");
+        console.log(error.stack);
+        console.log('');
+
+        process.emit('SIGINT');
+    }
+}
--- a/src/client/events/voiceStateUpdate.js
+++ b/src/client/events/voiceStateUpdate.js
@ -14,11 +14,10 @@ module.exports = {
        if (newState.member.id === client.user.id && oldState.member.id === client.user.id) {

            if (newState.channel === null) {
-                client.funcs.statisticsUpdate(client, newState.guild, radio);
+                client.statistics.update(client, newState.guild, radio);
                radio.connection?.destroy();
-                radio.audioPlayer?.stop();
                radio.message?.delete();
-                client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                return client.radio.delete(newState.guild.id);
            }

@ -37,11 +36,10 @@ module.exports = {
                        1000
                    );
                } catch (error) {
-                    client.funcs.statisticsUpdate(client, newState.guild, radio);
+                    client.statistics.update(client, newState.guild, radio);
                    radio.connection?.destroy();
-                    radio.audioPlayer?.stop();
                    radio.message?.delete();
-                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                    client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                    client.radio.delete(oldState.guild.id);
                }
                return;
@ -53,18 +51,17 @@ module.exports = {
                //radio.connection = await newState.channel.join();
            }
        }
-        if ((oldState.channel.members.size === 1 && oldState.channel === radio.voiceChannel) || change) {
+        if ((oldState.channel.members.filter(member => !member.user.bot).size === 0 && oldState.channel === radio.voiceChannel) || change) {
            setTimeout(() => {
                if (!radio || !radio.connection || !radio.connection === null) return;
-                if (radio.voiceChannel.members.size === 1) {
-                    client.funcs.statisticsUpdate(client, newState.guild, radio);
+                if (radio.voiceChannel.members.filter(member => !member.user.bot).size === 0) {
+                    client.statistics.update(client, newState.guild, radio);
                    radio.connection?.destroy();
-                    radio.audioPlayer?.stop();
                    radio.message?.delete();
-                    client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
+                    client.funcs.logger('Radio', newState.guild.id + " / " + 'Stop');
                    client.radio.delete(newState.guild.id);
                }
-            }, 60000);
+            }, 5000);
        }
    },
 };
--- a/src/client/events/warning.js
+++ b/src/client/events/warning.js
@ -0,0 +1,12 @@
+module.exports = {
+    name: 'warning',
+    execute(client, warning) {
+        if(warning.name == "ExperimentalWarning" && warning.message.startsWith("stream/web")) return;
+
+        client.funcs.logger("Warning");
+        console.warn(warning.name);
+        console.warn(warning.message);
+        console.warn(warning.stack);
+        console.log('');
+    }
+}
--- a/src/client/funcs/check.js
+++ b/src/client/funcs/check.js
@ -1,7 +1,14 @@
-module.exports = function (client, interaction, command) {
+module.exports = function check(client, interaction, command) {
    let message = {};
    const radio = client.radio.get(interaction.guild.id);
    const permissions = interaction.channel.permissionsFor(interaction.user);
+    if(client.config.maintenanceMode){
+        interaction.reply({
+            content: client.messageEmojis["error"] + client.messages.maintenance,
+            ephemeral: true
+        });
+        return false;
+    }
    if(!client.stations) {
        message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
        interaction.reply({
@ -24,14 +31,6 @@ module.exports = function (client, interaction, command) {
        });
        return false;
    }
-    if(!command.permission == 'none'){
-        if (!permissions.has(command.permission)) {
-            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;
+
+    return true;
 };
--- a/src/client/funcs/checkFetchStatus.js
+++ b/src/client/funcs/checkFetchStatus.js
@ -1,7 +0,0 @@
-module.exports = function (response) {
-    if (response.ok) { // res.status >= 200 && res.status < 300
-        return response;
-    } else {
-        throw new Error(response.status + " " + response.statusText);
-    }
-}
--- a/src/client/funcs/isDev.js
+++ b/src/client/funcs/isDev.js
@ -1,4 +1,4 @@
-module.exports = function (devList, authorID){
+module.exports = function isDev(devList, authorID){
    let response = false;
    Object.keys(devList).forEach(function(oneDev) {
        let devID = devList[oneDev];
--- a/src/client/funcs/listStations.js
+++ b/src/client/funcs/listStations.js
@ -1,6 +1,6 @@
 import Discord from "discord.js";

-module.exports = function (client, interaction){
+module.exports = function listStations(client, interaction){
    let stations = new Array();
    let options = new Array();

--- a/src/client/funcs/logger.js
+++ b/src/client/funcs/logger.js
@ -1,4 +1,4 @@
-module.exports = function (area, text){
+module.exports = function logger(area, text){
    let date = new Date();
    console.log('[' + area + '] – ' + date.toISOString());
    if(text)  console.log(text + '\n');
--- a/src/client/funcs/play.js
+++ b/src/client/funcs/play.js
@ -1,39 +1,15 @@
 import Discord from "discord.js";
-const {
-    createAudioResource
-} = require("@discordjs/voice");

-module.exports = async function play(interaction, guild, client, url) {
+module.exports = async function play(client, interaction, guild, station) {
    let message = {};
    const radio = client.radio.get(guild.id);
-    const resource = createAudioResource(url);
-    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);
-        });
+    const audioPlayer = client.streamer.listen(station);
+    radio.connection.subscribe(audioPlayer);
+    client.funcs.logger('Radio', guild.id + " / " + "Play" + " / " + radio.station.name);

    message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
-    message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
+    message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "");
    message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
-    message.nowplayingDescription = message.nowplayingDescription.replace("Owner: ", "");
    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
    message.nowplayingDescription = message.nowplayingDescription.replace("**", "");

@ -80,7 +56,12 @@ module.exports = async function play(interaction, guild, client, url) {
    if(!radio.message){
        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
    } else {
+        if(radio.textChannel.id == radio.message.channel.id){
            radio.message.edit({ embeds: [embed], components: [buttons] });
+        } else {
+            radio.message?.delete();
+            radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+        }
    }

    message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
--- a/src/client/funcs/restoreRadios.js
+++ b/src/client/funcs/restoreRadios.js
@ -1,62 +0,0 @@
-import Discord from "discord.js";
-const {
-    createAudioPlayer,
-    getVoiceConnection,
-    joinVoiceChannel
-} = require("@discordjs/voice");
-
-module.exports = async function restoreRadios(client, guilds) {
-    if(!client.stations) return;
-
-    guilds.forEach(async guild => {
-        let state = client.funcs.loadState(client, guild);
-        if(!state) return;
-        if(!state.station || !state.channels.voice || !state.channels.text) return;
-        let voiceChannel = client.channels.cache.get(state.channels.voice);
-        if(!voiceChannel) return;
-        if(voiceChannel.members.size === 0) return;
-
-
-        const sstation = await client.funcs.searchStation(state.station.name, client);
-        let url = sstation.stream[sstation.stream.default];
-        let station = sstation;
-
-        const construct = {
-            textChannel: client.channels.cache.get(state.channels.text),
-            voiceChannel: client.channels.cache.get(state.channels.voice),
-            connection: null,
-            message: null,
-            audioPlayer: createAudioPlayer(),
-            station: station
-        };
-        client.radio.set(guild.id, construct);
-
-        try {
-            const connection =
-                getVoiceConnection(guild.id) ??
-                joinVoiceChannel({
-                    channelId: voiceChannel.id,
-                    guildId: voiceChannel.guild.id,
-                    adapterCreator: voiceChannel.guild.voiceAdapterCreator
-                });
-
-            construct.connection = connection;
-            let date = new Date();
-            construct.startTime = date.getTime();
-            
-            client.funcs.play(null, guild, client, url, Discord);
-
-            client.datastore.checkEntry(guild.id);
-            construct.datastore = client.datastore.getEntry(guild.id);
-
-            if (!construct.datastore.statistics[construct.station.name]) {
-                construct.datastore.statistics[construct.station.name] = {};
-                construct.datastore.statistics[construct.station.name].time = 0;
-                construct.datastore.statistics[construct.station.name].used = 0;
-                client.datastore.updateEntry(guild, construct.datastore);
-            }
-        } catch (error) {
-            console.log(error);
-        }
-    });
-}
--- a/src/client/funcs/saveRadios.js
+++ b/src/client/funcs/saveRadios.js
@ -1,20 +0,0 @@
-module.exports =  async function saveRadios(client) {
-    let currentRadios = client.radio.keys();
-    let radio = currentRadios.next();
-    
-    while (!radio.done) {
-        let currentRadio = client.radio.get(radio.value);
-        currentRadio.guild = client.datastore.getEntry(radio.value).guild;
-    
-        if (currentRadio) {
-            await client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
-            await client.funcs.saveState(client, currentRadio.guild, currentRadio);
-            currentRadio.connection?.destroy();
-            currentRadio.audioPlayer?.stop();
-            currentRadio.message?.delete();
-            client.radio.delete(radio.value);
-        }
-        
-        radio = currentRadios.next();
-    }
-}
--- a/src/client/funcs/searchStation.js
+++ b/src/client/funcs/searchStation.js
@ -1,62 +0,0 @@
-module.exports = function searchStation(key, client) {
-    if (client.stations === null) return false;
-    let foundStations = [];
-    if (!key) return false;
-    if (key == "radio") return false;
-
-    client.stations
-        .filter(
-            x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
-        )
-        .forEach(x =>
-            foundStations.push({ station: x, name: x.name, probability: 100 })
-        );
-
-    if (key.startsWith("radio ")) key = key.slice(6);
-    const probabilityIncrement = 100 / key.split(" ").length / 2;
-    for (let i = 0; i < key.split(" ").length; i++) {
-        client.stations
-            .filter(
-                x => x.name.toUpperCase().includes(key.split(" ")[i].toUpperCase()) || x === key
-            )
-            .forEach(x =>
-                foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
-            );
-    }
-    if (foundStations.length === 0) return false;
-    for (let i = 0; i < foundStations.length; i++) {
-        for (let j = 0; j < foundStations.length; j++) {
-            if (foundStations[i] === foundStations[j] && i !== j) foundStations.splice(i, 1);
-        }
-    }
-    for (let i = 0; i < foundStations.length; i++) {
-        if (foundStations[i].name.length > key.length) {
-            foundStations[i].probability -=
-                (foundStations[i].name.split(" ").length - key.split(" ").length) *
-                (probabilityIncrement * 0.5);
-        } else if (foundStations[i].name.length === key.length) {
-            foundStations[i].probability += probabilityIncrement * 0.9;
-        }
-
-        for (let j = 0; j < key.split(" ").length; j++) {
-            if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
-                foundStations[i].probability -= probabilityIncrement * 0.5;
-            }
-        }
-    }
-    let highestProbabilityStation;
-    for (let i = 0; i < foundStations.length; i++) {
-        if (
-            !highestProbabilityStation ||
-            highestProbabilityStation.probability < foundStations[i].probability
-        )
-            highestProbabilityStation = foundStations[i];
-        if (
-            highestProbabilityStation &&
-            highestProbabilityStation.probability === foundStations[i].probability
-        ) {
-            highestProbabilityStation = foundStations[i].station;
-        }
-    }
-    return highestProbabilityStation;
-}
--- a/src/client/funcs/statisticsUpdate.js
+++ b/src/client/funcs/statisticsUpdate.js
@ -1,22 +0,0 @@
-module.exports = function statisticsUpdate(client, guild, radio) {
-    
-    client.datastore.checkEntry(guild.id);
-    
-    radio.datastore = client.datastore.getEntry(guild.id);
-    
-    if(!radio.datastore.statistics[radio.station.name]){
-        radio.datastore.statistics[radio.station.name] = {};
-        radio.datastore.statistics[radio.station.name].time = 0;
-        radio.datastore.statistics[radio.station.name].used = 0;
-        client.datastore.updateEntry(guild, radio.datastore);
-    }
-    
-    let date = new Date();
-    radio.currentTime = date.getTime();
-    radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
-    radio.datastore.statistics[radio.station.name].time = parseInt(radio.datastore.statistics[radio.station.name].time)+parseInt(radio.playTime);
-    
-    radio.datastore.statistics[radio.station.name].used = parseInt(radio.datastore.statistics[radio.station.name].used)+1;
-    client.datastore.updateEntry(guild, radio.datastore);
-    client.datastore.calculateGlobal(client);
-}
--- a/src/client/messages.js
+++ b/src/client/messages.js
@ -11,7 +11,7 @@ module.exports = {
    inviteTitle: "Invite %client.user.username% to your Discord server!",
    listTitle: "Radio Stations",
    nowplayingTitle: "Now Playing",
-    nowplayingDescription: "**%radio.station.name%**" + "\n" + "Owner: %radio.station.owner%" + "\n" + "%client.funcs.msToTime(completed)%",
+    nowplayingDescription: "**%radio.station.name%**" + "\n" + "%radio.station.owner%" + "\n" + "%client.funcs.msToTime(completed)%",
    noVoiceChannel: "You need to be in a voice channel to play radio!",
    noQuery: "You need to use a number or search for a supported station!",
    noPermsConnect: "I cannot connect to your voice channel.",
@ -29,12 +29,13 @@ module.exports = {
    sendedMaintenanceMessage: "This bot is going to be under maintenance!",
    footerText: "EximiaBots by Warén Group",
    statusTitle: "%client.user.username% Status",
-    statusField1: "Bot Latency",
-    statusField2: "API Latency",
-    statusField3: "Uptime",
-    statusField4: "Version",
-    statusField5: "Hosted by",
+    statusField1: ":clock1: Bot Uptime",
+    statusField2: ":floppy_disk: Bot Version",
+    statusField3: ":heartbeat: WebSocket Ping",
+    statusField4: ":hourglass: Latency",
+    statusField5: ":globe_with_meridians: Hosted by",
    errorStationURL: "Station can't be URL",
    messageCommandsDeprecatedTitle: "%client.user.username%",
-    messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released."
+    messageCommandsDeprecatedDescription: "We recommend you to reauthorize our bot by clicking the invite link down below, because Discord is planning to remove message content from verified bots [Read More](https://support-dev.discord.com/hc/en-us/articles/4404772028055)" + "\n\n" + "**Invite Bot**" + "\n" + "https://wgi.fi/radiox_invite" + "\n\n" + "This bot now supports slash commands, you should start using them instead. Type / into the message box and select the bot you wish to use. Remember to be careful as there are a few bugs here and there on Discord." + "\n\n" + "We will remove this deprecation message in March of 2022 when RadioX 1.0.0 is released.",
+    maintenance: "Shhhh... We are now sleeping and dreaming about new features to implement. Will be back soon."
 };
--- a/src/config.js
+++ b/src/config.js
@ -20,7 +20,9 @@ module.exports = {
    hostedBy: "[Warén Group](https://waren.io)",

    //Settings
-    version: process.env.RADIOX_VERSION || process.env.npm_package_version,
-    debug: process.env.DEBUG_MODE || false
-
+    version: process.env.DEV_MODE ? process.env.npm_package_version + "-dev" : process.env.npm_package_version,
+    debug: process.env.DEBUG_MODE || false,
+    devMode: process.env.DEV_MODE || false,
+    maintenanceMode: false,
+    streamerMode: process.env.STREAMER_MODE || "manual"
 }