Merge pull request #963 from warengroup/develop

Version 0.5.5

.env_example

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

.github/labeler.yml

@@ -1,7 +1,11 @@
 dependencies:
+- changed-files:
+    - any-glob-to-any-file:
         - package-lock.json
 
 documentation:
+- changed-files:
+    - any-glob-to-any-file:
         - README.md
         - SECURITY.md
         - CONTRIBUTING.md

.github/workflows/codeql-analyze.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # 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@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/docker-build.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v3.0.0
+      uses: docker/setup-buildx-action@v3.3.0
       id: buildx
       with:
         install: true

.github/workflows/labeler.yml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM docker.io/library/node:20-alpine
 
 #Dependencies
 RUN apk add --virtual .build-deps python3 make g++ gcc git

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 EximiaBots by Warén Group
+Copyright (c) 2020-2024 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

@@ -10,36 +10,35 @@ This bot is using Gitea repo to get radio stations from [playlist.json](https://
 
 **Production**
 ```
-docker build -t warengroup/eximiabots-radiox:latest . --pull
+podman build -t warengroup/eximiabots-radiox:latest . --pull
 ```
 
 **Beta**
 ```
-docker build -t warengroup/eximiabots-radiox:latest-beta . --pull
+podman build -t warengroup/eximiabots-radiox:latest-beta . --pull
 ```
 
 **Dev**
 ```
-docker build -t warengroup/eximiabots-radiox:latest-dev . --pull
+podman build -t warengroup/eximiabots-radiox:latest-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:latest
+podman run --name radiox -d -e DISCORD_TOKEN= -e STREAMER_MODE=auto -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox:latest
 ```
 
 **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:latest-beta
+podman run --name radiox -d -e DISCORD_TOKEN= -e STREAMER_MODE=auto -v "$PWD/datastore":/usr/src/app/datastore/ warengroup/eximiabots-radiox:latest-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:latest-dev
+podman run --rm --name radiox-dev -e DISCORD_TOKEN= -e DEV_MODE=true -v "$PWD":/usr/src/app/ warengroup/eximiabots-radiox:latest-dev
 ```
 
-
 ## Join our Discord Server
 https://discord.gg/rRA65Mn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -18,29 +18,15 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^1.7.0",
-    "@discordjs/opus": "^0.9.0",
-    "@discordjs/rest": "^2.2.0",
     "@discordjs/voice": "^0.16.1",
-    "discord-api-types": "^0.37.65",
     "discord.js": "^14.14.1",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.5",
     "libsodium-wrappers": "^0.7.13",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^20.10.0",
-    "@types/ws": "^8.5.9",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
-    "ts-node": "^10.9.1",
-    "tsc-watch": "^6.0.4",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.5"
   },
   "engines": {
       "node": ">=18.16.0",

src/Client.ts

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

src/client/classes/Streamer.ts

@@ -51,15 +51,13 @@ export default class Streamer {
             if(this.mode == "auto"){
                 audioPlayer = createAudioPlayer({
                     behaviors: {
-                        noSubscriber: NoSubscriberBehavior.Play,
-                        maxMissedFrames: Math.round(5000 / 20),
+                        noSubscriber: NoSubscriberBehavior.Play
                     }
                 });
             } else {
                 audioPlayer = createAudioPlayer({
                     behaviors: {
-                        noSubscriber: NoSubscriberBehavior.Stop,
-                        maxMissedFrames: Math.round(5000 / 20),
+                        noSubscriber: NoSubscriberBehavior.Stop
                     }
                 });
             }

src/client/commands.ts

@@ -1,8 +1,6 @@
-import { Snowflake } from "discord.js";
+import { ApplicationCommand, ApplicationCommandManager, BaseGuild, Guild, GuildApplicationCommandManager, OAuth2Guild, Snowflake } from "discord.js";
 import RadioClient from "../Client";
-import bug from "./commands/bug";
 import help from "./commands/help";
-import invite from "./commands/invite";
 import list from "./commands/list";
 import maintenance from "./commands/maintenance";
 import next from "./commands/next";
@@ -21,35 +19,17 @@ export interface command {
 }
 
 export default async function commands(client: RadioClient) {
-    const commands : command[] = [ bug, help, invite, list, maintenance, next, play, prev, statistics, status, stop ];
+    const commands1 : command[] = [ help, list, maintenance, next, play, prev, statistics, status, stop ];
+    const commands2 = await client.application?.commands.fetch();
 
-    for(const command of commands){
+    for(const command of commands1){
         client.commands.set(command.name, command);
     }
 
-    if(!client.application) return;
     client.funcs.logger('Application Commands', 'Started refreshing application (/) commands.');
-    if(client.config.devMode){
-        client.application.commands.set([]);
-        for(const command of commands){
-            let guilds = await client.guilds.fetch();
-            guilds.forEach(async (guild: { id: Snowflake; name: string; }) => {
-                try {
-                    if(!client.application) return;
-                    await client.application.commands.create({
-                        name: command.name,
-                        description: command.description,
-                        options: command.options || []
-                    }, guild.id);
-                    client.funcs.logger('Application Commands', 'Guild: ' + guild.id + " (" + guild.name + ") \n" + 'Command: ' + command.name);
-                } catch(DiscordAPIError) {
-                    client.funcs.logger('Application Commands', 'Guild: ' + guild.id + " (" + guild.name + ") [FAILED] \n" + 'Command: ' + command.name);
-                }
-            });
-        }
-    } else {
-        for(const command of commands){
-            await client.application.commands.create({
+    if(commands1){
+        for(const command of commands1){
+            await client.application?.commands.create({
                 name: command.name,
                 description: command.description,
                 options: command.options || []
@@ -57,15 +37,24 @@ export default async function commands(client: RadioClient) {
 
             client.funcs.logger('Application Commands', 'Command: ' + command.name);
         }
+    }
+
+    if(commands2){
+        commands2.forEach(async command2 => {
+            if(commands1.findIndex((command1) => command1.name == command2.name) == -1){
+                await client.application?.commands.delete(command2.id);
+            }
+        });
+    }
 
     let guilds = await client.guilds.fetch();
-        guilds.forEach(async (guild: { id: Snowflake; }) => {
+        guilds.forEach(async (guild: Guild | OAuth2Guild) => {
             try {
                 if(!client.application) return;
                 await client.application.commands.set([], guild.id);
             } catch (DiscordAPIError){
             }
         });
-    }
+
     client.funcs.logger('Application Commands', 'Successfully reloaded application (/) commands.' + "\n");
 }

src/client/commands/bug.ts

@@ -1,34 +0,0 @@
-import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
-import RadioClient from "../../Client";
-
-export default {
-    name: 'bug',
-    description: 'Report a bug',
-    category: 'info',
-    async execute(interaction: ChatInputCommandInteraction, client: RadioClient) {
-        if(!client.user) return interaction.reply({
-            content: client.messages.emojis["error"] + client.messages.maintenance,
-            ephemeral: true
-        });
-
-        const embed = new EmbedBuilder()
-            .setTitle(client.messages.replace(client.messages.bugTitle, {
-                "%client.user.username%": client.user.username
-            }))
-            .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messages.emojis["logo"].replace(/[^0-9]+/g, ''))
-            .setColor(client.config.embedColor)
-            .setDescription(client.messages.replace(client.messages.bugDescription, {
-                    "%client.config.supportGuild%": client.config.supportGuild
-            }))
-            .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
-            .setFooter({
-                text: client.messages.footerText,
-                iconURL: "https://cdn.discordapp.com/emojis/" + client.messages.emojis["eximiabots"].replace(/[^0-9]+/g, '')
-            });
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
-    }
-};

src/client/commands/help.ts

@@ -13,23 +13,12 @@ export default {
             ephemeral: true
         });
 
-        const categories: string[] = [];
-        for (let i = 0; i < client.commands.size; i++) {
-            if (!categories.includes([...client.commands.values()][i].category)) categories.push([...client.commands.values()][i].category);
-        }
-        let commands = '';
-        for (let i = 0; i < categories.length; i++) {
-            commands += `**» ${categories[i].toUpperCase()}**\n${client.commands.filter(x => x.category === categories[i]).map((x: command) => `\`${x.name}\``).join(', ')}\n`;
-        }
-
         const embed = new EmbedBuilder()
-            .setTitle(client.messages.replace(client.messages.helpTitle, {
-                "%client.user.username%": client.user.username
-            }))
+            .setTitle(client.messages.helpTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messages.emojis["logo"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
             .setDescription(client.messages.replace(client.messages.helpDescription, {
-                "%commands%": commands
+                    "%client.config.supportGuild%": client.config.supportGuild
             }))
             .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter({

src/client/commands/invite.ts

@@ -1,32 +0,0 @@
-import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
-import RadioClient from "../../Client";
-
-export default {
-    name: 'invite',
-    description: 'Invite Bot',
-    category: 'info',
-    execute(interaction: ChatInputCommandInteraction, client: RadioClient) {
-
-        if(!client.user) return interaction.reply({
-            content: client.messages.emojis["error"] + client.messages.maintenance,
-            ephemeral: true
-        });
-
-        const embed = new EmbedBuilder()
-            .setTitle(client.messages.replace(client.messages.inviteTitle, {
-                "%client.user.username%": client.user.username
-            }))
-            .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({
-                text: client.messages.footerText,
-                iconURL: "https://cdn.discordapp.com/emojis/" + client.messages.emojis["eximiabots"].replace(/[^0-9]+/g, '')
-            });
-
-        interaction.reply({
-            embeds: [embed],
-            ephemeral: true
-        });
-    }
-};

src/client/events/uncaughtException.ts

@@ -5,6 +5,6 @@ export default function uncaughtException(client: RadioClient, error: Error) {
     console.log(error.stack);
     console.log('');
 
-    if(error.name == "DiscordAPIError" && error.message == "Unknown interaction") return;
+    if(error.name == "DiscordAPIError[10062]" && error.message == "Unknown interaction") return;
     process.emit('SIGINT');
 }

src/client/funcs/play.ts

@@ -205,7 +205,7 @@ export default async function play(client: RadioClient, interaction: ChatInputCo
                 radio.message = await radio.textChannel?.send({ embeds: [embed], components: [buttons] }) ?? null;
             }
         }
-    },2500);
+    },30000);
 
     interaction?.reply({
         content: client.messages.emojis["play"] + client.messages.replace(client.messages.play, {

src/client/messages.ts

@@ -16,11 +16,8 @@ export const messages = {
     notPlaying: "There is nothing playing!",
     runningCommandFailed: "Running this command failed!",
     noPermsEmbed: "I cannot send embeds (Embed links).",
-    bugTitle: "Found a bug with %client.user.username%?",
-    bugDescription: "Join the support server" + "\n" + "%client.config.supportGuild%",
-    helpTitle: "%client.user.username% help:",
-    helpDescription: "%commands%",
-    inviteTitle: "Invite %client.user.username% to your Discord server!",
+    helpTitle: "Help",
+    helpDescription: "Join to our support server" + "\n" + "%client.config.supportGuild%",
     listTitle: "Radio Stations",
     playTitle1: ":radio: Channel",
     playDescription1: "__%radio.station.name%__" + "\n" + "%radio.station.owner%",

src/config.ts

@@ -6,7 +6,7 @@ export default {
     token: process.env.DISCORD_TOKEN,
 
     //radio stations
-    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://git.cwinfo.net/cwchristerw/radio/raw/branch/master/playlist.json",
+    stationslistUrl: process.env.RADIOX_STATIONSLISTURL || "https://eximiabots.waren.io/radiox/stations.json",
 
     //support
     supportGuild: "https://discord.gg/rRA65Mn",