Merge remote-tracking branch 'misskey-dev/develop' into io

2024-03-02 05:23:53 +09:00 · 2024-03-02 05:23:53 +09:00 · 9ab785c48f
commit 9ab785c48f
parent 62e7961aea fe5efd926e
94 changed files with 4169 additions and 2564 deletions
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@ -13,7 +13,7 @@ export const notificationRecieveConfig = {
 				type: {
 					type: 'string',
 					nullable: false,
-					enum: ['all', 'following', 'follower', 'mutualFollow', 'never'],
+					enum: ['all', 'following', 'follower', 'mutualFollow', 'followingOrFollower', 'never'],
 				},
 			},
 			required: ['type'],