e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

[backend] Actually resolve with objectHost

Browse source
This commit is contained in:
Laura Hausmann 2023-10-14 17:16:21 +02:00
parent 8719a6922e
commit c0d7ecf5c3
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/remote/resolve-user.ts
View file

@ -179,15 +179,17 @@ export async function resolveUser(
export async function resolveMentionWithFallback(username: string, host: string | null, objectHost: string | null, cache: IMentionedRemoteUsers): Promise<string> {
let fallback = `${config.url}/@${username}`;
if (host !== null) fallback += `@${host}`;
else if (objectHost !== null) fallback += `@${objectHost}`;
if (host !== null && host !== config.domain)
fallback += `@${host}`;
else if (objectHost !== null && objectHost !== config.domain && host !== config.domain)
fallback += `@${objectHost}`;
const cached = cache.find(r => r.username.toLowerCase() === username.toLowerCase() && r.host === host);
if (cached) return cached.url ?? cached.uri;
if (host === null || host === config.domain) return fallback;
if ((host === null && objectHost === null) || host === config.domain) return fallback;
try {
const user = await resolveUser(username, host, false);
const user = await resolveUser(username, host ?? objectHost, false);
const profile = await UserProfiles.findOneBy({ userId: user.id });
return profile?.url ?? user.uri ?? fallback;
}