merge: branch develop

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,

packages/backend/src/models/Meta.ts

@@ -252,6 +252,11 @@ export class MiMeta {
 	})
 	public enableSensitiveMediaDetectionForVideos: boolean;
 
+	@Column('boolean', {
+		default: true,
+	})
+	public enableBotTrending: boolean;
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,

packages/backend/src/models/User.ts

@@ -173,6 +173,12 @@ export class MiUser {
 	})
 	public isSuspended: boolean;
 
+	@Column('boolean', {
+		default: false,
+		comment: 'Whether the User is silenced.',
+	})
+	public isSilenced: boolean;
+
 	@Column('boolean', {
 		default: false,
 		comment: 'Whether the User is locked.',

packages/backend/src/models/json-schema/user.ts

@@ -47,6 +47,10 @@ export const packedUserLiteSchema = {
 			nullable: false, optional: true,
 			default: false,
 		},
+		isSilenced: {
+			type: 'boolean',
+			nullable: false, optional: false,
+		},
 		isBot: {
 			type: 'boolean',
 			nullable: false, optional: true,
@@ -135,10 +139,6 @@ export const packedUserDetailedNotMeOnlySchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
-		isSilenced: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
 		isSuspended: {
 			type: 'boolean',
 			nullable: false, optional: false,