Merge branch 'develop' into feature/2024.10

2 files changed, 17 insertions, 2 deletions

diff --git a/packages/backend/src/models/User.ts b/packages/backend/src/models/User.ts
index a4481a1f81..3a825d36a7 100644
--- a/packages/backend/src/models/User.ts
+++ b/packages/backend/src/models/User.ts
@@ -32,7 +32,7 @@ export class MiUser {
 	public lastActiveDate: Date | null;
 
 	@Column('boolean', {
-		default: false,
+		default: true,
 	})
 	public hideOnlineStatus: boolean;
 
@@ -160,7 +160,7 @@ export class MiUser {
 		length: 128, nullable: true,
 	})
 	public backgroundBlurhash: string | null;
-	
+
 	@Column('jsonb', {
 		default: [],
 	})
@@ -328,6 +328,17 @@ export class MiUser {
 	})
 	public signupReason: string | null;
 
+	/**
+	 * True if profile RSS feeds are enabled for this user.
+	 * Enabled by default (opt-out) for existing users, to avoid breaking any existing feeds.
+	 * Disabled by default (opt-in) for newly created users, for privacy.
+	 */
+	@Column('boolean', {
+		name: 'enable_rss',
+		default: true,
+	})
+	public enableRss: boolean;
+
 	constructor(data: Partial<MiUser>) {
 		if (data == null) return;
 
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 46aa06c392..f953008b3f 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -130,6 +130,10 @@ export const packedUserLiteSchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
+		enableRss: {
+			type: 'boolean',
+			nullable: false, optional: false,
+		},
 		isBot: {
 			type: 'boolean',
 			nullable: false, optional: true,