fix(joinserver): join using server name)

Author: dev-737

src/commands/Main/joinserver.ts

@@ -9,7 +9,7 @@ import { getEmoji } from '#src/utils/EmojiUtils.js';
 import { t } from '#src/utils/Locale.js';
 import { replyWithUnknownMessage } from '#src/utils/moderation/modPanel/utils.js';
 import { findOriginalMessage } from '#src/utils/network/messageUtils.js';
-import { fetchUserLocale } from '#src/utils/Utils.js';
+import { fetchUserLocale, resolveEval } from '#src/utils/Utils.js';
 import type { Connection } from '@prisma/client';
 import { stripIndents } from 'common-tags';
 import {
@@ -18,7 +18,6 @@ import {
   ButtonBuilder,
   type ButtonInteraction,
   ButtonStyle,
-  type Message,
   type ModalSubmitInteraction,
 } from 'discord.js';
 
@@ -49,7 +48,6 @@ export default class JoinRequestCommand extends BaseCommand {
   }
 
   async execute(ctx: Context): Promise<void> {
-    const targetMessage = await ctx.getTargetMessage('messageorserverid');
     const commandChannelConnection = await fetchConnection(ctx.channelId);
 
     if (!commandChannelConnection) {
@@ -58,22 +56,23 @@ export default class JoinRequestCommand extends BaseCommand {
     }
 
     // Resolve the target server ID from the message or provided option.
-    const targetServerId = await this.resolveTargetServerId(
-      targetMessage,
-      ctx.options.getString('messageorserverid'),
-    );
+    const targetServerId = await this.resolveTargetServerId(ctx);
 
-    if (!targetMessage && !targetServerId) {
-      await ctx.reply('You must provide a message ID or server ID');
+    if (!targetServerId) {
+      await ctx.reply({
+        content: 'You must provide a message ID or server ID',
+        flags: ['Ephemeral'],
+      });
       return;
     }
 
     // Retrieve the connection for the target server.
     const connection = await this.findTargetConnection(commandChannelConnection, targetServerId);
     // Fallback: if no invite is available from the connection, try fetching server data.
-    const serverData = targetServerId && !connection?.invite
-      ? await db.serverData.findFirst({ where: { id: targetServerId } })
-      : null;
+    const serverData =
+      targetServerId && !connection?.invite
+        ? await db.serverData.findFirst({ where: { id: targetServerId } })
+        : null;
 
     // TODO: implement disabling join request in `/connection edit`
     if (connection?.joinRequestsDisabled) {
@@ -83,20 +82,22 @@ export default class JoinRequestCommand extends BaseCommand {
       return;
     }
 
-    const invite = connection?.invite ||
+    const invite =
+      connection?.invite ||
       (serverData?.inviteCode ? `https://discord.gg/${serverData.inviteCode}` : null);
 
     if (invite && targetServerId) {
       const server = await ctx.client.fetchGuild(targetServerId);
       await ctx.reply({
-        content: 'I have DM\'d you the invite link to the server!',
+        content: `${ctx.getEmoji('tick_icon')} I have DM'd you the invite link to the server!`,
         flags: ['Ephemeral'],
       });
       await ctx.user.send(stripIndents`
         ### Join Request
         You requested to join the server \`${server?.name}\` through InterChat. Here is the invite link:
         ${invite}
       `);
+      return;
     }
 
     const webhookURL = connection?.webhookURL;
@@ -111,7 +112,9 @@ export default class JoinRequestCommand extends BaseCommand {
       components: [
         new ActionRowBuilder<ButtonBuilder>().addComponents(
           new ButtonBuilder()
-            .setCustomId(new CustomID('joinReq:accept').setArgs(ctx.user.id, ctx.channelId).toString())
+            .setCustomId(
+              new CustomID('joinReq:accept').setArgs(ctx.user.id, ctx.channelId).toString(),
+            )
             .setLabel('Accept')
             .setStyle(ButtonStyle.Success),
           new ButtonBuilder()
@@ -130,24 +133,34 @@ export default class JoinRequestCommand extends BaseCommand {
   /**
    * Resolves the target server ID from a given message or option.
    */
-  private async resolveTargetServerId(
-    targetMessage: Message | null,
-    serverIdOpt: string | null,
-  ): Promise<string | null> {
+  private async resolveTargetServerId(ctx: Context): Promise<string | null> {
+    const targetMessage = await ctx.getTargetMessage('messageorserverid');
+    const serverIdOpt = ctx.options.getString('messageorserverid');
+
     if (targetMessage) {
       const originalMessage = await findOriginalMessage(targetMessage.id);
       return originalMessage?.guildId || serverIdOpt;
     }
+    const serverName = ctx.options.getString('servername');
+    if (serverName) {
+      // FIXME: Use database to get server names probably
+      const serverId = resolveEval<string>(
+        await ctx.client.cluster.broadcastEval(`
+        const server = this.guilds.cache.find(g => g.name === ${JSON.stringify(serverName)});
+        server?.id;
+      `),
+      );
+
+      return serverId || serverIdOpt;
+    }
+
     return serverIdOpt;
   }
 
   /**
    * Finds the connection for a given target server within the current hub.
    */
-  private async findTargetConnection(
-    channelConnection: Connection,
-    targetServerId: string | null,
-  ) {
+  private async findTargetConnection(channelConnection: Connection, targetServerId: string | null) {
     if (!targetServerId) return null;
 
     return await db.connection.findFirst({
@@ -196,11 +209,15 @@ export default class JoinRequestCommand extends BaseCommand {
       const user = await interaction.client.users.fetch(userId).catch(() => null);
       if (!user) return;
 
-      const dmStatus = await user.send(stripIndents`
+      const dmStatus = await user
+        .send(
+          stripIndents`
         ### Join Request
         You requested to join the server \`${interaction.guild?.name}\` through InterChat. Here is the invite link:
         ${inviteLink}
-      `).catch(() => null);
+      `,
+        )
+        .catch(() => null);
 
       await interaction.editReply(
         dmStatus