Merge pull request #442 from warengroup/develop

Version 0.4.1

.dockerignore

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

.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,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       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@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ 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@v1
+      uses: github/codeql-action/analyze@v2

.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,9 +10,9 @@ 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
+      uses: docker/setup-buildx-action@v2.2.1
       id: buildx
       with:
         install: true

.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.5.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:latest . --pull
+```
+
+**Beta**
+```
+docker build -t warengroup/eximiabots-radiox:latest-beta . --pull
+```
+
+**Dev**
+```
+docker 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
+```
+
+**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
+```
+
+**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
+```
+
 
 ## Join our Discord Server
 https://discord.gg/rRA65Mn

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,12 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.3.14",
+  "version": "0.4.1",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
     "build": "rimraf ./build && tsc",
     "start": "node --no-warnings build/index.js",
-    "start:dev": "npm run build && node --no-warnings build/index.js"
+    "start:dev": "rimraf ./build && tsc && node --no-warnings build/index.js"
   },
   "repository": {
     "type": "git",
@@ -18,31 +18,30 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/builders": "^0.12.0",
-    "@discordjs/opus": "^0.7.0",
-    "@discordjs/rest": "^0.3.0",
-    "@discordjs/voice": "^0.8.0",
-    "discord-api-types": "^0.26.0",
-    "discord.js": "^13.6.0",
-    "dotenv": "^15.0.0",
-    "libsodium-wrappers": "^0.7.9",
-    "node-fetch": "^3.2.0",
+    "@discordjs/builders": "^1.4.0",
+    "@discordjs/opus": "^0.9.0",
+    "@discordjs/rest": "^1.4.0",
+    "@discordjs/voice": "^0.14.0",
+    "discord-api-types": "^0.37.20",
+    "discord.js": "^14.7.0",
+    "dotenv": "^16.0.3",
+    "libsodium-wrappers": "^0.7.10",
+    "node-fetch": "^3.3.0",
     "path": "^0.12.7"
   },
   "devDependencies": {
-    "@types/node": "^17.0.13",
-    "@types/ws": "^8.2.2",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "nodemon": "^2.0.15",
-    "prettier": "^2.5.1",
+    "@types/node": "^18.11.9",
+    "@types/ws": "^8.5.3",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
+    "eslint": "^8.28.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.0",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
-    "tsc-watch": "^4.6.0",
-    "typescript": "^4.5.5"
+    "ts-node": "^10.9.1",
+    "tsc-watch": "^5.0.3",
+    "typescript": "^4.9.3"
   },
   "engines": {
       "node": ">=16.9.1",

src/Client.ts

@@ -1,4 +1,4 @@
-import Discord, { Client, Collection } from "discord.js";
+import { Client, Collection, IntentsBitField } from "discord.js";
 import Datastore from "./client/classes/Datastore.js";
 import Radio from "./client/classes/Radio.js";
 import Stations from "./client/classes/Stations.js";
@@ -12,7 +12,7 @@ import path from "path";
 
 const events = "./client/events/";
 
-const GatewayIntents = new Discord.Intents();
+const GatewayIntents = new IntentsBitField();
 GatewayIntents.add(
     1 << 0, // GUILDS
     1 << 7, // GUILD_VOICE_STATES
@@ -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/commands/bug.js

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'bug',
@@ -10,13 +10,16 @@ module.exports = {
         message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);
         message.bugDescription = client.messages.bugDescription.replace("%client.config.supportGuild%", client.config.supportGuild);
 
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .setTitle(message.bugTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'help',
@@ -19,13 +19,16 @@ module.exports = {
         message.helpTitle = client.messages.helpTitle.replace("%client.user.username%", client.user.username);
         message.helpDescription = client.messages.helpDescription.replace("%commands%", commands);
 
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .setTitle(message.helpTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'invite',
@@ -7,12 +7,15 @@ module.exports = {
     execute(interaction, client) {
         let message = {};
         message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .setTitle(message.inviteTitle)
             .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'list',
@@ -26,13 +26,16 @@ module.exports = {
                 stations = stations.replace('**#**', `**${i + 1}.**`);
             }
 
-            let embed = new Discord.MessageEmbed()
+            let embed = new EmbedBuilder()
                 .setTitle(client.messages.listTitle)
                 .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["list"].replace(/[^0-9]+/g, ''))
                 .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { ActionRowBuilder, EmbedBuilder, SelectMenuBuilder } 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));
@@ -19,62 +19,53 @@ module.exports = {
             {
                 emoji: "🌀",
                 label: "Restart Bot",
-                description: "",
                 value: "0"
             },
             {
                 emoji: "<:RadioXStop:688541155377414168>",
                 label: "Save Radios",
-                description: "",
                 value: "4"
             },
             {
                 emoji: "<:RadioXPlay:688541155712827458>",
                 label: "Restore Radios",
-                description: "",
                 value: "5"
             },
             {
                 emoji: "#️⃣",
                 label: "Reload Commands",
-                description: "",
                 value: "6"
             },
             {
                 emoji: "<:RadioXList:688541155519889482>",
                 label: "Reload Stations",
-                description: "",
                 value: "7"
             },
             {
                 emoji: "<:dnd:746069698139127831>",
                 label: "Enable Maintenance Mode",
-                description: "",
                 value: "8"
             },
             {
                 emoji: "<:online:746069731836035098>",
                 label: "Disable Maintenance Mode",
-                description: "",
                 value: "9"
             },
             {
                 emoji: "💤",
                 label: "Streamer Mode – Manual",
-                description: "",
                 value: "10"
             },
             {
                 emoji: "📡",
                 label: "Streamer Mode – Auto",
-                description: "",
                 value: "11"
             }
         );
 
-        const menu = new Discord.MessageActionRow()
+        const menu = new ActionRowBuilder()
         .addComponents(
-            new Discord.MessageSelectMenu()
+            new SelectMenuBuilder()
                 .setCustomId('maintenance')
                 .setPlaceholder('Select action')
                 .addOptions(options)
@@ -90,11 +81,14 @@ module.exports = {
 
         client.funcs.logger('Maintenance', options.find(option => option.value == action).label);
 
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .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/next.js

@@ -23,7 +23,7 @@ module.exports = {
             radio.textChannel = interaction.channel;
             radio.startTime = date.getTime();
 
-            if(interaction.isCommand()) {
+            if(interaction.isChatInputCommand()) {
                 client.funcs.play(client, interaction, interaction.guild, station);
             }
             if(interaction.isButton()) {

src/client/commands/nowplaying.js

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'nowplaying',
@@ -18,13 +18,16 @@ module.exports = {
             message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%" + "\n", radio.station.name != radio.station.owner ? radio.station.owner + "\n" : "");
             message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));
 
-            const embed = new Discord.MessageEmbed()
+            const embed = new EmbedBuilder()
                 .setTitle(client.messages.nowplayingTitle)
                 .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
                 .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/play.js

@@ -1,3 +1,4 @@
+import { PermissionFlagsBits } from "discord.js";
 const {
     getVoiceConnection,
     joinVoiceChannel
@@ -51,13 +52,13 @@ module.exports = {
             ephemeral: true
         });
         const permissions = voiceChannel.permissionsFor(interaction.client.user);
-        if (!permissions.has("CONNECT")) {
+        if (!permissions.has(PermissionFlagsBits.Connect)) {
             return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noPermsConnect,
                 ephemeral: true
             });
         }
-        if (!permissions.has("SPEAK")) {
+        if (!permissions.has(PermissionFlagsBits.Speak)) {
             return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noPermsSpeak,
                 ephemeral: true

src/client/commands/prev.js

@@ -23,7 +23,7 @@ module.exports = {
             radio.textChannel = interaction.channel;
             radio.startTime = date.getTime();
 
-            if(interaction.isCommand()) {
+            if(interaction.isChatInputCommand()) {
                 client.funcs.play(client, interaction, interaction.guild, station);
             }
             if(interaction.isButton()) {

src/client/commands/statistics.js

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 
 module.exports = {
@@ -23,26 +23,19 @@ module.exports = {
         if(!currentGuild || currentGuild && !currentGuild.statistics){
             statistics = "You have not listened any radio stations";
         } else {
-            Object.keys(stations).forEach(function(station) {
-                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";
-                    }
-                }
-            });
+            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";
         }
 
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .setTitle(client.messages.statisticsTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["statistics"].replace(/[^0-9]+/g, ''))
             .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'status',
@@ -10,17 +10,22 @@ module.exports = {
         message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username);
         let uptime = client.funcs.msToTime(client.uptime);
 
-        const embed = new Discord.MessageEmbed()
+        const embed = new EmbedBuilder()
             .setTitle(message.statusTitle)
             .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
             .setColor(client.config.embedColor)
-            .addField(client.messages.statusField1, uptime, false)
-            .addField(client.messages.statusField2, client.config.version, false)
-            .addField(client.messages.statusField3, Date.now() - interaction.createdTimestamp + "ms", false)
-            .addField(client.messages.statusField4, client.ws.ping + "ms", false)
-            .addField(client.messages.statusField5, client.config.hostedBy, false)
+            .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.statusField5, value: client.config.hostedBy }
+            ])
             .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

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { EmbedBuilder } from "discord.js";
 
 module.exports = {
     name: 'stop',
@@ -11,13 +11,19 @@ module.exports = {
             radio.connection?.destroy();
             client.funcs.logger('Radio', interaction.guild.id + " / " + 'Stop');
 
-            const embed = new Discord.MessageEmbed()
+            const embed = new EmbedBuilder()
                 .setTitle(client.user.username)
                 .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["stop"].replace(/[^0-9]+/g, ''))
                 .setColor(client.config.embedColor)
-                .addField(client.messages.nowplayingTitle, "-", true)
+                .addFields({
+                    name: client.messages.nowplayingTitle,
+                    value: "-"
+                })
                 .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/interactionCreate.js

@@ -1,16 +1,18 @@
+import { PermissionFlagsBits } from "discord.js";
+
 module.exports = {
     name: 'interactionCreate',
     async execute(client, interaction) {
 
         const permissions = interaction.channel.permissionsFor(interaction.client.user);
-        if (!permissions.has('VIEW_CHANNEL')) return;
+        if (!permissions.has(PermissionFlagsBits.ViewChannel)) return;
 
-        if (!permissions.has('EMBED_LINKS')) return interaction.reply({
+        if (!permissions.has(PermissionFlagsBits.EmbedLinks)) return interaction.reply({
             content: client.messageEmojis["error"] + client.messages.noPermsEmbed,
             ephemeral: true
         });
 
-        if(interaction.isCommand()){
+        if(interaction.isChatInputCommand()){
             const commandName = interaction.commandName;
             const command = client.commands.get(commandName);
             if (!command) return;

src/client/events/messageCreate.js

@@ -1,4 +1,5 @@
-import Discord from "discord.js";
+import { EmbedBuilder, PermissionFlagsBits } from "discord.js";
+
 module.exports = {
     name: 'messageCreate',
     async execute(client, message) {
@@ -25,19 +26,22 @@ module.exports = {
         const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
         if (!command && message.content !== `${prefix}`) return;
         const permissions = message.channel.permissionsFor(message.client.user);
-        if (!permissions.has('EMBED_LINKS')) return message.channel.send(client.messages.noPermsEmbed);
+        if (!permissions.has(PermissionFlagsBits.EmbedLinks)) return message.channel.send(client.messages.noPermsEmbed);
         try {
             let newMessage = {};
 
             newMessage.messageCommandsDeprecatedTitle = client.messages.messageCommandsDeprecatedTitle.replace("%client.user.username%", client.user.username);
 
-            const embed = new Discord.MessageEmbed()
+            const embed = new EmbedBuilder()
                 .setTitle(newMessage.messageCommandsDeprecatedTitle)
                 .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
                 .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

@@ -14,29 +14,24 @@ module.exports = {
         client.funcs.logger('Datastore', 'Initialize');
         client.datastore = new Datastore();
 
-        client.funcs.logger('Datastore');
         client.datastore.map.forEach(datastore => {
-            console.log("- " + datastore.guild.id + " / " + datastore.guild.name);
+            client.funcs.logger('Datastore', datastore.guild.id + " / " + datastore.guild.name);
         });
-        console.log("\n");
 
         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 +58,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/voiceStateUpdate.js

@@ -1,3 +1,4 @@
+import { PermissionFlagsBits } from "discord.js";
 const {
     getVoiceConnection,
     joinVoiceChannel
@@ -8,7 +9,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) {
@@ -22,7 +23,7 @@ module.exports = {
             }
 
             const newPermissions = newState.channel.permissionsFor(newState.client.user);
-            if (!newPermissions.has("CONNECT") || !newPermissions.has("SPEAK") || !newPermissions.has("VIEW_CHANNEL")) {
+            if (!newPermissions.has(PermissionFlagsBits.Connect) || !newPermissions.has(PermissionFlagsBits.Speak) || !newPermissions.has(PermissionFlagsBits.ViewChannel)) {
                 try {
                     setTimeout(
                         async () => (

src/client/funcs/check.js

@@ -1,7 +1,6 @@
 module.exports = function check(client, interaction, command) {
     let message = {};
     const radio = client.radio.get(interaction.guild.id);
-    const permissions = interaction.channel.permissionsFor(interaction.user);
     if(client.config.maintenanceMode){
         interaction.reply({
             content: client.messageEmojis["error"] + client.messages.maintenance,

src/client/funcs/listStations.js

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

src/client/funcs/play.js

@@ -1,4 +1,4 @@
-import Discord from "discord.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 
 module.exports = async function play(client, interaction, guild, station) {
     let message = {};
@@ -13,54 +13,60 @@ module.exports = async function play(client, interaction, guild, station) {
     message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
     message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
 
-    const embed = new Discord.MessageEmbed()
+    const embed = new EmbedBuilder()
         .setTitle(client.user.username)
         .setThumbnail((radio.station.logo || "https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, '')))
         .setColor(client.config.embedColor)
-        .addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
+        .addFields({
+            name: client.messages.nowplayingTitle,
+            value: 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, '')
+        });
 
-    const buttons = new Discord.MessageActionRow()
+    const buttons = new ActionRowBuilder()
         .addComponents(
-            new Discord.MessageButton()
+            new ButtonBuilder()
                 .setCustomId('list')
                 .setEmoji(client.messageEmojis["list"])
-                .setStyle('SECONDARY')
+                .setStyle(ButtonStyle.Secondary)
         )
         .addComponents(
-            new Discord.MessageButton()
+            new ButtonBuilder()
                 .setCustomId('prev')
                 .setEmoji(client.messageEmojis["prev"])
-                .setStyle('SECONDARY')
+                .setStyle(ButtonStyle.Secondary)
         )
         .addComponents(
-            new Discord.MessageButton()
+            new ButtonBuilder()
                 .setCustomId('stop')
                 .setEmoji(client.messageEmojis["stop"])
-                .setStyle('SECONDARY')
+                .setStyle(ButtonStyle.Secondary)
         )
         .addComponents(
-            new Discord.MessageButton()
+            new ButtonBuilder()
                 .setCustomId('next')
                 .setEmoji(client.messageEmojis["next"])
-                .setStyle('SECONDARY')
+                .setStyle(ButtonStyle.Secondary)
         )
         .addComponents(
-            new Discord.MessageButton()
+            new ButtonBuilder()
                 .setCustomId('statistics')
                 .setEmoji(client.messageEmojis["statistics"])
-                .setStyle('SECONDARY')
+                .setStyle(ButtonStyle.Secondary)
         );
 
     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] });
         }
     }