devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

fix(federation): create replicated-user stubs with realname@domain when hint provided

Browse Source 
When friend_request_create / friend_add / DM relay carries a profile snapshot,
the canonical-username hint is now used as the stub's local-part. Stubs created
purely from S2S (no client-federation) now display the human-readable handle,
not the homeUserId snowflake. Falls back to the snowflake-id scheme only when
no hint is available.
This commit is contained in:
Jannis Braun
2026-05-05 15:46:26 +02:00
parent 702d539e23
commit 1d353c994b
2 changed files with 95 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/routes/federation.ts
+9 -5
View File
@@ -3181,9 +3181,13 @@ export function resolveOrCreateReplicatedUser(
return null;
}
// Use the snowflake-style homeUserId as the local part; append the
// domain so the username is globally unique and human-readable.
const baseUsername = `${homeUserId}@${domain}`.toLowerCase();
// Use the home user's real username when the caller passes a hint (the wire
// profile snapshot from friend_request_create / friend_add / DM relay carries
// it). This makes the local stub's `username` human-readable, so client-side
// `parseFederatedUsername(username).baseName` returns the real handle. Falls
// back to the snowflake-id scheme when no hint is available (legacy paths).
const localPart = (hints?.username ?? homeUserId).toLowerCase();
const baseUsername = `${localPart}@${domain}`.toLowerCase();
// Guard against the (unlikely) case where this username already
// exists — e.g. a prior partial replication or manual creation.
@@ -3192,11 +3196,11 @@ export function resolveOrCreateReplicatedUser(
let attempt = 0;
while (collision) {
attempt++;
username = `${homeUserId}_${attempt}@${domain}`.toLowerCase();
username = `${localPart}_${attempt}@${domain}`.toLowerCase();
collision = db.select().from(schema.users).where(eq(schema.users.username, username)).get();
if (attempt > 10) {
// Extremely unlikely; use a random suffix to break out
username = `${homeUserId}_${randomBytes(4).toString('hex')}@${domain}`.toLowerCase();
username = `${localPart}_${randomBytes(4).toString('hex')}@${domain}`.toLowerCase();
break;
}
}