Merge branch 'develop' into emoji-request

2023-10-16 21:50:42 +09:00 · 2023-10-16 21:50:42 +09:00 · 198f7748ce
commit 198f7748ce
parent 81ee7d9938 9338ab461e
25 changed files with 541 additions and 382 deletions
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@ -76,6 +76,11 @@ export class MiMeta {
 	})
 	public sensitiveWords: string[];

+	@Column('varchar', {
+		length: 1024, array: true, default: '{}',
+	})
+	public silencedHosts: string[];
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@ -93,6 +93,11 @@ export const packedFederationInstanceSchema = {
 			type: 'string',
 			optional: false, nullable: true,
 		},
+		isSilenced: {
+			type: "boolean",
+			optional: false,
+			nullable: false,
+		},
 		infoUpdatedAt: {
 			type: 'string',
 			optional: false, nullable: true,