161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 04:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix initial fetch of actual remote user host for remote gotosocial instances on createPerson, resolves #204

Browse Source
This commit is contained in:
Laura Hausmann 2023-09-11 18:37:18 +02:00
parent 43f136c50f
commit 86defdffd3
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/src/remote/activitypub/models/person.ts
View File

@ -48,7 +48,11 @@ import Resolver from "../resolver.js";
import { extractApHashtags } from "./tag.js";
import { resolveNote, extractEmojis } from "./note.js";
import { resolveImage } from "./image.js";
import { getSubjectHostFromUri, getSubjectHostFromRemoteUser } from "@/remote/resolve-user.js"
import {
getSubjectHostFromUri,
getSubjectHostFromRemoteUser,
getSubjectHostFromAcctParts
} from "@/remote/resolve-user.js"
const logger = apLogger;
@ -185,10 +189,12 @@ export async function createPerson(
logger.info(`Creating the Person: ${person.id}`);
const host = subjectHost ?? await getSubjectHostFromUri(object.id) ?? toPuny(new URL(object.id).hostname);
const usernameLower = person.preferredUsername?.toLowerCase();
const urlHostname = toPuny(new URL(object.id).hostname);
const host = subjectHost ?? await getSubjectHostFromUri(object.id) ?? await getSubjectHostFromAcctParts(usernameLower, urlHostname) ?? urlHostname;
if (usernameLower !== null) {
let checkUser = (await Users.findOneBy({
usernameLower: usernameLower,

4
packages/backend/src/remote/resolve-user.ts
View File

@ -207,6 +207,10 @@ export async function getSubjectHostFromRemoteUser(user: IRemoteUser | undefined
return user ? getSubjectHostFromAcct(`${user.username}@${user.host}`) : null;
}
export async function getSubjectHostFromAcctParts(username?: string | undefined, host?: string | undefined): Promise<string | null> {
return username !== null && host !== null ? getSubjectHostFromAcct(`${username}@${host}`) : null;
}
async function resolveUserWebFinger(acctLower: string, recurse: boolean = true): Promise<{
subject: string,
self: {