Merge pull request #209 from warengroup/develop

Version 0.3.15

.env_example

@@ -1,5 +1,5 @@
 DISCORD_TOKEN=
-RADIOX_STATIONSLISTURL=https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json
+RADIOX_STATIONSLISTURL=https://git.cwinfo.net/cwchristerw/radio/raw/branch/master/playlist.json
 DEV_MODE=false
 DEBUG_MODE=false
 STREAMER_MODE=manual

.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,22 @@
+name: Dependabot Auto-Merge
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.1.1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.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.0
+      uses: actions/setup-node@v2.5.1
       with:
         node-version: 16
     - name: npm install

README.md

@@ -1,8 +1,8 @@
 # RadioX by EximiaBots
 Internet Radio to your Discord guild
 
-## [Radio Stations List](https://gitea.cwinfo.org/cwchristerw/radio)
+## [Radio Stations List](https://git.cwinfo.net/cwchristerw/radio)
-This bot is using Gitea repo to get radio stations from [playlist.json](https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json) file. List is currently maintained by Christer Warén. You can use alternative list with same format when using RADIOX_STATIONSLISTURL environment variable.
+This bot is using Gitea repo to get radio stations from [playlist.json](https://git.cwinfo.net/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 . --pull`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.10",
+  "version": "0.3.15",
   "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.6.0",
+    "@discordjs/builders": "^0.12.0",
-    "@discordjs/opus": "^0.6.0",
+    "@discordjs/opus": "^0.7.0",
-    "@discordjs/rest": "^0.1.1-canary.0",
+    "@discordjs/rest": "^0.3.0",
-    "@discordjs/voice": "^0.6.0",
+    "@discordjs/voice": "^0.8.0",
-    "discord-api-types": "^0.23.1",
+    "discord-api-types": "^0.27.2",
-    "discord.js": "^13.1.0",
+    "discord.js": "^13.6.0",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.0",
     "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^3.0.0",
+    "node-fetch": "^3.2.0",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.9.1",
+    "@types/node": "^17.0.18",
-    "@types/ws": "^7.4.7",
+    "@types/ws": "^8.2.3",
-    "@typescript-eslint/eslint-plugin": "^4.31.1",
+    "@typescript-eslint/eslint-plugin": "^5.12.0",
-    "@typescript-eslint/parser": "^4.31.1",
+    "@typescript-eslint/parser": "^5.12.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.9.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.4.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "nodemon": "^2.0.12",
+    "nodemon": "^2.0.15",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.5.0",
-    "tsc-watch": "^4.5.0",
+    "tsc-watch": "^4.6.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.5.5"
   },
   "engines": {
       "node": ">=16.9.1",

src/client/classes/Datastore.js

@@ -48,8 +48,11 @@ module.exports = class {
     }
 
     loadEntry(id){
-        const json = require(`../../../datastore/` + id + '.json');
+        try {
-        this.map.set(id, json);
+            const json = require(`../../../datastore/` + id + '.json');
+            this.map.set(id, json);
+        } catch (error) {
+        }
     }
 
     getEntry(id){

src/client/classes/Radio.js

@@ -41,9 +41,11 @@ module.exports = class Radio extends Map {
             if(voiceChannel.members.filter(member => !member.user.bot).size === 0) return;
 
 
-            const sstation = await client.stations.search(state.station.name);
+            const sstation = await client.stations.search(state.station.name, "direct");
             let station = sstation;
 
+            if(!station) return;
+
             const construct = {
                 textChannel: client.channels.cache.get(state.channels.text),
                 voiceChannel: client.channels.cache.get(state.channels.voice),

src/client/classes/Stations.js

@@ -17,7 +17,11 @@ module.exports = class Stations extends Array {
             if(list){
                 this.length = 0;
                 list.forEach(station => {
-                    this.push(station);
+                    try {
+                        this.push(station);
+                    } catch (error) {
+
+                    }
                 });
 
                 if(options.show){
@@ -27,6 +31,16 @@ module.exports = class Stations extends Array {
                     });
                     console.log("\n");
                 }
+
+                list.forEach(async station => {
+                    try {
+                        let stationTest = await fetch(station.stream[station.stream.default]);
+                        if(stationTest.ok === true) return;
+                        this.splice(this.indexOf(station),1);
+                    } catch (error) {
+                        this.splice(this.indexOf(station),1);
+                    }
+                });
             }
 
             this.logger('Stations', 'Successfully fetched list');
@@ -34,7 +48,7 @@ module.exports = class Stations extends Array {
             this.logger('Stations', 'Fetching list failed');
             console.error(error + "\n");
 
-            this.fetch(options);
+            if(this.length == 0) this.fetch(options);
         }
     }
 
@@ -46,66 +60,79 @@ module.exports = class Stations extends Array {
         }
     }
 
-    search(key) {
+    search(key, type) {
         if (this === null) return false;
-        let foundStations = [];
         if (!key) return false;
-        if (key == "radio") return false;
+        if (!type) return false;
 
-        this
+        if(type == "direct"){
-            .filter(
+            let foundStation;
-                x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
+            this.forEach(station => {
-            )
+                if(station.name != key) return false;
-            .forEach(x =>
+                foundStation = station;
-                foundStations.push({ station: x, name: x.name, probability: 100 })
+            });
-            );
+
+            return foundStation;
+        } else {
+
+            let foundStations = [];
+            if (key == "radio") return false;
 
-        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
+                    x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
                 )
                 .forEach(x =>
-                    foundStations.push({ station: x, name: x.name, probability: probabilityIncrement })
+                    foundStations.push({ station: x, name: x.name, probability: 100 })
                 );
-        }
-        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 (key.startsWith("radio ")) key = key.slice(6);
-                if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
+            const probabilityIncrement = 100 / key.split(" ").length / 2;
-                    foundStations[i].probability -= probabilityIncrement * 0.5;
+            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++) {
-        let highestProbabilityStation;
+                if (foundStations[i].name.length > key.length) {
-        for (let i = 0; i < foundStations.length; i++) {
+                    foundStations[i].probability -=
-            if (
+                        (foundStations[i].name.split(" ").length - key.split(" ").length) *
-                !highestProbabilityStation ||
+                        (probabilityIncrement * 0.5);
-                highestProbabilityStation.probability < foundStations[i].probability
+                } else if (foundStations[i].name.length === key.length) {
-            )
+                    foundStations[i].probability += probabilityIncrement * 0.9;
-                highestProbabilityStation = foundStations[i];
+                }
-            if (
+
-                highestProbabilityStation &&
+                for (let j = 0; j < key.split(" ").length; j++) {
-                highestProbabilityStation.probability === foundStations[i].probability
+                    if (!foundStations[i].name.toUpperCase().includes(key.toUpperCase().split(" ")[j])) {
-            ) {
+                        foundStations[i].probability -= probabilityIncrement * 0.5;
-                highestProbabilityStation = foundStations[i].station;
+                    }
+                }
             }
+            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;
         }
-        return highestProbabilityStation;
     }
 };

src/client/classes/Streamer.js

@@ -40,63 +40,57 @@ module.exports = class {
 
         let streamers = this.map.keys();
         streamers.forEach(streamer => {
-            if(client.stations.findIndex(station => station.name == streamer)) return;
+            if(client.stations.findIndex(station => station.name == streamer) == -1){
-            this.stop(streamer);
+                this.stop(streamer);
+            }
         });
     }
 
     play(station) {
         let audioPlayer = this.map.get(station.name);
         if(!audioPlayer) {
-            audioPlayer = createAudioPlayer({
+            if(this.mode == "auto"){
-                behaviors: {
+                audioPlayer = createAudioPlayer({
-                    noSubscriber: NoSubscriberBehavior.Play,
+                    behaviors: {
-                    maxMissedFrames: Math.round(5000 / 20),
+                        noSubscriber: NoSubscriberBehavior.Play,
-                },
+                        maxMissedFrames: Math.round(5000 / 20),
-            });
+                    },
+                });
+            }
+            if(this.mode == "manual"){
+                audioPlayer = createAudioPlayer({
+                    behaviors: {
+                        noSubscriber: NoSubscriberBehavior.Stop,
+                        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");
+                audioPlayer.removeAllListeners();
+                if(this.mode == "manual" && audioPlayer.subscribers.length == 0) return;
                 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;
     }
@@ -105,6 +99,7 @@ module.exports = class {
         let audioPlayer = this.map.get(station.name);
         if(audioPlayer){
             this.logger('Streamer', station.name + " / " + "Stop");
+            audioPlayer.removeAllListeners();
             audioPlayer.stop();
         }
         this.map.delete(station.name);
@@ -112,15 +107,12 @@ module.exports = class {
 
     listen(station) {
         let audioPlayer = this.map.get(station.name);
-        if(!audioPlayer){
+        if(!audioPlayer || this.mode == "manual" && audioPlayer.subscribers.length == 0) audioPlayer = this.play(station);
-            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/commands/maintenance.js

@@ -155,7 +155,7 @@ module.exports = {
                 client.config.maintenanceMode = true;
 
                 client.user.setStatus('idle');
-                client.funcs.saveRadios(client);
+                client.radio.save(client);
 
                 setInterval(() => {
                     if(client.radio.size == 0 && client.config.streamerMode == "manual" && client.config.maintenanceMode){
@@ -179,7 +179,7 @@ module.exports = {
                 client.config.maintenanceMode = true;
 
                 client.user.setStatus('idle');
-                client.funcs.save(client);
+                client.radio.save(client);
 
                 setInterval(() => {
                     if(client.radio.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){

src/client/commands/play.js

@@ -84,7 +84,16 @@ module.exports = {
                 content: client.messageEmojis["error"] + client.messages.tooShortSearch,
                 ephemeral: true
             });
-            const sstation = await client.stations.search(query, client);
+
+            let type = "";
+
+            if(interaction.values?.[0]){
+                type = "direct";
+            } else {
+                type = "text";
+            }
+
+            const sstation = await client.stations.search(query, type);
             if (!sstation) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
                 ephemeral: true

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');
     }
 }

src/config.js

@@ -6,7 +6,7 @@ module.exports = {
     token: process.env.DISCORD_TOKEN,
 
     //radio stations
-    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://gitea.cwinfo.org/cwchristerw/radio/raw/branch/master/playlist.json",
+    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://git.cwinfo.net/cwchristerw/radio/raw/branch/master/playlist.json",
 
     //support
     supportGuild: "https://discord.gg/rRA65Mn",