Merge branch 'develop' into fix-issue-12262

CHANGELOG.md

@@ -14,7 +14,14 @@
 
 ## 2023.x.x (unreleased)
 
+### General
+-
+
+### Client
+-
+
 ### Server
+- Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように
 - Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました
 
 ## 2023.11.0

packages/backend/src/server/api/endpoints/i/revoke-token.ts

@@ -18,7 +18,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		tokenId: { type: 'string', format: 'misskey:id' },
-		token: { type: 'string' },
+		token: { type: 'string', nullable: true },
 	},
 	anyOf: [
 		{ required: ['tokenId'] },

packages/frontend/src/components/MkNote.vue

@@ -304,7 +304,7 @@ function renote(viaKeyboard = false) {
 	const { menu } = getRenoteMenu({ note: note, renoteButton, mock: props.mock });
 	os.popupMenu(menu, renoteButton.value, {
 		viaKeyboard,
-	}).then(focus);
+	});
 }
 
 function reply(viaKeyboard = false): void {

packages/frontend/src/components/MkNoteDetailed.vue

@@ -350,7 +350,7 @@ function renote(viaKeyboard = false) {
 	const { menu } = getRenoteMenu({ note: note, renoteButton });
 	os.popupMenu(menu, renoteButton.value, {
 		viaKeyboard,
-	}).then(focus);
+	});
 }
 
 function reply(viaKeyboard = false): void {