merge: upstream

2023-10-31 19:33:24 +01:00 · 2023-10-31 19:33:24 +01:00 · 4dd23a3793
commit 4dd23a3793
parent c491385f2e bf01c1ee64
217 changed files with 6773 additions and 2275 deletions
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@ -93,6 +93,7 @@ describe('ActivityPub', () => {
 	const metaInitial = {
 		cacheRemoteFiles: true,
 		cacheRemoteSensitiveFiles: true,
+		enableFanoutTimeline: true,
 		perUserHomeTimelineCacheMax: 800,
 		perLocalUserUserTimelineCacheMax: 800,
 		perRemoteUserUserTimelineCacheMax: 800,