Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts: # package.json # packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
2023-10-19 16:43:24 +09:00 · 2023-10-19 16:43:24 +09:00 · 87d49b5bbf
commit 87d49b5bbf
parent 1b558e7243 431d8c7802
21 changed files with 173 additions and 68 deletions
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@ -179,6 +179,14 @@ export const packedNoteSchema = {
 			type: 'string',
 			optional: true, nullable: false,
 		},
+		reactionAndUserPairCache: {
+			type: 'array',
+			optional: true, nullable: false,
+			items: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},

 		myReaction: {
 			type: 'object',