Merge tag '2023.9.2' into merge-upstream

2023-09-29 22:16:04 +09:00 · 2023-09-29 22:16:04 +09:00 · e2c9ed355b
commit e2c9ed355b
parent 8d35299f62 7adc8fcaf5
144 changed files with 2519 additions and 1660 deletions
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@ -391,13 +391,9 @@ export const packedMeDetailedOnlySchema = {
 				nullable: false, optional: false,
 			},
 		},
-		mutingNotificationTypes: {
-			type: 'array',
-			nullable: true, optional: false,
-			items: {
-				type: 'string',
-				nullable: false, optional: false,
-			},
+		notificationRecieveConfig: {
+			type: 'object',
+			nullable: false, optional: false,
 		},
 		emailNotificationTypes: {
 			type: 'array',