Merge pull request #241 from warengroup/develop

Version 0.3.20

.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 ]
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dependabot_auto-merge.yml

@@ -0,0 +1,20 @@
+name: Dependabot Auto-Merge
+on:
+  pull_request_target:
+    branches: [ develop ]
+
+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.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-build.yml

@@ -2,6 +2,7 @@ name: Docker Build
 
 on:
   pull_request:
+  workflow_dispatch:
 
 jobs:
   buildx:
@@ -9,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v1.6.0
       id: buildx

.github/workflows/labeler.yml

@@ -11,7 +11,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v3
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true

.github/workflows/typescript-build.yml

@@ -2,15 +2,16 @@ name: TypeScript Build
 
 on:
   push:
+  workflow_dispatch:
 
 jobs:
   tsc:
     name: TypeScript Build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - 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

README.md

@@ -5,8 +5,41 @@ Internet Radio to your Discord guild
 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`
+
-2. `docker run --name radiox-dev -d --net host -e DISCORD_TOKEN= -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox`
+### 1. Build Image
+
+**Production**
+```
+docker build -t warengroup/eximiabots-radiox:0.3.20 . --pull
+```
+
+**Beta**
+```
+docker build -t warengroup/eximiabots-radiox:0.3.20-beta . --pull
+```
+
+**Dev**
+```
+docker build -t warengroup/eximiabots-radiox:0.3.20-dev . --pull
+```
+
+### 2. Run Container
+
+**Production**
+```
+docker run --name radiox --net host -d -e DISCORD_TOKEN= -e STREAMER_MODE=auto -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox:0.3.20
+```
+
+**Beta**
+```
+docker run --name radiox --net host -d -e DISCORD_TOKEN= -e STREAMER_MODE=auto -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox:0.3.20-beta
+```
+
+**Dev**
+```
+docker run --rm --name radiox-dev --net host -e DISCORD_TOKEN= -e DEV_MODE=true -v "$PWD":/usr/src/app/ warengroup/eximiabots-radiox:0.3.20-dev
+```
+
 
 ## Join our Discord Server
 https://discord.gg/rRA65Mn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.12",
+  "version": "0.3.20",
   "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/rest": "^0.3.0",
-    "@discordjs/voice": "^0.7.5",
+    "@discordjs/voice": "^0.8.0",
-    "discord-api-types": "^0.24.0",
+    "discord-api-types": "^0.31.0",
-    "discord.js": "^13.2.0",
+    "discord.js": "^13.6.0",
-    "dotenv": "^10.0.0",
+    "dotenv": "^16.0.0",
-    "libsodium-wrappers": "^0.7.9",
+    "libsodium-wrappers": "^0.7.10",
-    "node-fetch": "^3.1.0",
+    "node-fetch": "^3.2.3",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^16.11.10",
+    "@types/node": "^17.0.23",
-    "@types/ws": "^8.2.0",
+    "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
-    "@typescript-eslint/parser": "^5.4.0",
+    "@typescript-eslint/parser": "^5.18.0",
-    "eslint": "^8.3.0",
+    "eslint": "^8.12.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.15",
-    "prettier": "^2.5.0",
+    "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.7.0",
-    "tsc-watch": "^4.5.0",
+    "tsc-watch": "^5.0.2",
-    "typescript": "^4.5.2"
+    "typescript": "^4.6.3"
   },
   "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/Stations.js

@@ -25,11 +25,9 @@ module.exports = class Stations extends Array {
                 });
 
                 if(options.show){
-                    this.logger('Stations');
                     list.forEach(station => {
-                        console.log("- " + station.name);
+                        this.logger('Stations', station.name);
                     });
-                    console.log("\n");
                 }
 
                 list.forEach(async station => {

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){
+        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/bug.js

@@ -16,7 +16,10 @@ module.exports = {
             .setColor(client.config.embedColor)
             .setDescription(message.bugDescription)
             .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, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/help.js

@@ -25,7 +25,10 @@ module.exports = {
             .setColor(client.config.embedColor)
             .setDescription(message.helpDescription)
             .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, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/invite.js

@@ -12,7 +12,10 @@ module.exports = {
             .setColor(client.config.embedColor)
             .setURL("https://discord.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
             .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, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/list.js

@@ -32,7 +32,10 @@ module.exports = {
                 .setColor(client.config.embedColor)
                 .setDescription(stations)
                 .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, ''));
+                .setFooter({
+                    text: client.messages.footerText,
+                    iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+                });
 
             interaction.reply({
                 embeds: [embed],

src/client/commands/maintenance.js

@@ -94,7 +94,10 @@ module.exports = {
             .setTitle(client.messages.maintenanceTitle)
             .setColor(client.config.embedColor)
             .setDescription(options.find(option => option.value == action).label)
-            .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/nowplaying.js

@@ -24,7 +24,10 @@ module.exports = {
                 .setColor(client.config.embedColor)
                 .setDescription(message.nowplayingDescription)
                 .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+                .setFooter({
+                    text: client.messages.footerText,
+                    iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+                });
 
             interaction.reply({
                 embeds: [embed],

src/client/commands/statistics.js

@@ -23,17 +23,7 @@ module.exports = {
         if(!currentGuild || currentGuild && !currentGuild.statistics){
             statistics = "You have not listened any radio stations";
         } else {
-            Object.keys(stations).forEach(function(station) {
+            statistics = "[Open Dashboard](https://eximiabots.waren.io/radiox/" + interaction.guild.id + "/stats?info=" + Buffer.from(JSON.stringify(currentGuild), 'utf8').toString('base64') + "&globalInfo=" + Buffer.from(JSON.stringify(global), 'utf8').toString('base64') + ")" + "\n";
-                if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){
-                    statistics += `**${parseInt(station) + 1}. ` + stations[station].name + "** \n";
-                    if(global && global.statistics[stations[station].name] && global.statistics[stations[station].name].time && parseInt(global.statistics[stations[station].name].time) > 0 && global.statistics[stations[station].name].used && parseInt(global.statistics[stations[station].name].used) > 0){
-                        statistics += "Guild – Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " (" + ((currentGuild.statistics[stations[station].name].time / global.statistics[stations[station].name].time) * 100).toFixed(0) + "%" + ")" + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + " (" + ((currentGuild.statistics[stations[station].name].used / global.statistics[stations[station].name].used) * 100).toFixed(0) + "%" + ")" + "\n";
-                        statistics += "Global – Time: " + client.funcs.msToTime(global.statistics[stations[station].name].time) + " / " + "Used: " + global.statistics[stations[station].name].used + "\n\n";
-                    } else {
-                        statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + " / " + "Used: " + currentGuild.statistics[stations[station].name].used + "\n\n";
-                    }
-                }
-            });
         }
 
         const embed = new Discord.MessageEmbed()
@@ -42,7 +32,10 @@ module.exports = {
             .setColor(client.config.embedColor)
             .setDescription(statistics)
             .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, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/status.js

@@ -20,7 +20,10 @@ module.exports = {
             .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, ''));
+            .setFooter({
+                text: client.messages.footerText,
+                iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+            });
 
         interaction.reply({
             embeds: [embed],

src/client/commands/stop.js

@@ -17,7 +17,10 @@ module.exports = {
                 .setColor(client.config.embedColor)
                 .addField(client.messages.nowplayingTitle, "-", true)
                 .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-                .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+                .setFooter({
+                    text: client.messages.footerText,
+                    iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+                });
 
             if(!radio.message){
                 radio.message = radio.textChannel.send({ embeds: [embed], components: [] });

src/client/events/messageCreate.js

@@ -37,7 +37,10 @@ module.exports = {
                 .setColor(client.config.embedColor)
                 .setDescription(client.messages.messageCommandsDeprecatedDescription)
                 .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, ''));
+                .setFooter({
+                    text: client.messages.footerText,
+                    iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+                });
 
             let msg = await message.channel.send({ embeds: [embed] });
 

src/client/events/messageDelete.js

@@ -1,9 +1,10 @@
 module.exports = {
     name: 'messageDelete',
     async execute(client, msg) {
-        if (!msg.author.bot || !msg.guild) return;
+        if(!msg.author.bot || !msg.guild) return;
         const radio = client.radio.get(msg.guild.id);
-        if (!radio) return;
+        if(!radio) return;
+        if(!radio.message) return;
         if(msg.id != radio.message.id) return;
         radio.message = null;
     }

src/client/events/ready.js

@@ -23,20 +23,17 @@ module.exports = {
         client.funcs.logger('Datastore', 'Ready');
 
         /*DEVELOPERS*/
-        client.funcs.logger('Developers');
-
         client.developers = "";
         let user = "";
         for (let i = 0; i < client.config.devId.length; i++) {
             user = await client.users.fetch(client.config.devId[i]);
-            console.log("- " + user.tag);
+            client.funcs.logger('Developers', user.tag);
             if (i == client.config.devId.length - 1) {
                 client.developers += user.tag;
             } else {
                 client.developers += user.tag + " & ";
             }
         }
-        console.log("\n");
 
         /*STATIONS*/
         client.stations = new Stations();
@@ -63,12 +60,10 @@ module.exports = {
         /*GUILDS*/
         client.funcs.logger('Guilds', 'Started fetching list');
 
-        client.funcs.logger('Guilds');
         let guilds = await client.guilds.fetch();
         guilds.forEach(guild => {
-            console.log("- " + guild.id + " / " + guild.name);
+            client.funcs.logger('Guilds', guild.id + " / " + guild.name);
         });
-        console.log("\n");
 
         client.funcs.logger('Guilds', 'Successfully fetched list');
 

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/client/events/voiceStateUpdate.js

@@ -8,7 +8,7 @@ module.exports = {
     async execute(client, oldState, newState) {
         if (oldState.channel === null) return;
         let change = false;
-        const radio = client.radio.get(newState.guild.id);
+        const radio = client.radio?.get(newState.guild.id);
         if (!radio) return;
 
         if (newState.member.id === client.user.id && oldState.member.id === client.user.id) {

src/client/funcs/play.js

@@ -19,7 +19,10 @@ module.exports = async function play(client, interaction, guild, station) {
         .setColor(client.config.embedColor)
         .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
         .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-        .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
+        .setFooter({
+            text: client.messages.footerText,
+            iconURL: "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')
+        });
 
     const buttons = new Discord.MessageActionRow()
         .addComponents(
@@ -54,13 +57,13 @@ module.exports = async function play(client, interaction, guild, station) {
         );
 
     if(!radio.message){
-        radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
+        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] });
+            radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] });
         }
     }