Merge pull request #725 from warengroup/develop

Version 0.4.3

.dockerignore

@@ -1,7 +1,8 @@
+.env_example
 .git
+.github
 .gitignore
 .vscode
+build
 datastore
-Dockerfile
+node_modules
-LICENSE
-README.md

.github/workflows/docker-build.yml

@@ -2,6 +2,8 @@ name: Docker Build
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened, assigned, edited, ready_for_review]
+  push:
   workflow_dispatch:
 
 jobs:
@@ -12,7 +14,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v2.0.0
+      uses: docker/setup-buildx-action@v2.5.0
       id: buildx
       with:
         install: true

.github/workflows/typescript-build.yml

@@ -1,6 +1,8 @@
 name: TypeScript Build
 
 on:
+  pull_request:
+    types: [opened, synchronize, reopened, assigned, edited, ready_for_review]
   push:
   workflow_dispatch:
 

LICENSE

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

SECURITY.md

@@ -4,7 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.3.x   | :white_check_mark: |
+| 0.4.x   | :white_check_mark: |
+| 0.3.x   | :x:                |
 | 0.2.x   | :x:                |
 | 0.1.x   | :x:                |
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
@@ -18,30 +18,30 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^1.0.0",
+    "@discordjs/builders": "^1.6.3",
-    "@discordjs/opus": "^0.8.0",
+    "@discordjs/opus": "^0.9.0",
-    "@discordjs/rest": "^1.0.0",
+    "@discordjs/rest": "^1.7.1",
-    "@discordjs/voice": "^0.11.0",
+    "@discordjs/voice": "^0.16.0",
-    "discord-api-types": "^0.36.2",
+    "discord-api-types": "^0.37.43",
-    "discord.js": "^14.0.2",
+    "discord.js": "^14.11.0",
-    "dotenv": "^16.0.1",
+    "dotenv": "^16.1.3",
-    "libsodium-wrappers": "^0.7.10",
+    "libsodium-wrappers": "^0.7.11",
-    "node-fetch": "^3.2.9",
+    "node-fetch": "^3.3.1",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^18.0.6",
+    "@types/node": "^20.2.5",
-    "@types/ws": "^8.5.3",
+    "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
-    "@typescript-eslint/parser": "^5.30.7",
+    "@typescript-eslint/parser": "^5.59.8",
-    "eslint": "^8.20.0",
+    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.8",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.1",
     "ts-node": "^10.9.1",
-    "tsc-watch": "^5.0.3",
+    "tsc-watch": "^6.0.4",
-    "typescript": "^4.7.4"
+    "typescript": "^5.1.3"
   },
   "engines": {
       "node": ">=16.9.1",

src/client/commands/maintenance.js

@@ -1,4 +1,4 @@
-import { ActionRowBuilder, EmbedBuilder, SelectMenuBuilder } from "discord.js";
+import { ActionRowBuilder, EmbedBuilder, StringSelectMenuBuilder } from "discord.js";
 import Streamer from "../classes/Streamer.js";
 const _importDynamic = new Function('modulePath', 'return import(modulePath)');
 const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));
@@ -65,7 +65,7 @@ module.exports = {
 
         const menu = new ActionRowBuilder()
         .addComponents(
-            new SelectMenuBuilder()
+            new StringSelectMenuBuilder()
                 .setCustomId('maintenance')
                 .setPlaceholder('Select action')
                 .addOptions(options)

src/client/commands/status.js

@@ -14,13 +14,13 @@ module.exports = {
             .setTitle(message.statusTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
-            .addFields([
+            .addFields(
                 { name: client.messages.statusField1, value: uptime },
                 { name: client.messages.statusField2, value: client.config.version },
                 { name: client.messages.statusField3, value: Date.now() - interaction.createdTimestamp + "ms" },
-                { name: client.messages.statusField4, value: client.ws.ping },
+                { name: client.messages.statusField4, value: client.ws.ping.toString() },
                 { name: client.messages.statusField5, value: client.config.hostedBy }
-            ])
+            )
             .setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
             .setFooter({
                 text: client.messages.footerText,

src/client/events/interactionCreate.js

@@ -26,7 +26,7 @@ module.exports = {
                 });
                 console.error(error);
             }
-        } else if (interaction.isSelectMenu() || interaction.isButton()){
+        } else if (interaction.isStringSelectMenu() || interaction.isButton()){
             const commandName = interaction.customId;
             const command = client.commands.get(commandName);
             if (!command) return;

src/client/events/ready.js

@@ -41,12 +41,12 @@ module.exports = {
             show: true
         });
 
-        setInterval(async () => {
+        /*setInterval(async () => {
             await client.stations.fetch({
                 url: client.config.stationslistUrl,
                 show: false
             });
-        }, 3600000);
+        }, 3600000);*/
 
         client.streamer = new Streamer();
         client.streamer.init(client);

src/client/funcs/listStations.js

@@ -1,4 +1,4 @@
-import { ActionRowBuilder, SelectMenuBuilder } from "discord.js";
+import { ActionRowBuilder, StringSelectMenuBuilder } from "discord.js";
 
 module.exports = function listStations(client, interaction){
     let stations = new Array();
@@ -16,7 +16,7 @@ module.exports = function listStations(client, interaction){
 
     const menu = new ActionRowBuilder()
         .addComponents(
-            new SelectMenuBuilder()
+            new StringSelectMenuBuilder()
                 .setCustomId('play')
                 .setPlaceholder('Nothing selected')
                 .addOptions(options)