regression to discord.js v11

Author: tabarra

package-lock.json

@@ -26,6 +26,7 @@
   "homepage": "https://github.com/tabarra/txAdmin#readme",
   "dependencies": {
     "@citizenfx/http-wrapper": "^0.2.2",
+    "@discordjs/collection": "^0.1.5",
     "@koa/router": "^9.0.1",
     "axios": "^0.19.2",
     "big-integer": "^1.6.48",
@@ -34,7 +35,7 @@
     "clone": "^2.1.2",
     "color-support": "^1.1.3",
     "dateformat": "^3.0.3",
-    "discord.js": "^12.2.0",
+    "discord.js": "^11.6.4",
     "fs-extra": "^9.0.1",
     "humanize-duration": "^3.23.1",
     "json-colorizer": "^2.2.2",

package.json

@@ -1,6 +1,5 @@
 //Requires
 const modulename = 'DiscordBot:cmd:addwl';
-const { MessageEmbed } = require("discord.js");
 const { dir, log, logOk, logWarn, logError } = require('../../../extras/console')(modulename);
 
 /**

src/components/discordBot/commands/addwl.js

@@ -1,6 +1,6 @@
 //Requires
 const modulename = 'DiscordBot:cmd:help';
-const { MessageEmbed } = require("discord.js");
+const { RichEmbed } = require("discord.js");
 const { dir, log, logOk, logWarn, logError } = require('../../../extras/console')(modulename);
 
 module.exports = {
@@ -16,9 +16,10 @@ module.exports = {
             `:game_die: **Available commands:**`,
             '```',
             ...cmdDescs,
+            '...more commands to come soon 😮',
             '```',
         ];
-        const outMsg = new MessageEmbed({
+        const outMsg = new RichEmbed({
             color: 0x4287F5,
             description: descLines.join('\n')
         });

src/components/discordBot/commands/help.js

@@ -1,6 +1,6 @@
 //Requires
 const modulename = 'DiscordBot:cmd:info';
-const { MessageEmbed } = require("discord.js");
+const { RichEmbed } = require("discord.js");
 const { dir, log, logOk, logWarn, logError } = require('../../../extras/console')(modulename);
 
 //TODO: this doesn't make sense if we are not saving ot the db the player identifiers

src/components/discordBot/commands/info.js

@@ -1,7 +1,7 @@
 //Requires
 const modulename = 'DiscordBot:cmd:status';
 const humanizeDuration = require('humanize-duration');
-const { MessageEmbed } = require("discord.js");
+const { RichEmbed } = require("discord.js");
 const { dir, log, logOk, logWarn, logError } = require('../../../extras/console')(modulename);
 
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
         });
 
         //Prepare object
-        const outMsg = new MessageEmbed({
+        const outMsg = new RichEmbed({
             color: cardColor,
             title: cardTitle,
             description: desc,

src/components/discordBot/commands/status.js

@@ -1,12 +1,12 @@
 //Requires
 const modulename = 'DiscordBot:cmd:txadmin';
-const { MessageEmbed } = require("discord.js");
+const { RichEmbed } = require("discord.js");
 const { dir, log, logOk, logWarn, logError } = require('../../../extras/console')(modulename);
 
 module.exports = {
     description: 'Prints the current txAdmin version',
     async execute(message, args) {
-        const outMsg = new MessageEmbed({
+        const outMsg = new RichEmbed({
             color: 0x4DEEEA,
             title: `${globals.config.serverName} uses txAdmin v${GlobalData.txAdminVersion} :smiley:`,
             description: `Checkout the project:\n GitHub: https://github.com/tabarra/txAdmin\n Discord: https://discord.gg/f3TsfvD`

src/components/discordBot/commands/txadmin.js

@@ -1,6 +1,10 @@
 //Requires
 const modulename = 'DiscordBot';
 const Discord = require('discord.js');
+
+//FIXME: remove when updating to djs12, as well as this from the package.json
+const Collection = require('@discordjs/collection'); 
+
 const { dir, log, logOk, logWarn, logError } = require('../../extras/console')(modulename);
 
 //NOTE: fix for the fact that fxserver (as of 2627) does not have URLSearchParams as part of the global scope
@@ -48,7 +52,7 @@ module.exports = class DiscordBot {
      * NOTE: setting them up statically due to webpack requirements
      */
     setupCommands(){
-        this.commands = new Discord.Collection([
+        this.commands = new Collection([
             ['addwl', require('./commands/addwl.js')],
             ['help', require('./commands/help.js')],
             ['status', require('./commands/status.js')],
@@ -69,7 +73,7 @@ module.exports = class DiscordBot {
         if(
             !this.config.announceChannel ||
             !this.client ||
-            this.client.ws.status ||
+            this.client.status ||
             !this.announceChannel
         ){
             if(GlobalData.verbose) logWarn(`returning false, not ready yet`, 'sendAnnouncement');
@@ -96,30 +100,29 @@ module.exports = class DiscordBot {
         this.client.on('ready', async () => {
             logOk(`Started and logged in as '${this.client.user.tag}'`);
             this.client.user.setActivity(globals.config.serverName, {type: 'WATCHING'});
-            this.announceChannel = await this.client.channels.resolve(this.config.announceChannel);
+            // this.announceChannel = await this.client.channels.resolve(this.config.announceChannel);
+            this.announceChannel = this.client.channels.find(x => x.id === this.config.announceChannel);
             if(!this.announceChannel){
                 logError(`The announcements channel could not be found. Check the ID: ${this.config.announceChannel}`);
+            }else{
+                let cmdDescs = [];
+                this.commands.forEach((cmd, name) => {
+                    cmdDescs.push(`${this.config.prefix}${name}: ${cmd.description}`);
+                });
+                const descLines = [
+                    `:rocket: **txAdmin** v${GlobalData.txAdminVersion} bot started!`,
+                    `:game_die: **Commands:**`,
+                    '```',
+                    ...cmdDescs,
+                    '...more commands to come soon 😮',
+                    '```',
+                ];
+                const msg = new Discord.RichEmbed({
+                    color: 0x4287F5,
+                    description: descLines.join('\n')
+                });
+                this.announceChannel.send(msg);
             }
-
-            //Prepare description
-            let cmdDescs = [];
-            this.commands.each((cmd, name) => {
-                cmdDescs.push(`${this.config.prefix}${name}: ${cmd.description}`);
-            });
-            const descLines = [
-                `:rocket: **txAdmin** v${GlobalData.txAdminVersion} bot started!`,
-                `:game_die: **Commands:**`,
-                '```',
-                ...cmdDescs,
-                '(more commands to come soon...)',
-                '```',
-            ];
-            const msg = new Discord.MessageEmbed({
-                color: 0x4287F5,
-                description: descLines.join('\n')
-            });
-            
-            this.sendAnnouncement(msg);
         });
 
         //Setup remaining event listeners

src/components/discordBot/index.js

@@ -68,7 +68,7 @@ if(typeof txAdminVersion !== 'string' || txAdminVersion == 'null'){
 //Check if this version of txAdmin is too outdated to be considered safe to use in prod
 //NOTE: Only valid if its being very actively maintained.
 //          Use 30d for patch 0, or 45~60d otherwise
-const txAdminVersionBestBy = 1593513059 + (30 * 86400); //2020-06-30 + 30 days
+const txAdminVersionBestBy = 1593555666 + (30 * 86400); //2020-06-30 + 30 days
 if(now() > txAdminVersionBestBy){
     logError(`This version of txAdmin is outdated.`);
     logError(`Please update as soon as possible.`);

src/index.js

@@ -37,7 +37,9 @@ module.exports = {
     },
     externals: {
         // discord.js
-        'ffmpeg-static': 'empty',
+        '@discordjs/opus': 'empty',
+        'node-opus': 'empty',
+        'opusscript': 'empty',
     },
     stats: 'errors-warnings',
     plugins: [