feat(message-info): improve message info command

.vscode/settings.json

@@ -6,5 +6,9 @@
   "eslint.validate": ["javascript", "typescript"],
   "eslint.useFlatConfig": true,
   "typescript.tsdk": "node_modules/typescript/lib",
-  "typescript.preferences.importModuleSpecifier": "non-relative"
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  "sonarlint.connectedMode.project": {
+    "connectionId": "discord-interchat",
+    "projectKey": "Discord-InterChat_InterChat"
+  }
 }

src/commands/context-menu/messageInfo.ts

@@ -89,8 +89,7 @@ export default class MessageInfo extends BaseCommand {
     const connection = (await getHubConnections(originalMsg.hub.id))?.find(
       (c) => c.connected && c.serverId === originalMsg.serverId,
     );
-    const expiry = new Date(Date.now() + 5 * 60 * 1000); // 5 minutes
-    const components = this.buildButtons(expiry, locale, {
+    const components = this.buildButtons(locale, {
       buildModActions: isStaffOrHubMod(interaction.user.id, originalMsg.hub),
       inviteButtonUrl: connection?.invite,
     });
@@ -258,7 +257,7 @@ export default class MessageInfo extends BaseCommand {
     await interaction.deferUpdate();
     const createdAt = Math.round(author.createdTimestamp / 1000);
     const hubsOwned = await db.hub.count({ where: { ownerId: author.id } });
-    const displayName = author.globalName || 'Not Set.';
+    const displayName = author.globalName ?? 'Not Set.';
 
     const userEmbed = new EmbedBuilder()
       .setDescription(`### ${emojis.info} ${author.username}`)
@@ -320,7 +319,13 @@ export default class MessageInfo extends BaseCommand {
     { originalMsg }: ModActionsOpts,
   ) {
     if (!isValidDbMsgWithHubId(originalMsg)) return;
-    if (!originalMsg.hub || isStaffOrHubMod(interaction.user.id, originalMsg.hub)) return;
+    if (!originalMsg.hub || !isStaffOrHubMod(interaction.user.id, originalMsg.hub)) {
+      await interaction.reply({
+        content: t({ phrase: 'hub.notFound_mod', locale: 'en' }, { emoji: emojis.no }),
+        ephemeral: true,
+      });
+      return;
+    }
 
     const { buttons, embed } = await modActionsPanel.buildMessage(interaction, originalMsg);
     await interaction.reply({ embeds: [embed], components: buttons, ephemeral: true });
@@ -387,7 +392,6 @@ export default class MessageInfo extends BaseCommand {
   }
 
   private buildButtons(
-    expiry: Date,
     locale: supportedLocaleCodes = 'en',
     opts?: { buildModActions?: boolean; inviteButtonUrl?: string | null },
   ) {
@@ -396,7 +400,7 @@ export default class MessageInfo extends BaseCommand {
         .setLabel(t({ phrase: 'msgInfo.buttons.report', locale }))
         .setStyle(ButtonStyle.Danger)
         .setCustomId(
-          new CustomID().setIdentifier('msgInfo', 'report').setExpiry(expiry).toString(),
+          new CustomID().setIdentifier('msgInfo', 'report').toString(),
         ),
     ];
 
@@ -407,7 +411,7 @@ export default class MessageInfo extends BaseCommand {
           .setEmoji('🛠️')
           .setLabel('Mod Actions')
           .setCustomId(
-            new CustomID().setIdentifier('msgInfo', 'modActions').setExpiry(expiry).toString(),
+            new CustomID().setIdentifier('msgInfo', 'modActions').toString(),
           ),
       );
     }
@@ -428,19 +432,19 @@ export default class MessageInfo extends BaseCommand {
           .setStyle(ButtonStyle.Secondary)
           .setDisabled(true)
           .setCustomId(
-            new CustomID().setIdentifier('msgInfo', 'msgInfo').setExpiry(expiry).toString(),
+            new CustomID().setIdentifier('msgInfo', 'msgInfo').toString(),
           ),
         new ButtonBuilder()
           .setLabel(t({ phrase: 'msgInfo.buttons.server', locale }))
           .setStyle(ButtonStyle.Secondary)
           .setCustomId(
-            new CustomID().setIdentifier('msgInfo', 'serverInfo').setExpiry(expiry).toString(),
+            new CustomID().setIdentifier('msgInfo', 'serverInfo').toString(),
           ),
         new ButtonBuilder()
           .setLabel(t({ phrase: 'msgInfo.buttons.user', locale }))
           .setStyle(ButtonStyle.Secondary)
           .setCustomId(
-            new CustomID().setIdentifier('msgInfo', 'userInfo').setExpiry(expiry).toString(),
+            new CustomID().setIdentifier('msgInfo', 'userInfo').toString(),
           ),
       ),
       new ActionRowBuilder<ButtonBuilder>({ components: extras }),

src/commands/context-menu/modActions.ts

@@ -37,7 +37,7 @@ export default class Blacklist extends BaseCommand {
     dm_permission: false,
   };
 
-  private modActionHandlers: Record<string, ModAction>;
+  private readonly modActionHandlers: Record<string, ModAction>;
 
   constructor() {
     super();

src/core/BaseCommand.ts

@@ -1,7 +1,6 @@
 import { emojis } from '#main/config/Constants.js';
 import { MetadataHandler } from '#main/core/FileLoader.js';
 import { InteractionFunction } from '#main/decorators/Interaction.js';
-import { TranslationKeys } from '#main/types/locale.js';
 import { InfoEmbed } from '#main/utils/EmbedUtils.js';
 import { supportedLocaleCodes, t } from '#main/utils/Locale.js';
 import Logger from '#main/utils/Logger.js';
@@ -127,7 +126,7 @@ export default abstract class BaseCommand {
 
   async replyEmbed(
     interaction: RepliableInteraction | MessageComponentInteraction,
-    desc: keyof TranslationKeys | (string & {}),
+    desc: string,
     opts?: {
       content?: string;
       title?: string;
@@ -161,7 +160,6 @@ export default abstract class BaseCommand {
       opts.commandsMap.set(this.data.name, this);
       this.loadCommandInteractions(this, opts.interactionsMap);
     }
-
     else {
       const parentCommand = Object.getPrototypeOf(this.constructor) as typeof BaseCommand;
       parentCommand.subcommands?.set(fileName.replace('.js', ''), this);

src/core/FileLoader.ts

@@ -38,8 +38,8 @@ export class MetadataHandler {
 }
 
 export class FileLoader {
-  private baseDir: string;
-  private recursive: boolean;
+  private readonly baseDir: string;
+  private readonly recursive: boolean;
 
   constructor(baseDir: string, opts?: { recursive: boolean }) {
     this.baseDir = baseDir;