Merge remote-tracking branch 'misskey/master' into feature/2024.9.0

1 files changed, 19 insertions, 1 deletions

diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 0e244931d9..6f2c4ccf70 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -144,7 +144,7 @@ export class MiMeta {
 		nullable: true,
 	})
 	public sidebarLogoUrl: string | null;
-	
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
@@ -627,6 +627,11 @@ export class MiMeta {
 	})
 	public perUserListTimelineCacheMax: number;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public enableReactionsBuffering: boolean;
+
 	@Column('integer', {
 		default: 0,
 	})
@@ -682,4 +687,17 @@ export class MiMeta {
 		comment: 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions. Each item is regarded as an OR.',
 	})
 	public trustedLinkUrlPatterns: string[];
+
+	@Column('varchar', {
+		length: 128,
+		default: 'all',
+	})
+	public federation: 'all' | 'specified' | 'none';
+
+	@Column('varchar', {
+		length: 1024,
+		array: true,
+		default: '{}',
+	})
+	public federationHosts: string[];
 }