feat: split resolvePlayer

src/core/blitz/getBlitzClan.ts

@@ -1,6 +1,6 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import { BlitzServer } from '../../constants/servers.js';
-import { serverAndIdPattern } from '../discord/resolvePlayer.js';
+import { serverAndIdPattern } from '../discord/resolvePlayerFromCommand.js';
 import errorWithCause from '../node/errorWithCause.js';
 import listClansPanServer from './listClansPanServer.js';
 

src/core/discord/resolvePlayer.ts

@@ -1,67 +0,0 @@
-import {
-  ButtonInteraction,
-  CacheType,
-  ChatInputCommandInteraction,
-} from 'discord.js';
-import { CYCLIC_API } from '../../constants/cyclic.js';
-import { BlitzServer } from '../../constants/servers.js';
-import listAccountsPanServer, {
-  usernamePatternWithoutPosition,
-} from '../blitz/listAccountsPanServer.js';
-import errorWithCause from '../node/errorWithCause.js';
-
-export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
-
-export interface ResolvedPlayer {
-  server: BlitzServer;
-  id: number;
-}
-
-export default async function resolvePlayer(
-  interaction:
-    | ChatInputCommandInteraction<CacheType>
-    | ButtonInteraction<CacheType>,
-) {
-  if (interaction instanceof ChatInputCommandInteraction) {
-    const commandUsername = interaction.options.getString('username');
-    const displayName = interaction.guild?.members.cache
-      .get(interaction.user.id)
-      ?.displayName.match(usernamePatternWithoutPosition)?.[0];
-    const username = commandUsername ?? displayName;
-
-    if (username === undefined) {
-      throw errorWithCause(
-        'Username could not be inferred',
-        "You didn't provide me a username in the command nor was I able to infer your Blitz username from your Discord nickname. Try providing a username manually in the command or using the `/verify` command to set your Discord nickname to your Blitz username.",
-      );
-    }
-
-    if (serverAndIdPattern.test(username)) {
-      const [server, accountId] = username.split('/');
-      return {
-        server: server as BlitzServer,
-        id: Number(accountId),
-      } satisfies ResolvedPlayer;
-    } else {
-      const accounts = await listAccountsPanServer(username);
-
-      if (accounts[0]) {
-        return {
-          server: accounts[0].server,
-          id: accounts[0].account_id,
-        } satisfies ResolvedPlayer;
-      } else {
-        throw errorWithCause(
-          'Could not find user',
-          `I couldn't find user \`${username}\`. Try providing a valid username manually or using the \`/verify\` command to set your Discord nickname to your Blitz username.`,
-        );
-      }
-    }
-  } else {
-    const url = new URL(`${CYCLIC_API}/${interaction.customId}`);
-    return {
-      id: parseInt(url.searchParams.get('id')!),
-      server: url.searchParams.get('server') as BlitzServer,
-    } satisfies ResolvedPlayer;
-  }
-}

src/core/discord/resolvePlayerFromButton.ts

@@ -0,0 +1,9 @@
+import { ButtonInteraction, CacheType } from 'discord.js';
+import { CYCLIC_API } from '../../constants/cyclic.js';
+import resolvePlayerFromURL from '../express/resolvePlayerFromURL.js';
+
+export default async function resolvePlayerFromButton(
+  interaction: ButtonInteraction<CacheType>,
+) {
+  return resolvePlayerFromURL(`${CYCLIC_API}/${interaction.customId}`);
+}

src/core/discord/resolvePlayerFromCommand.ts

@@ -0,0 +1,52 @@
+import { CacheType, ChatInputCommandInteraction } from 'discord.js';
+import { BlitzServer } from '../../constants/servers.js';
+import listAccountsPanServer, {
+  usernamePatternWithoutPosition,
+} from '../blitz/listAccountsPanServer.js';
+import errorWithCause from '../node/errorWithCause.js';
+
+export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
+
+export interface ResolvedPlayer {
+  server: BlitzServer;
+  id: number;
+}
+
+export default async function resolvePlayerFromCommand(
+  interaction: ChatInputCommandInteraction<CacheType>,
+) {
+  const commandUsername = interaction.options.getString('username');
+  const displayName = interaction.guild?.members.cache
+    .get(interaction.user.id)
+    ?.displayName.match(usernamePatternWithoutPosition)?.[0];
+  const username = commandUsername ?? displayName;
+
+  if (username === undefined) {
+    throw errorWithCause(
+      'Username could not be inferred',
+      "You didn't provide me a username in the command nor was I able to infer your Blitz username from your Discord nickname. Try providing a username manually in the command or using the `/verify` command to set your Discord nickname to your Blitz username.",
+    );
+  }
+
+  if (serverAndIdPattern.test(username)) {
+    const [server, accountId] = username.split('/');
+    return {
+      server: server as BlitzServer,
+      id: Number(accountId),
+    } satisfies ResolvedPlayer;
+  } else {
+    const accounts = await listAccountsPanServer(username);
+
+    if (accounts[0]) {
+      return {
+        server: accounts[0].server,
+        id: accounts[0].account_id,
+      } satisfies ResolvedPlayer;
+    } else {
+      throw errorWithCause(
+        'Could not find user',
+        `I couldn't find user \`${username}\`. Try providing a valid username manually or using the \`/verify\` command to set your Discord nickname to your Blitz username.`,
+      );
+    }
+  }
+}

src/core/express/resolvePlayerFromRequest.ts

@@ -0,0 +1,7 @@
+import { Request } from 'express';
+import { CYCLIC_API } from '../../constants/cyclic.js';
+import resolvePlayerFromURL from './resolvePlayerFromURL.js';
+
+export default async function resolvePlayerFromRequest(request: Request) {
+  return resolvePlayerFromURL(`${CYCLIC_API}${request.path}`);
+}

src/core/express/resolvePlayerFromURL.ts

@@ -0,0 +1,11 @@
+import { BlitzServer } from '../../constants/servers.js';
+import { ResolvedPlayer } from '../discord/resolvePlayerFromCommand.js';
+
+export default async function resolvePlayerFromURL(urlString: string) {
+  const url = new URL(urlString);
+
+  return {
+    id: parseInt(url.searchParams.get('id')!),
+    server: url.searchParams.get('server') as BlitzServer,
+  } satisfies ResolvedPlayer;
+}