summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCDN <cardinal@codeword.info>2024-11-16 17:53:28 +0800
committerGitHub <noreply@github.com>2024-11-16 18:53:28 +0900
commitb3c2de2b2643d777d360de0171ae573f39411c02 (patch)
treede7fab6a7c805a4b13ddb52f32944907c8210294
parentadd warning for open registration (#14963) (diff)
downloadmisskey-b3c2de2b2643d777d360de0171ae573f39411c02.tar.gz
misskey-b3c2de2b2643d777d360de0171ae573f39411c02.tar.bz2
misskey-b3c2de2b2643d777d360de0171ae573f39411c02.zip
fix(backend): fallback sharedInbox to null in ApPersonService (#14970)
-rw-r--r--packages/backend/src/core/activitypub/models/ApPersonService.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index c9de67b3a0..8c4e40c561 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -355,7 +355,7 @@ export class ApPersonService implements OnModuleInit {
usernameLower: person.preferredUsername?.toLowerCase(),
host,
inbox: person.inbox,
- sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
+ sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
followersUri: person.followers ? getApId(person.followers) : undefined,
featured: person.featured ? getApId(person.featured) : undefined,
uri: person.id,
@@ -521,7 +521,7 @@ export class ApPersonService implements OnModuleInit {
const updates = {
lastFetchedAt: new Date(),
inbox: person.inbox,
- sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
+ sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
followersUri: person.followers ? getApId(person.followers) : undefined,
featured: person.featured,
emojis: emojiNames,
@@ -593,7 +593,7 @@ export class ApPersonService implements OnModuleInit {
// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
await this.followingsRepository.update(
{ followerId: exist.id },
- { followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox },
+ { followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null },
);
await this.updateFeatured(exist.id, resolver).catch(err => this.logger.error(err));