Merge remote-tracking branch 'misskey-mattyatea/report' into develop

# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts

packages/backend/src/models/AbuseUserReport.ts

@@ -60,6 +60,16 @@ export class MiAbuseUserReport {
 	})
 	public comment: string;
 
+	@Column('jsonb', {
+		default: [],
+	})
+	public notes: any[];
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public noteIds: string[] | null;
+
 	//#region Denormalized fields
 	@Index()
 	@Column('varchar', {

packages/backend/src/models/Meta.ts

@@ -601,4 +601,9 @@ export class MiMeta {
 		default: false,
 	})
 	public requestEmojiAllOk: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public enableGDPRMode: boolean;
 }