From 77f02c805eaa20ee6b6cf6ee05251b942acafa32 Mon Sep 17 00:00:00 2001
From: Jannis Braun <151788261+TheZwiss@users.noreply.github.com>
Date: Tue, 31 Mar 2026 04:41:14 +0200
Subject: [PATCH] refactor(federation): extract extractDomain helper from
 resolveOrCreateReplicatedUser

---
 packages/server/src/routes/federation.ts | 26 +++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/routes/federation.ts b/packages/server/src/routes/federation.ts
index 1ca31c09..6a52b794 100644
--- a/packages/server/src/routes/federation.ts
+++ b/packages/server/src/routes/federation.ts
@@ -867,6 +867,20 @@ export async function federationRoutes(app: FastifyInstance): Promise<void> {
 
 // ─── Relay Event Processors ──────────────────────────────────────────────────
 
+/**
+ * Extract bare domain from a homeInstance value.
+ * Handles both full URLs ("https://nova.ddns.net") and bare domains ("nova.ddns.net").
+ * Used to normalize homeInstance to a canonical format for identity matching.
+ */
+export function extractDomain(homeInstance: string): string {
+  try {
+    return new URL(homeInstance).hostname;
+  } catch {
+    // Already a bare domain or malformed — strip protocol manually
+    return homeInstance.replace(/^https?:\/\//, '').split('/')[0] ?? homeInstance;
+  }
+}
+
 /**
  * Resolve a home user ID to a local user.
  * Matches users where home_user_id = homeUserId, or where
@@ -914,16 +928,8 @@ export function resolveOrCreateReplicatedUser(
   const existing = resolveLocalUser(homeUserId, db);
   if (existing) return existing;
 
-  // Build a username@domain identifier.  Extract the domain from the
-  // homeInstance URL (strip protocol) so it matches the convention used
-  // by the normal replicated-user registration path.
-  let domain: string;
-  try {
-    domain = new URL(homeInstance).hostname;
-  } catch {
-    // Fallback: strip protocol manually
-    domain = homeInstance.replace(/^https?:\/\//, '').split('/')[0] ?? homeInstance;
-  }
+  // Extract bare domain from homeInstance for username construction
+  const domain = extractDomain(homeInstance);
 
   // Use the snowflake-style homeUserId as the local part; append the
   // domain so the username is globally unique and human-readable.