merge: upstream

2024-02-23 13:42:52 +01:00 · 2024-02-23 13:42:52 +01:00 · 15d2319011
commit 15d2319011
parent c2e02a4c61 c0156b740b
92 changed files with 1677 additions and 1086 deletions
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@ -149,4 +149,9 @@ export class MiInstance {
 		default: false,
 	})
 	public isNSFW: boolean;
+	
+	@Column('varchar', {
+		length: 16384, default: '',
+	})
+	public moderationNote: string;
 }