Merge branch 'develop' into fix-33

.gitignore

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

.vscode/settings.json

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

package-lock.json

@@ -13,7 +13,7 @@
         "@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",
@@ -21,7 +21,7 @@
         "path": "^0.12.7"
       },
       "devDependencies": {
-        "@types/node": "^16.7.13",
+        "@types/node": "^16.9.0",
         "@types/ws": "^7.4.7",
         "@typescript-eslint/eslint-plugin": "^4.31.0",
         "@typescript-eslint/parser": "^4.31.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",
@@ -259,6 +267,14 @@
         "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",
@@ -297,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",
@@ -476,9 +500,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.7.13",
+      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
-      "integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
+      "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="
     },
     "node_modules/@types/ws": {
       "version": "7.4.7",
@@ -1309,9 +1333,9 @@
       }
     },
     "node_modules/discord-api-types": {
-      "version": "0.22.0",
+      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
-      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==",
+      "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==",
       "engines": {
         "node": ">=12"
       }
@@ -1351,6 +1375,14 @@
         "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",
@@ -2897,9 +2929,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.3.2",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
-      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+      "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -3943,9 +3975,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.4",
+      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-      "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -4096,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": {
@@ -4160,6 +4199,11 @@
         "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",
@@ -4190,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",
@@ -4320,9 +4369,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.7.13",
+      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.13.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
-      "integrity": "sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA=="
+      "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="
     },
     "@types/ws": {
       "version": "7.4.7",
@@ -4918,9 +4967,9 @@
       }
     },
     "discord-api-types": {
-      "version": "0.22.0",
+      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz",
-      "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg=="
+      "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ=="
     },
     "discord.js": {
       "version": "13.1.0",
@@ -4949,6 +4998,11 @@
             "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",
@@ -6123,9 +6177,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.3.2",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
-      "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+      "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -6890,9 +6944,9 @@
       }
     },
     "ws": {
-      "version": "7.5.4",
+      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-      "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
       "requires": {}
     },
     "xdg-basedir": {

package.json

@@ -22,7 +22,7 @@
     "@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",
@@ -30,7 +30,7 @@
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.7.13",
+    "@types/node": "^16.9.0",
     "@types/ws": "^7.4.7",
     "@typescript-eslint/eslint-plugin": "^4.31.0",
     "@typescript-eslint/parser": "^4.31.0",

src/Client.ts

@@ -90,6 +90,10 @@ class RadioClient extends Client {
             require(`${events}uncaughtException`).execute(this, error);
         });
 
+        process.on('exit', () => {
+            this.funcs.logger("Bot", "Stopping");
+        });
+
         this.on("error", error => {
             console.error(error);
         });

src/client/commands/maintenance.js

@@ -133,46 +133,5 @@ 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);
-        }
-        
-        let currentRadios = client.radio.keys();
-        let radio = currentRadios.next();
-        let stoppedRadios = "";
-
-        client.user.setStatus('dnd');
-        
-        while (!radio.done) {
-            let currentRadio = client.radio.get(radio.value);
-            currentRadio.guild = client.datastore.getEntry(radio.value).guild;
-
-            if(currentRadio){
-                client.funcs.statisticsUpdate(client, currentRadio.guild, currentRadio);
-                currentRadio.connection?.destroy();
-                currentRadio.audioPlayer?.stop();
-                currentRadio.message?.delete();
-                client.radio.delete(radio.value);
-                stoppedRadios += "-" + radio.value + ": " + currentRadio.guild.name + "\n";
-            }
-            radio = currentRadios.next();
-        }
-
-        const embed = new Discord.MessageEmbed()
-        .setTitle(client.messages.maintenanceTitle)
-        .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
-        .setColor(client.config.embedColor)
-        .setDescription("Stopped all radios" + "\n" + stoppedRadios)
-        .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });*/
-
     }
 };

src/client/events/SIGINT.js

@@ -3,10 +3,6 @@ module.exports = {
     execute(client) {
         client.user.setStatus('dnd');
 
-        console.log("\n");
-        client.funcs.logger("Bot", "Closing");
-        console.log("\n");
-
         client.funcs.saveRadios(client);
 
         setInterval(() => {