feat(core): relay announcements to discord as well

tabarra · Jan 9, 2022 · a860a38 · a860a38
1 parent 8c8c755
commit a860a38
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/discordBot/index.js b/src/components/discordBot/index.js
@@ -81,7 +81,7 @@ module.exports = class DiscordBot {
         }
 
         try {
-            this.announceChannel.send(message);
+            await this.announceChannel.send(message);
         } catch (error) {
             logError(`Error sending Discord announcement: ${error.message}`);
         }

diff --git a/src/webroutes/fxserver/commands.js b/src/webroutes/fxserver/commands.js
@@ -67,13 +67,23 @@ module.exports = async function FXServerCommands(ctx) {
     //==============================================
     } else if (action == 'admin_broadcast') {
         if (!ensurePermission(ctx, 'players.message')) return false;
+        const message = (parameter ?? '').trim();
+
         // Dispatch `txAdmin:events:announcement`
         const cmdOk = globals.fxRunner.sendEvent('announcement', {
+            message,
             author: ctx.session.auth.username,
-            message: (parameter ?? '').trim(),
         });
         ctx.utils.logAction(`Sending announcement: ${parameter}`);
 
+        // Sending discord announcement
+        const discMessage = message.replace(/\`/g, '\\`').replace(/\n/g, '\n> ');
+        const discMsgTitle = globals.translator.t(
+            'nui_menu.misc.announcement_title',
+            {author: ctx.session.auth.username}
+        );
+        await globals.discordBot.sendAnnouncement(`${discMsgTitle}\n> ${discMessage}`);
+
         return ctx.send({
             type: cmdOk ? 'success' : 'danger',
             message: 'Announcement sent!',