merge upstream 2025-02-03

2025-02-03 14:31:26 -05:00 · 2025-02-03 14:31:26 -05:00 · a4e86758c1
commit a4e86758c1
parent 6bc0cd251f 9c70a4e631
264 changed files with 15775 additions and 4919 deletions
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@ -145,6 +145,7 @@ export class MetaEntityService {
 			enableUrlPreview: instance.urlPreviewEnabled,
 			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
 			maxFileSize: this.config.maxFileSize,
+			federation: this.meta.federation,
 		};

 		return packed;