diff options
| author | Hazel K <acomputerdog@gmail.com> | 2024-10-06 12:26:25 -0400 |
|---|---|---|
| committer | Hazel K <acomputerdog@gmail.com> | 2024-10-06 12:26:25 -0400 |
| commit | 047563bdde95c528da5c136bf98935a06840f47e (patch) | |
| tree | 154c9d666a13cfcd3b626a65942d3dc8f84b5aec /packages/backend/src/core | |
| parent | fix modlog and translations for "Mark as NSFW" (diff) | |
| parent | merge: Warn when a domain is implicitly blocked because a base domain is bloc... (diff) | |
| download | sharkey-047563bdde95c528da5c136bf98935a06840f47e.tar.gz sharkey-047563bdde95c528da5c136bf98935a06840f47e.tar.bz2 sharkey-047563bdde95c528da5c136bf98935a06840f47e.zip | |
Merge branch 'develop' into hazelnoot/579-reject-reports
# Conflicts:
# packages/frontend/src/pages/instance-info.vue
Diffstat (limited to 'packages/backend/src/core')
3 files changed, 3 insertions, 1 deletions
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 55d1054de9..499a163d6c 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -526,6 +526,7 @@ export class ApRendererService { publicKey: this.renderKey(user, keypair, '#main-key'), isCat: user.isCat, noindex: user.noindex, + indexable: !user.noindex, speakAsCat: user.speakAsCat, attachment: attachment.length ? attachment : undefined, }; diff --git a/packages/backend/src/core/activitypub/misc/contexts.ts b/packages/backend/src/core/activitypub/misc/contexts.ts index 815b20b910..86a665732a 100644 --- a/packages/backend/src/core/activitypub/misc/contexts.ts +++ b/packages/backend/src/core/activitypub/misc/contexts.ts @@ -545,6 +545,7 @@ const extension_context_definition = { Emoji: 'toot:Emoji', featured: 'toot:featured', discoverable: 'toot:discoverable', + indexable: 'toot:indexable', // schema schema: 'http://schema.org#', PropertyValue: 'schema:PropertyValue', diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts index 7b7a7921fb..382cda301f 100644 --- a/packages/backend/src/core/activitypub/models/ApNoteService.ts +++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts @@ -587,7 +587,7 @@ export class ApNoteService { // ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが // 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。 const createFrom = options.sentFrom?.origin === new URL(uri).origin ? value : uri; - return await this.createNote(createFrom, options.resolver, true); + return await this.createNote(createFrom, options.resolver, false); } finally { unlock(); } |