Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

CHANGELOG.md

@@ -73,6 +73,8 @@ You should also include the user name that made the change.
 - Server: trim long text of note from ap @syuilo
 - Server: Ap inboxの最大ペイロードサイズを64kbに制限 @syuilo
 - Server: アンテナの作成数上限を追加 @syuilo
+- Server: pages/likeのエラーIDが重複しているのを修正 @syuilo
+- Server: pages/updateのパラメータによってはsummaryの値が更新されないのを修正 @syuilo
 - Client: case insensitive emoji search @saschanaz
 - Client: InAppウィンドウが操作できなくなることがあるのを修正 @tamaina
 - Client: use proxied image for instance icon @syuilo

packages/backend/src/server/api/endpoints/pages/like.ts

@@ -28,7 +28,7 @@ export const meta = {
 		alreadyLiked: {
 			message: 'The page has already been liked.',
 			code: 'ALREADY_LIKED',
-			id: 'cc98a8a2-0dc3-4123-b198-62c71df18ed3',
+			id: 'd4c1edbe-7da2-4eae-8714-1acfd2d63941',
 		},
 	},
 } as const;

packages/backend/src/server/api/endpoints/pages/update.ts

@@ -111,7 +111,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				updatedAt: new Date(),
 				title: ps.title,
 				name: ps.name === undefined ? page.name : ps.name,
-				summary: ps.name === undefined ? page.summary : ps.summary,
+				summary: ps.summary === undefined ? page.summary : ps.summary,
 				content: ps.content,
 				variables: ps.variables,
 				script: ps.script,

packages/frontend/src/components/MkSuperMenu.vue

@@ -62,7 +62,7 @@ export default defineComponent({
 				align-items: center;
 				width: 100%;
 				box-sizing: border-box;
-				padding: 10px 16px 10px 8px;
+				padding: 9px 16px 9px 8px;
 				border-radius: 9px;
 				font-size: 0.9em;