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

# Conflicts: # package.json # packages/frontend/src/components/MkPostForm.vue # packages/frontend/src/navbar.ts
2023-12-02 00:47:40 +09:00 · 2023-12-02 00:47:40 +09:00 · 1802c5da5f
commit 1802c5da5f
parent e3761231b1 5cd4c36cad
59 changed files with 1606 additions and 951 deletions
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@ -191,6 +191,10 @@ export const packedNoteSchema = {
 				optional: false, nullable: false,
 			},
 		},
+		clippedCount: {
+			type: 'number',
+			optional: true, nullable: false,
+		},

 		myReaction: {
 			type: 'object',