summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/entities
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-04-02 22:29:14 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-04-02 22:29:14 -0400
commitdab9b518e48f04833708a1704e331fd262f575bd (patch)
treeca4dfba2efbe5d550c7d19474d4d91850cb6ccd2 /packages/backend/src/core/entities
parentfix vue warning about render functions (diff)
parent🎨 (diff)
downloadsharkey-dab9b518e48f04833708a1704e331fd262f575bd.tar.gz
sharkey-dab9b518e48f04833708a1704e331fd262f575bd.tar.bz2
sharkey-dab9b518e48f04833708a1704e331fd262f575bd.zip
merge from misskey-develop
Diffstat (limited to 'packages/backend/src/core/entities')
-rw-r--r--packages/backend/src/core/entities/AntennaEntityService.ts1
-rw-r--r--packages/backend/src/core/entities/MetaEntityService.ts1
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/backend/src/core/entities/AntennaEntityService.ts b/packages/backend/src/core/entities/AntennaEntityService.ts
index e770028af3..e81c1e8db4 100644
--- a/packages/backend/src/core/entities/AntennaEntityService.ts
+++ b/packages/backend/src/core/entities/AntennaEntityService.ts
@@ -41,6 +41,7 @@ export class AntennaEntityService {
excludeBots: antenna.excludeBots,
withReplies: antenna.withReplies,
withFile: antenna.withFile,
+ hideNotesInSensitiveChannel: antenna.hideNotesInSensitiveChannel,
isActive: antenna.isActive,
hasUnreadNote: false, // TODO
notify: false, // 後方互換性のため
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 9c2a5deeb8..294187feba 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -139,6 +139,7 @@ export class MetaEntityService {
policies: { ...DEFAULT_POLICIES, ...instance.policies },
+ sentryForFrontend: this.config.sentryForFrontend ?? null,
mediaProxy: this.config.mediaProxy,
enableUrlPreview: instance.urlPreviewEnabled,
noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',