Merge pull request #234 from warengroup/develop

Version 0.3.17

.github/workflows/codeql-analyze.yml

@@ -13,7 +13,7 @@ name: "CodeQL Analyze"
 
 on:
   push:
-    branches: [ master, stable ]
+    branches: [ develop ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]

.github/workflows/dependabot_auto-merge.yml

@@ -0,0 +1,18 @@
+name: Dependabot Auto-Merge
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    name: Dependabot Auto-Merge
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request_target.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/typescript-build.yml

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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 EximiaBots by Warén Group
+Copyright (c) 2020-2022 EximiaBots by Warén Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.12",
+  "version": "0.3.17",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -18,31 +18,31 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^0.8.2",
+    "@discordjs/builders": "^0.12.0",
     "@discordjs/opus": "^0.7.0",
-    "@discordjs/rest": "^0.1.1-canary.0",
-    "@discordjs/voice": "^0.7.5",
-    "discord-api-types": "^0.24.0",
-    "discord.js": "^13.2.0",
-    "dotenv": "^10.0.0",
+    "@discordjs/rest": "^0.3.0",
+    "@discordjs/voice": "^0.8.0",
+    "discord-api-types": "^0.27.3",
+    "discord.js": "^13.6.0",
+    "dotenv": "^16.0.0",
     "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^3.1.0",
+    "node-fetch": "^3.2.0",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.11.10",
-    "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.3.0",
-    "eslint-config-prettier": "^8.3.0",
+    "@types/node": "^17.0.21",
+    "@types/ws": "^8.5.1",
+    "@typescript-eslint/eslint-plugin": "^5.12.0",
+    "@typescript-eslint/parser": "^5.12.0",
+    "eslint": "^8.9.0",
+    "eslint-config-prettier": "^8.4.0",
     "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.15",
-    "prettier": "^2.5.0",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
-    "tsc-watch": "^4.5.0",
-    "typescript": "^4.5.2"
+    "ts-node": "^10.5.0",
+    "tsc-watch": "^4.6.0",
+    "typescript": "^4.5.5"
   },
   "engines": {
       "node": ">=16.9.1",

src/Client.ts

@@ -52,7 +52,7 @@ class RadioClient extends Client {
 
         console.log('RadioX ' + this.config.version);
         console.log('Internet Radio to your Discord guild');
-        console.log('(c)2020-2021 EximiaBots by Warén Group');
+        console.log('(c)2020-2022 EximiaBots by Warén Group');
         console.log('');
 
         this.funcs.logger("Bot", "Starting");

src/client/classes/Streamer.js

@@ -70,17 +70,6 @@ module.exports = class {
         const url = station.stream[station.stream.default];
         const resource = createAudioResource(url);
         audioPlayer.play(resource);
-        resource.playStream
-            .on("readable", () => {
-                this.logger('Streamer', station.name + " / " + "Readable");
-            })
-            .on("finish", () => {
-                this.logger('Streamer', station.name + " / " + "Finished");
-            })
-            .on("error", error => {
-                this.logger('Streamer', station.name + " / " + "Error" + "\n" + error);
-            });
-
         audioPlayer
             .on('playing', () => {
 	            this.logger('Streamer', station.name + " / " + "Playing");
@@ -88,6 +77,7 @@ module.exports = class {
             .on('idle', () => {
                 this.logger('Streamer', station.name + " / " + "Idle");
                 audioPlayer.removeAllListeners();
+                if(this.mode == "manual" && audioPlayer.subscribers.length == 0) return;
                 this.play(station);
             })
             .on('paused', () => {
@@ -117,15 +107,12 @@ module.exports = class {
 
     listen(station) {
         let audioPlayer = this.map.get(station.name);
-        if(!audioPlayer){
-            audioPlayer = this.play(station);
-        }
+        if(!audioPlayer || this.mode == "manual" && audioPlayer.subscribers.length == 0) audioPlayer = this.play(station);
         return audioPlayer;
     }
 
     leave(client) {
         if(!client.stations) return;
-
         client.stations.forEach(station => {
             this.stop(station);
         });

src/client/commands.js

@@ -60,6 +60,17 @@ module.exports = {
                         Routes.applicationCommands(client.user.id),
                         { body: commands }
                     );
+
+                    let guilds = await client.guilds.fetch();
+                    guilds.forEach(async guild => {
+                        try {
+                            await rest.put(
+                                Routes.applicationGuildCommands(client.user.id, guild.id),
+                                { body: [] }
+                            );
+                        } catch (DiscordAPIError) {
+                        }
+                    });
                 }
 
                 client.funcs.logger('Slash Commands', 'Successfully reloaded application (/) commands.' + "\n");

src/client/events/uncaughtException.js

@@ -5,6 +5,7 @@ module.exports = {
         console.log(error.stack);
         console.log('');
 
+        if(error.name == "DiscordAPIError" && error.message == "Unknown interaction") return;
         process.emit('SIGINT');
     }
 }