161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-21 19:53:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix updating host on updatePerson

Browse Source
This commit is contained in:
Laura Hausmann 2023-09-10 18:54:02 +02:00
parent a2fbf57769
commit 558b58a0cd
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,41 +187,45 @@ export async function createPerson(
const host = subjectHost ?? await getSubjectHostFromUri(object.id) ?? toPuny(new URL(object.id).hostname);
let checkUser = (await Users.findOneBy({
usernameLower: person.preferredUsername!.toLowerCase(),
host: toPuny(new URL(object.id).hostname),
})) as IRemoteUser | null;
const usernameLower = person.preferredUsername?.toLowerCase();
if (checkUser != null) {
logger.info('Person already exists');
if (host != checkUser.host) {
logger.info('Updating existing person with canonical account domain');
checkUser.host = host;
await Users.update(
{
usernameLower: checkUser.usernameLower,
host: checkUser.host,
},
{
host: host,
},
);
}
logger.info('Returning existing person');
return checkUser;
}
if (host != toPuny(new URL(object.id).hostname)) {
checkUser = (await Users.findOneBy({
usernameLower: person.preferredUsername!.toLowerCase(),
host: host,
if (usernameLower !== null) {
let checkUser = (await Users.findOneBy({
usernameLower: usernameLower,
host: toPuny(new URL(object.id).hostname),
})) as IRemoteUser | null;
if (checkUser != null) {
logger.info('Person already exists');
if (host != checkUser.host) {
logger.info(`Updating existing person with canonical account domain (${usernameLower}@${checkUser.host} -> ${usernameLower}@${host})`);
await Users.update(
{
usernameLower: usernameLower,
host: checkUser.host,
},
{
host: host,
},
);
checkUser.host = host;
}
logger.info('Returning existing person');
return checkUser;
}
if (host != toPuny(new URL(object.id).hostname)) {
checkUser = (await Users.findOneBy({
usernameLower: usernameLower,
host: host,
})) as IRemoteUser | null;
if (checkUser != null) {
logger.info('Person already exists');
logger.info('Returning existing person');
return checkUser;
}
}
}
const { fields } = analyzeAttachments(person.attachment || []);