merge: upstream

This commit is contained in:
Mar0xy 2023-11-22 23:40:27 +01:00
commit 42bf8e5e76
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
86 changed files with 3938 additions and 2258 deletions

View file

@ -152,6 +152,7 @@ describe('Timelines', () => {
await api('/following/create', { userId: bob.id }, alice);
await api('/following/create', { userId: carol.id }, alice);
await api('/following/create', { userId: carol.id }, bob);
await api('/following/update', { userId: bob.id, withReplies: true }, alice);
await sleep(1000);
const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });

View file

@ -94,6 +94,7 @@ describe('ActivityPub', () => {
cacheRemoteFiles: true,
cacheRemoteSensitiveFiles: true,
enableFanoutTimeline: true,
enableFanoutTimelineDbFallback: true,
perUserHomeTimelineCacheMax: 800,
perLocalUserUserTimelineCacheMax: 800,
perRemoteUserUserTimelineCacheMax: 800,