merge: timeline 1

2023-10-03 20:26:11 +09:00 · 2023-10-03 20:26:11 +09:00 · f6ba5cfaf4
commit f6ba5cfaf4
parent fe4345d191
84 changed files with 1898 additions and 947 deletions
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@ -505,6 +505,7 @@ export class UserEntityService implements OnModuleInit {
 				isMuted: relation.isMuted,
 				isRenoteMuted: relation.isRenoteMuted,
 				notify: relation.following?.notify ?? 'none',
+				withReplies: relation.following?.withReplies ?? false,
 			} : {}),
 		} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;