HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix ignoring person._misskey_summary on updating remote profiles

Browse source
This commit is contained in:
blueb 2023-12-04 04:45:33 +00:00 committed by Kainoa Kanter
parent 831b3d4ee2
commit e1dcba9aba
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
packages/backend/src/remote/activitypub/models/person.ts
View file

@ -276,26 +276,26 @@ export async function createPerson(
followersCount !== undefined followersCount !== undefined
? followersCount ? followersCount
: person.followers && : person.followers &&
typeof person.followers !== "string" && typeof person.followers !== "string" &&
isCollectionOrOrderedCollection(person.followers) isCollectionOrOrderedCollection(person.followers)
? person.followers.totalItems ? person.followers.totalItems
: undefined, : undefined,
followingCount: followingCount:
followingCount !== undefined followingCount !== undefined
? followingCount ? followingCount
: person.following && : person.following &&
typeof person.following !== "string" && typeof person.following !== "string" &&
isCollectionOrOrderedCollection(person.following) isCollectionOrOrderedCollection(person.following)
? person.following.totalItems ? person.following.totalItems
: undefined, : undefined,
notesCount: notesCount:
notesCount !== undefined notesCount !== undefined
? notesCount ? notesCount
: person.outbox && : person.outbox &&
typeof person.outbox !== "string" && typeof person.outbox !== "string" &&
isCollectionOrOrderedCollection(person.outbox) isCollectionOrOrderedCollection(person.outbox)
? person.outbox.totalItems ? person.outbox.totalItems
: undefined, : undefined,
featured: person.featured ? getApId(person.featured) : undefined, featured: person.featured ? getApId(person.featured) : undefined,
uri: person.id, uri: person.id,
tags, tags,
@ -315,8 +315,8 @@ export async function createPerson(
description: person._misskey_summary description: person._misskey_summary
? truncate(person._misskey_summary, summaryLength) ? truncate(person._misskey_summary, summaryLength)
: person.summary : person.summary
? htmlToMfm(truncate(person.summary, summaryLength), person.tag) ? htmlToMfm(truncate(person.summary, summaryLength), person.tag)
: null, : null,
url: url, url: url,
fields, fields,
birthday: bday ? bday[0] : null, birthday: bday ? bday[0] : null,
@ -527,26 +527,26 @@ export async function updatePerson(
followersCount !== undefined followersCount !== undefined
? followersCount ? followersCount
: person.followers && : person.followers &&
typeof person.followers !== "string" && typeof person.followers !== "string" &&
isCollectionOrOrderedCollection(person.followers) isCollectionOrOrderedCollection(person.followers)
? person.followers.totalItems ? person.followers.totalItems
: undefined, : undefined,
followingCount: followingCount:
followingCount !== undefined followingCount !== undefined
? followingCount ? followingCount
: person.following && : person.following &&
typeof person.following !== "string" && typeof person.following !== "string" &&
isCollectionOrOrderedCollection(person.following) isCollectionOrOrderedCollection(person.following)
? person.following.totalItems ? person.following.totalItems
: undefined, : undefined,
notesCount: notesCount:
notesCount !== undefined notesCount !== undefined
? notesCount ? notesCount
: person.outbox && : person.outbox &&
typeof person.outbox !== "string" && typeof person.outbox !== "string" &&
isCollectionOrOrderedCollection(person.outbox) isCollectionOrOrderedCollection(person.outbox)
? person.outbox.totalItems ? person.outbox.totalItems
: undefined, : undefined,
featured: person.featured, featured: person.featured,
emojis: emojiNames, emojis: emojiNames,
name: truncate(person.name, nameLength), name: truncate(person.name, nameLength),
@ -590,9 +590,11 @@ export async function updatePerson(
{ {
url: url, url: url,
fields, fields,
description: person.summary description: person._misskey_summary
? htmlToMfm(truncate(person.summary, summaryLength), person.tag) ? truncate(person._misskey_summary, summaryLength)
: null, : person.summary
? htmlToMfm(truncate(person.summary, summaryLength), person.tag)
: null,
birthday: bday ? bday[0] : null, birthday: bday ? bday[0] : null,
location: person["vcard:Address"] || null, location: person["vcard:Address"] || null,
}, },