merge: upstream changes

2023-10-18 19:48:03 +02:00 · 2023-10-18 19:48:03 +02:00 · 4b230d792c
commit 4b230d792c
parent c4b0f47ba1 de6e15e36d
63 changed files with 1250 additions and 830 deletions
--- a/packages/backend/src/models/FollowRequest.ts
+++ b/packages/backend/src/models/FollowRequest.ts
@ -45,6 +45,11 @@ export class MiFollowRequest {
 	})
 	public requestId: string | null;

+	@Column('boolean', {
+		default: false,
+	})
+	public withReplies: boolean;
+
 	//#region Denormalized fields
 	@Column('varchar', {
 		length: 128, nullable: true,