refactor(channels): share target parsing helpers

src/channels/targets.ts

@@ -43,6 +43,30 @@ export function ensureTargetId(params: {
   return params.candidate;
 }
 
+export function parseTargetMention(params: {
+  raw: string;
+  mentionPattern: RegExp;
+  kind: MessagingTargetKind;
+}): MessagingTarget | undefined {
+  const match = params.raw.match(params.mentionPattern);
+  if (!match?.[1]) {
+    return undefined;
+  }
+  return buildMessagingTarget(params.kind, match[1], params.raw);
+}
+
+export function parseTargetPrefix(params: {
+  raw: string;
+  prefix: string;
+  kind: MessagingTargetKind;
+}): MessagingTarget | undefined {
+  if (!params.raw.startsWith(params.prefix)) {
+    return undefined;
+  }
+  const id = params.raw.slice(params.prefix.length).trim();
+  return id ? buildMessagingTarget(params.kind, id, params.raw) : undefined;
+}
+
 export function requireTargetKind(params: {
   platform: string;
   target: MessagingTarget | undefined;

src/discord/targets.ts

@@ -2,6 +2,8 @@ import type { DirectoryConfigParams } from "../channels/plugins/directory-config
 import {
   buildMessagingTarget,
   ensureTargetId,
+  parseTargetMention,
+  parseTargetPrefix,
   requireTargetKind,
   type MessagingTarget,
   type MessagingTargetKind,
@@ -23,21 +25,32 @@ export function parseDiscordTarget(
   if (!trimmed) {
     return undefined;
   }
-  const mentionMatch = trimmed.match(/^<@!?(\d+)>$/);
+  const mentionTarget = parseTargetMention({
-  if (mentionMatch) {
+    raw: trimmed,
-    return buildMessagingTarget("user", mentionMatch[1], trimmed);
+    mentionPattern: /^<@!?(\d+)>$/,
+    kind: "user",
+  });
+  if (mentionTarget) {
+    return mentionTarget;
   }
-  if (trimmed.startsWith("user:")) {
+  const prefixedTarget =
-    const id = trimmed.slice("user:".length).trim();
+    parseTargetPrefix({
-    return id ? buildMessagingTarget("user", id, trimmed) : undefined;
+      raw: trimmed,
-  }
+      prefix: "user:",
-  if (trimmed.startsWith("channel:")) {
+      kind: "user",
-    const id = trimmed.slice("channel:".length).trim();
+    }) ??
-    return id ? buildMessagingTarget("channel", id, trimmed) : undefined;
+    parseTargetPrefix({
-  }
+      raw: trimmed,
-  if (trimmed.startsWith("discord:")) {
+      prefix: "channel:",
-    const id = trimmed.slice("discord:".length).trim();
+      kind: "channel",
-    return id ? buildMessagingTarget("user", id, trimmed) : undefined;
+    }) ??
+    parseTargetPrefix({
+      raw: trimmed,
+      prefix: "discord:",
+      kind: "user",
+    });
+  if (prefixedTarget) {
+    return prefixedTarget;
   }
   if (trimmed.startsWith("@")) {
     const candidate = trimmed.slice(1).trim();

src/slack/targets.ts

@@ -1,6 +1,8 @@
 import {
   buildMessagingTarget,
   ensureTargetId,
+  parseTargetMention,
+  parseTargetPrefix,
   requireTargetKind,
   type MessagingTarget,
   type MessagingTargetKind,
@@ -21,21 +23,32 @@ export function parseSlackTarget(
   if (!trimmed) {
     return undefined;
   }
-  const mentionMatch = trimmed.match(/^<@([A-Z0-9]+)>$/i);
+  const mentionTarget = parseTargetMention({
-  if (mentionMatch) {
+    raw: trimmed,
-    return buildMessagingTarget("user", mentionMatch[1], trimmed);
+    mentionPattern: /^<@([A-Z0-9]+)>$/i,
+    kind: "user",
+  });
+  if (mentionTarget) {
+    return mentionTarget;
   }
-  if (trimmed.startsWith("user:")) {
+  const prefixedTarget =
-    const id = trimmed.slice("user:".length).trim();
+    parseTargetPrefix({
-    return id ? buildMessagingTarget("user", id, trimmed) : undefined;
+      raw: trimmed,
-  }
+      prefix: "user:",
-  if (trimmed.startsWith("channel:")) {
+      kind: "user",
-    const id = trimmed.slice("channel:".length).trim();
+    }) ??
-    return id ? buildMessagingTarget("channel", id, trimmed) : undefined;
+    parseTargetPrefix({
-  }
+      raw: trimmed,
-  if (trimmed.startsWith("slack:")) {
+      prefix: "channel:",
-    const id = trimmed.slice("slack:".length).trim();
+      kind: "channel",
-    return id ? buildMessagingTarget("user", id, trimmed) : undefined;
+    }) ??
+    parseTargetPrefix({
+      raw: trimmed,
+      prefix: "slack:",
+      kind: "user",
+    });
+  if (prefixedTarget) {
+    return prefixedTarget;
   }
   if (trimmed.startsWith("@")) {
     const candidate = trimmed.slice(1).trim();