From 0d24c8843ca725a84cc900411129f98f6c5c2e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:21:50 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix(MisskeyIO#866):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AE=E5=89=B2=E3=82=8A?=
 =?UTF-8?q?=E5=BD=93=E3=81=A6=E6=99=82=E3=83=A1=E3=83=A2=E3=82=92=E5=85=A5?=
 =?UTF-8?q?=E5=8A=9B=E3=81=97=E3=81=AA=E3=81=84=E3=81=A8=E3=82=AD=E3=83=A3?=
 =?UTF-8?q?=E3=83=B3=E3=82=BB=E3=83=AB=E6=89=B1=E3=81=84=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(Missk?=
 =?UTF-8?q?eyIO#877)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/scripts/get-user-menu.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 758a04d373..753a4ee8bb 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -298,7 +298,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 							const { canceled: canceled3, result: memo } = await os.inputText({
 								title: i18n.ts.addMemo,
 								type: 'textarea',
-								placeholder: i18n.ts.memo,
+								default: '',
 							});
 							if (canceled3) return;
 

From 8bd78848736672cb85371f3f4c0290eb9d442fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:17:14 +0900
Subject: [PATCH 2/6] =?UTF-8?q?fix(frontend/mobile):=20=E3=83=A2=E3=83=90?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=A7kawaii=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=8C=E9=81=A9=E7=94=A8=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(MisskeyIO#878)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/ui/_common_/navbar-for-mobile.vue     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 5d0e065f09..3f4e5bad68 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -8,7 +8,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.top">
 		<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div>
 		<button class="_button" :class="$style.instance" @click="openInstanceMenu">
-			<img :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
+			<img v-if="kawaiiMode" src="/client-assets/kawaii/misskey-io.png" alt="" :class="$style.instanceIconAlt"/>
+			<img v-else :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
 		</button>
 	</div>
 	<div :class="$style.middle">
@@ -57,7 +58,9 @@ import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
+import { miLocalStorage } from "@/local-storage.js";
 
+const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
 const menu = toRef(defaultStore.state, 'menu');
 const otherMenuItemIndicated = computed(() => {
 	for (const def in navbarItemDef) {
@@ -120,6 +123,11 @@ function more() {
 	aspect-ratio: 1;
 }
 
+.instanceIconAlt {
+	display: inline-block;
+	width: 85%;
+}
+
 .bottom {
 	position: sticky;
 	bottom: 0;

From 535a6bc756f22ef3118c0077841d94844841c1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:54:32 +0900
Subject: [PATCH 3/6] =?UTF-8?q?spec(notes/create):=20=E6=8A=95=E7=A8=BF?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9Fnote=E3=82=92=E8=BF=94=E3=81=95?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(MisskeyIO#879)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/server/api/endpoints/notes/create.ts     | 9 ++++++---
 packages/backend/src/server/web/cli.js                   | 3 ++-
 packages/frontend/src/components/MkPostForm.vue          | 1 +
 packages/frontend/src/pages/reversi/game.vue             | 1 +
 packages/frontend/src/scripts/get-note-menu.ts           | 3 +++
 packages/misskey-js/src/autogen/types.ts                 | 6 ++++++
 packages/sw/src/sw.ts                                    | 2 +-
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 5bff7f718b..963f3bbfdb 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -40,7 +40,7 @@ export const meta = {
 
 	res: {
 		type: 'object',
-		optional: false, nullable: false,
+		optional: true, nullable: false,
 		properties: {
 			createdNote: {
 				type: 'object',
@@ -207,6 +207,7 @@ export const paramDef = {
 			},
 			required: ['choices'],
 		},
+		noCreatedNote: { type: 'boolean', default: false },
 	},
 	// (re)note with text, files and poll are optional
 	if: {
@@ -281,7 +282,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				const note = await this.notesRepository.findOneBy({ id: idempotent });
 				if (note) {
 					logger.info('The request has already been processed.', { noteId: note.id });
-					return { createdNote: await this.noteEntityService.pack(note, me) };
+					if (ps.noCreatedNote) return;
+					else return { createdNote: await this.noteEntityService.pack(note, me) };
 				}
 			}
 
@@ -453,7 +455,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				await this.redisForTimelines.set(`note:idempotent:${me.id}:${hash}`, note.id, 'EX', 60);
 
 				logger.info('Successfully created a note.', { noteId: note.id });
-				return {
+				if (ps.noCreatedNote) return;
+				else return {
 					createdNote: await this.noteEntityService.pack(note, me),
 				};
 			} catch (err) {
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index 30ee77f4d9..2cffd60638 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -41,7 +41,8 @@ window.onload = async () => {
 
 	document.getElementById('submit').addEventListener('click', () => {
 		api('notes/create', {
-			text: document.getElementById('text').value
+			text: document.getElementById('text').value,
+			noCreatedNote: true,
 		}).then(() => {
 			location.reload();
 		});
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 00e5f39665..8eacf4f177 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -773,6 +773,7 @@ async function post(ev?: MouseEvent) {
 		visibility: visibility.value,
 		visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(u => u.id) : undefined,
 		reactionAcceptance: reactionAcceptance.value,
+		noCreatedNote: true,
 	};
 
 	if (withHashtags.value && hashtags.value && hashtags.value.trim() !== '') {
diff --git a/packages/frontend/src/pages/reversi/game.vue b/packages/frontend/src/pages/reversi/game.vue
index d95dce18a2..865b8425d2 100644
--- a/packages/frontend/src/pages/reversi/game.vue
+++ b/packages/frontend/src/pages/reversi/game.vue
@@ -46,6 +46,7 @@ function start(_game: Misskey.entities.ReversiGameDetailed) {
 		misskeyApi('notes/create', {
 			text: i18n.ts._reversi.iStartedAGame + '\n' + location.href,
 			visibility: 'home',
+			noCreatedNote: true,
 		});
 	}
 
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 92e421cda1..b7d3c1abf4 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -543,6 +543,7 @@ export function getRenoteMenu(props: {
 					misskeyApi('notes/create', {
 						renoteId: appearNote.id,
 						channelId: appearNote.channelId,
+						noCreatedNote: true,
 					}).then(() => {
 						os.toast(i18n.ts.renoted);
 					});
@@ -589,6 +590,7 @@ export function getRenoteMenu(props: {
 						localOnly,
 						visibility,
 						renoteId: appearNote.id,
+						noCreatedNote: true,
 					}).then(() => {
 						os.toast(i18n.ts.renoted);
 					});
@@ -630,6 +632,7 @@ export function getRenoteMenu(props: {
 							misskeyApi('notes/create', {
 								renoteId: appearNote.id,
 								channelId: channel.id,
+								noCreatedNote: true,
 							}).then(() => {
 								os.toast(i18n.tsx.renotedToX({ name: channel.name }));
 							});
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 8a5d1829af..63e97c0f64 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -23333,6 +23333,8 @@ export type operations = {
             expiresAt?: number | null;
             expiredAfter?: number | null;
           }) | null;
+          /** @default false */
+          noCreatedNote?: boolean;
         };
       };
     };
@@ -23345,6 +23347,10 @@ export type operations = {
           };
         };
       };
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
       /** @description Client error */
       400: {
         content: {
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index cc79d88713..e2f6ab86cd 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -114,7 +114,7 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
 						if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
 						break;
 					case 'renote':
-						if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id });
+						if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id, noCreatedNote: true });
 						break;
 					case 'accept':
 						switch (data.body.type) {

From 8a0b98aa26801889110feb063076288648ef4dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:16:28 +0900
Subject: [PATCH 4/6] Sync charts one-at-a-time to reduce database contention
 and timeouts (MisskeyIO#880)

(cherry picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/830)

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
---
 .../src/core/chart/ChartManagementService.ts  | 10 +++----
 .../processors/CleanChartsProcessorService.ts | 26 +++++++++----------
 .../ResyncChartsProcessorService.ts           |  8 +++---
 .../processors/TickChartsProcessorService.ts  | 26 +++++++++----------
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/packages/backend/src/core/chart/ChartManagementService.ts b/packages/backend/src/core/chart/ChartManagementService.ts
index 79681370a1..f04c561063 100644
--- a/packages/backend/src/core/chart/ChartManagementService.ts
+++ b/packages/backend/src/core/chart/ChartManagementService.ts
@@ -58,9 +58,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	@bindThis
 	public async start() {
 		// 20分おきにメモリ情報をDBに書き込み
-		this.saveIntervalId = setInterval(() => {
+		this.saveIntervalId = setInterval(async () => {
 			for (const chart of this.charts) {
-				chart.save();
+				await chart.save();
 			}
 		}, 1000 * 60 * 20);
 	}
@@ -69,9 +69,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	public async dispose(): Promise<void> {
 		clearInterval(this.saveIntervalId);
 		if (process.env.NODE_ENV !== 'test') {
-			await Promise.all(
-				this.charts.map(chart => chart.save()),
-			);
+			for (const chart of this.charts) {
+				await chart.save();
+			}
 		}
 	}
 
diff --git a/packages/backend/src/queue/processors/CleanChartsProcessorService.ts b/packages/backend/src/queue/processors/CleanChartsProcessorService.ts
index 110468801c..19f98c0d51 100644
--- a/packages/backend/src/queue/processors/CleanChartsProcessorService.ts
+++ b/packages/backend/src/queue/processors/CleanChartsProcessorService.ts
@@ -48,20 +48,18 @@ export class CleanChartsProcessorService {
 	public async process(): Promise<void> {
 		this.logger.info('Clean charts...');
 
-		await Promise.all([
-			this.federationChart.clean(),
-			this.notesChart.clean(),
-			this.usersChart.clean(),
-			this.activeUsersChart.clean(),
-			this.instanceChart.clean(),
-			this.perUserNotesChart.clean(),
-			this.perUserPvChart.clean(),
-			this.driveChart.clean(),
-			this.perUserReactionsChart.clean(),
-			this.perUserFollowingChart.clean(),
-			this.perUserDriveChart.clean(),
-			this.apRequestChart.clean(),
-		]);
+		await this.federationChart.clean();
+		await this.notesChart.clean();
+		await this.usersChart.clean();
+		await this.activeUsersChart.clean();
+		await this.instanceChart.clean();
+		await this.perUserNotesChart.clean();
+		await this.perUserPvChart.clean();
+		await this.driveChart.clean();
+		await this.perUserReactionsChart.clean();
+		await this.perUserFollowingChart.clean();
+		await this.perUserDriveChart.clean();
+		await this.apRequestChart.clean();
 
 		this.logger.succ('All charts successfully cleaned.');
 	}
diff --git a/packages/backend/src/queue/processors/ResyncChartsProcessorService.ts b/packages/backend/src/queue/processors/ResyncChartsProcessorService.ts
index 570cdf9a75..46e1adf173 100644
--- a/packages/backend/src/queue/processors/ResyncChartsProcessorService.ts
+++ b/packages/backend/src/queue/processors/ResyncChartsProcessorService.ts
@@ -31,11 +31,9 @@ export class ResyncChartsProcessorService {
 
 		// TODO: ユーザーごとのチャートも更新する
 		// TODO: インスタンスごとのチャートも更新する
-		await Promise.all([
-			this.driveChart.resync(),
-			this.notesChart.resync(),
-			this.usersChart.resync(),
-		]);
+		await this.driveChart.resync();
+		await this.notesChart.resync();
+		await this.usersChart.resync();
 
 		this.logger.succ('All charts successfully resynced.');
 	}
diff --git a/packages/backend/src/queue/processors/TickChartsProcessorService.ts b/packages/backend/src/queue/processors/TickChartsProcessorService.ts
index 93ec34162d..c09cbccc57 100644
--- a/packages/backend/src/queue/processors/TickChartsProcessorService.ts
+++ b/packages/backend/src/queue/processors/TickChartsProcessorService.ts
@@ -48,20 +48,18 @@ export class TickChartsProcessorService {
 	public async process(): Promise<void> {
 		this.logger.info('Tick charts...');
 
-		await Promise.all([
-			this.federationChart.tick(false),
-			this.notesChart.tick(false),
-			this.usersChart.tick(false),
-			this.activeUsersChart.tick(false),
-			this.instanceChart.tick(false),
-			this.perUserNotesChart.tick(false),
-			this.perUserPvChart.tick(false),
-			this.driveChart.tick(false),
-			this.perUserReactionsChart.tick(false),
-			this.perUserFollowingChart.tick(false),
-			this.perUserDriveChart.tick(false),
-			this.apRequestChart.tick(false),
-		]);
+		await this.federationChart.tick(false);
+		await this.notesChart.tick(false);
+		await this.usersChart.tick(false);
+		await this.activeUsersChart.tick(false);
+		await this.instanceChart.tick(false);
+		await this.perUserNotesChart.tick(false);
+		await this.perUserPvChart.tick(false);
+		await this.driveChart.tick(false);
+		await this.perUserReactionsChart.tick(false);
+		await this.perUserFollowingChart.tick(false);
+		await this.perUserDriveChart.tick(false);
+		await this.apRequestChart.tick(false);
 
 		this.logger.succ('All charts successfully ticked.');
 	}

From 31d57f270cc16937cfcd428aa4bcc9342daa399a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:36:16 +0900
Subject: [PATCH 5/6] =?UTF-8?q?feat(frontend/draft):=20=E4=B8=8B=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E6=A9=9F=E8=83=BD=E3=81=AE=E6=94=B9=E8=89=AF=E3=83=BB?=
 =?UTF-8?q?=E5=BC=B7=E5=8C=96=20(MisskeyIO#881)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml                             |   2 +
 locales/index.d.ts                            |   8 +
 locales/ja-JP.yml                             |   2 +
 locales/ko-KR.yml                             |   2 +
 .../src/components/MkDraftsDialog.vue         | 183 +++++++++++++++++
 .../frontend/src/components/MkPostForm.vue    | 194 ++++++++++++------
 .../frontend/src/pages/settings/general.vue   |   2 +
 .../pages/settings/preferences-backups.vue    |   1 +
 packages/frontend/src/store.ts                |   4 +
 .../frontend/src/types/note-draft-item.ts     |  38 ++++
 10 files changed, 377 insertions(+), 59 deletions(-)
 create mode 100644 packages/frontend/src/components/MkDraftsDialog.vue
 create mode 100644 packages/frontend/src/types/note-draft-item.ts

diff --git a/locales/en-US.yml b/locales/en-US.yml
index c202d53d18..28652cdbe8 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1317,6 +1317,8 @@ consentAll: "Allow All Items"
 consentSelected: "Allow Selected Items"
 emailAddressLogin: "Login with email address"
 usernameLogin: "Login with username"
+autoloadDrafts: "Automatically load drafts when opening the posting form"
+drafts: "Drafts"
 
 _bubbleGame:
   howToPlay: "How to play"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 045db3c84d..0143fadeed 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5330,6 +5330,14 @@ export interface Locale extends ILocale {
      * ユーザー名でログイン
      */
     "usernameLogin": string;
+    /**
+     * 投稿フォームを開いたときに下書きを自動で読み込む
+     */
+    "autoloadDrafts": string;
+    /**
+     * 下書き
+     */
+    "drafts": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 7465bdbb08..df14061cd3 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1326,6 +1326,8 @@ consentAll: "全て許可"
 consentSelected: "選択した項目のみ許可"
 emailAddressLogin: "メールアドレスでログイン"
 usernameLogin: "ユーザー名でログイン"
+autoloadDrafts: "投稿フォームを開いたときに下書きを自動で読み込む"
+drafts: "下書き"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index b25f4ec781..929e6ab6ef 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1314,6 +1314,8 @@ consentAll: "모두 허용"
 consentSelected: "선택한 항목만 허용"
 emailAddressLogin: "이메일 주소로 로그인"
 usernameLogin: "사용자명으로 로그인"
+autoloadDrafts: "글 작성 시 자동으로 임시 저장된 글 불러오기"
+drafts: "임시 저장"
 
 _bubbleGame:
   howToPlay: "설명"
diff --git a/packages/frontend/src/components/MkDraftsDialog.vue b/packages/frontend/src/components/MkDraftsDialog.vue
new file mode 100644
index 0000000000..755bb2cf12
--- /dev/null
+++ b/packages/frontend/src/components/MkDraftsDialog.vue
@@ -0,0 +1,183 @@
+<template>
+<MkModalWindow
+	ref="dialog"
+	:height="500"
+	:width="800"
+	@click="done(true)"
+	@close="done(true)"
+	@closed="emit('closed')"
+>
+	<template #header>
+		{{ i18n.ts.drafts }}
+	</template>
+	<div style="display: flex; flex-direction: column">
+		<div v-if="drafts.length === 0" class="empty">
+			<div class="_fullinfo">
+				<img :src="infoImageUrl" class="_ghost"/>
+				<div>{{ i18n.ts.nothing }}</div>
+			</div>
+		</div>
+		<div v-for="draft in drafts" :key="draft.id" :class="$style.draftItem">
+			<div :class="$style.draftNote" @click="selectDraft(draft.id)">
+				<div :class="$style.draftNoteHeader">
+					<div :class="$style.draftNoteDestination">
+						<span v-if="draft.channel" style="opacity: 0.7; padding-right: 0.5em">
+							<i class="ti ti-device-tv"></i> {{ draft.channel.name }}
+						</span>
+						<span v-if="draft.renote">
+							<i class="ti ti-quote"></i> <MkAcct :user="draft.renote.user" /> <span>{{ draft.renote.text }}</span>
+						</span>
+						<span v-else-if="draft.reply">
+							<i class="ti ti-arrow-back-up"></i> <MkAcct :user="draft.reply.user" /> <span>{{ draft.reply.text }}</span>
+						</span>
+						<span v-else>
+							<i class="ti ti-pencil"></i>
+						</span>
+					</div>
+					<div :class="$style.draftNoteInfo">
+						<MkTime :time="draft.createdAt" colored />
+						<span v-if="draft.visibility !== 'public'" :title="i18n.ts._visibility[draft.visibility]" style="margin-left: 0.5em">
+							<i v-if="draft.visibility === 'home'" class="ti ti-home"></i>
+							<i v-else-if="draft.visibility === 'followers'" class="ti ti-lock"></i>
+							<i v-else-if="draft.visibility === 'specified'" ref="specified" class="ti ti-mail"></i>
+						</span>
+						<span v-if="draft.localOnly" :title="i18n.ts._visibility['disableFederation']" style="margin-left: 0.5em">
+							<i class="ti ti-rocket-off"></i>
+						</span>
+						<span v-if="draft.channel" :title="draft.channel.name" style="margin-left: 0.5em">
+							<i class="ti ti-device-tv"></i>
+						</span>
+					</div>
+				</div>
+				<div>
+					<p v-if="!!draft.cw" :class="$style.draftNoteCw">
+						<Mfm :text="draft.cw" />
+					</p>
+					<MkSubNoteContent :class="$style.draftNoteText" :note="draft" />
+				</div>
+			</div>
+			<button :class="$style.delete" class="_button" @click="removeDraft(draft.id)">
+				<i class="ti ti-trash"></i>
+			</button>
+		</div>
+	</div>
+</MkModalWindow>
+</template>
+
+<script lang="ts" setup>
+import { onActivated, onMounted, ref, shallowRef } from 'vue';
+import * as Misskey from 'misskey-js';
+import { miLocalStorage } from '@/local-storage.js';
+import { infoImageUrl } from '@/instance.js';
+import { i18n } from '@/i18n.js';
+import { $i } from '@/account.js';
+import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
+import MkModalWindow from '@/components/MkModalWindow.vue';
+import type { NoteDraftItem } from '@/types/note-draft-item.js';
+
+const emit = defineEmits<{
+	(ev: 'done', v: { canceled: true } | { canceled: false; selected: string | undefined }): void;
+	(ev: 'closed'): void;
+}>();
+
+const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
+
+const drafts = ref<(Misskey.entities.Note & { useCw: boolean })[]>([]);
+
+onMounted(loadDrafts);
+onActivated(loadDrafts);
+
+function loadDrafts() {
+	const stored = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record<string, NoteDraftItem>;
+	drafts.value = Object.keys(stored).map((key) => ({
+		...(stored[key].data as Misskey.entities.Note & { useCw: boolean }),
+		id: key,
+		createdAt: stored[key].updatedAt,
+		channel: stored[key].channel as Misskey.entities.Channel,
+		renote: stored[key].renote as Misskey.entities.Note,
+		reply: stored[key].reply as Misskey.entities.Note,
+		user: $i as Misskey.entities.User,
+	}));
+}
+
+function selectDraft(draft: string) {
+	done(false, draft);
+}
+
+function removeDraft(draft: string) {
+	const stored = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record<string, NoteDraftItem>;
+
+	delete stored[draft];
+	miLocalStorage.setItem('drafts', JSON.stringify(stored));
+
+	loadDrafts();
+}
+
+function done(canceled: boolean, selected?: string): void {
+	emit('done', { canceled, selected } as
+		| { canceled: true }
+		| { canceled: false; selected: string | undefined });
+	dialog.value?.close();
+}
+</script>
+
+<style lang="scss" module>
+.draftItem {
+	display: flex;
+	padding: 8px 0 8px 0;
+	border-bottom: 1px solid var(--divider);
+
+	&:hover {
+		color: var(--accent);
+		background-color: var(--accentedBg);
+	}
+}
+
+.draftNote {
+	flex: 1;
+	width: calc(100% - 16px - 48px - 4px);
+	margin: 0 8px 0 8px;
+}
+
+.draftNoteHeader {
+	display: flex;
+	flex-wrap: nowrap;
+	margin-bottom: 4px;
+}
+
+.draftNoteDestination {
+	flex-shrink: 1;
+	flex-grow: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	margin-right: 4px;
+}
+
+.draftNoteInfo {
+	flex-shrink: 0;
+	margin-left: auto;
+}
+
+.draftNoteCw {
+	cursor: default;
+	display: block;
+	overflow-wrap: break-word;
+}
+
+.draftNoteText {
+	cursor: default;
+}
+
+.delete {
+	width: 48px;
+	height: 64px;
+	display: flex;
+	align-self: center;
+	justify-content: center;
+	align-items: center;
+	background-color: var(--buttonBg);
+	border-radius: 4px;
+	margin-right: 4px;
+}
+</style>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 8eacf4f177..94da01eb77 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -41,6 +41,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<span v-else-if="reactionAcceptance === 'likeOnlyForRemote'"><i class="ti ti-heart-plus"></i></span>
 				<span v-else><i class="ti ti-icons"></i></span>
 			</button>
+			<button v-if="!props.instant" v-click-anime v-tooltip="i18n.ts.drafts" class="_button" :class="$style.headerRightItem" @click="openDrafts">
+				<i class="ti ti-pencil"></i>
+			</button>
 			<button v-click-anime class="_button" :class="$style.submit" :disabled="!canPost" data-cy-open-post-form-submit @click="post">
 				<div :class="$style.submitInner">
 					<template v-if="posted"></template>
@@ -110,6 +113,7 @@ import MkNoteSimple from '@/components/MkNoteSimple.vue';
 import MkNotePreview from '@/components/MkNotePreview.vue';
 import XPostFormAttaches from '@/components/MkPostFormAttaches.vue';
 import MkPollEditor, { type PollEditorModelValue } from '@/components/MkPollEditor.vue';
+import MkDraftsDialog from '@/components/MkDraftsDialog.vue';
 import { host, url } from '@/config.js';
 import { erase, unique } from '@/scripts/array.js';
 import { extractMentions } from '@/scripts/extract-mentions.js';
@@ -130,6 +134,7 @@ import { miLocalStorage } from '@/local-storage.js';
 import { claimAchievement } from '@/scripts/achievements.js';
 import { emojiPicker } from '@/scripts/emoji-picker.js';
 import { mfmFunctionPicker } from '@/scripts/mfm-function-picker.js';
+import type { NoteDraftItem } from '@/types/note-draft-item.js';
 
 const $i = signinRequired();
 
@@ -180,6 +185,10 @@ const visibilityButton = shallowRef<HTMLElement>();
 
 const posting = ref(false);
 const posted = ref(false);
+const draftId = ref<string>(Date.now().toString());
+const reply = ref(props.reply ?? null);
+const renote = ref(props.renote ?? null);
+const channel = ref(props.channel ?? null);
 const text = ref(props.initialText ?? '');
 const files = ref(props.initialFiles ?? []);
 const poll = ref<PollEditorModelValue | null>(null);
@@ -210,25 +219,25 @@ const textAreaReadOnly = ref(false);
 const nsfwGuideUrl = 'https://go.misskey.io/media-guideline';
 
 const draftKey = computed((): string => {
-	let key = props.channel ? `channel:${props.channel.id}` : '';
+	let key = channel.value ? `channel:${channel.value.id}` : '';
 
-	if (props.renote) {
-		key += `renote:${props.renote.id}`;
-	} else if (props.reply) {
-		key += `reply:${props.reply.id}`;
+	if (renote.value) {
+		key += `renote:${renote.value.id}`;
+	} else if (reply.value) {
+		key += `reply:${reply.value.id}`;
 	} else {
-		key += `note:${$i.id}`;
+		key += `note:${draftId.value}`;
 	}
 
 	return key;
 });
 
 const placeholder = computed((): string => {
-	if (props.renote) {
+	if (renote.value) {
 		return i18n.ts._postForm.quotePlaceholder;
-	} else if (props.reply) {
+	} else if (reply.value) {
 		return i18n.ts._postForm.replyPlaceholder;
-	} else if (props.channel) {
+	} else if (channel.value) {
 		return i18n.ts._postForm.channelPlaceholder;
 	} else {
 		const xs = [
@@ -244,9 +253,9 @@ const placeholder = computed((): string => {
 });
 
 const submitText = computed((): string => {
-	return props.renote
+	return renote.value
 		? i18n.ts.quote
-		: props.reply
+		: reply.value
 			? i18n.ts.reply
 			: i18n.ts.note;
 });
@@ -265,8 +274,8 @@ const canPost = computed((): boolean => {
 			1 <= textLength.value ||
 			1 <= files.value.length ||
 			poll.value != null ||
-			props.renote != null ||
-			(props.reply != null && quoteId.value != null)
+			renote.value != null ||
+			(reply.value != null && quoteId.value != null)
 		) &&
 		(textLength.value <= maxTextLength.value) &&
 		(!poll.value || poll.value.choices.length >= 2);
@@ -294,13 +303,13 @@ if (props.mention) {
 	text.value += ' ';
 }
 
-if (props.reply && (props.reply.user.username !== $i.username || (props.reply.user.host != null && props.reply.user.host !== host))) {
-	text.value = `@${props.reply.user.username}${props.reply.user.host != null ? '@' + toASCII(props.reply.user.host) : ''} `;
+if (reply.value && (reply.value.user.username !== $i.username || (reply.value.user.host != null && reply.value.user.host !== host))) {
+	text.value = `@${reply.value.user.username}${reply.value.user.host != null ? '@' + toASCII(reply.value.user.host) : ''} `;
 }
 
-if (props.reply && props.reply.text != null) {
-	const ast = mfm.parse(props.reply.text);
-	const otherHost = props.reply.user.host;
+if (reply.value && reply.value.text != null) {
+	const ast = mfm.parse(reply.value.text);
+	const otherHost = reply.value.user.host;
 
 	for (const x of extractMentions(ast)) {
 		const mention = x.host ?
@@ -323,32 +332,32 @@ if ($i.isSilenced && visibility.value === 'public') {
 	visibility.value = 'home';
 }
 
-if (props.channel) {
+if (channel.value) {
 	visibility.value = 'public';
 	localOnly.value = true; // TODO: チャンネルが連合するようになった折には消す
 }
 
 // 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-if (props.reply && ['home', 'followers', 'specified'].includes(props.reply.visibility)) {
-	if (props.reply.visibility === 'home' && visibility.value === 'followers') {
+if (reply.value && ['home', 'followers', 'specified'].includes(reply.value.visibility)) {
+	if (reply.value.visibility === 'home' && visibility.value === 'followers') {
 		visibility.value = 'followers';
-	} else if (['home', 'followers'].includes(props.reply.visibility) && visibility.value === 'specified') {
+	} else if (['home', 'followers'].includes(reply.value.visibility) && visibility.value === 'specified') {
 		visibility.value = 'specified';
 	} else {
-		visibility.value = props.reply.visibility;
+		visibility.value = reply.value.visibility;
 	}
 
 	if (visibility.value === 'specified') {
-		if (props.reply.visibleUserIds) {
+		if (reply.value.visibleUserIds) {
 			misskeyApi('users/show', {
-				userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply?.userId),
+				userIds: reply.value.visibleUserIds.filter(uid => uid !== $i.id && uid !== reply.value?.userId),
 			}).then(users => {
 				users.forEach(u => pushVisibleUser(u));
 			});
 		}
 
-		if (props.reply.userId !== $i.id) {
-			misskeyApi('users/show', { userId: props.reply.userId }).then(user => {
+		if (reply.value.userId !== $i.id) {
+			misskeyApi('users/show', { userId: reply.value.userId }).then(user => {
 				pushVisibleUser(user);
 			});
 		}
@@ -361,9 +370,9 @@ if (props.specified) {
 }
 
 // keep cw when reply
-if (defaultStore.state.keepCw && props.reply?.cw) {
+if (defaultStore.state.keepCw && reply.value?.cw) {
 	useCw.value = true;
-	cw.value = props.reply.cw;
+	cw.value = reply.value.cw;
 }
 
 function watchForDraft() {
@@ -465,7 +474,7 @@ function upload(file: File, name?: string): void {
 }
 
 function setVisibility() {
-	if (props.channel) {
+	if (channel.value) {
 		visibility.value = 'public';
 		localOnly.value = true; // TODO: チャンネルが連合するようになった折には消す
 		return;
@@ -476,7 +485,7 @@ function setVisibility() {
 		isSilenced: $i.isSilenced,
 		localOnly: localOnly.value,
 		src: visibilityButton.value,
-		...(props.reply ? { isReplyVisibilitySpecified: props.reply.visibility === 'specified' } : {}),
+		...(reply.value ? { isReplyVisibilitySpecified: reply.value.visibility === 'specified' } : {}),
 	}, {
 		changeVisibility: v => {
 			visibility.value = v;
@@ -488,7 +497,7 @@ function setVisibility() {
 }
 
 async function toggleLocalOnly() {
-	if (props.channel) {
+	if (channel.value) {
 		visibility.value = 'public';
 		localOnly.value = true; // TODO: チャンネルが連合するようになった折には消す
 		return;
@@ -605,7 +614,7 @@ async function onPaste(ev: ClipboardEvent) {
 
 	const paste = ev.clipboardData.getData('text');
 
-	if (!props.renote && !quoteId.value && paste.startsWith(url + '/notes/')) {
+	if (!renote.value && !quoteId.value && paste.startsWith(url + '/notes/')) {
 		ev.preventDefault();
 
 		os.confirm({
@@ -679,10 +688,32 @@ function onDrop(ev: DragEvent): void {
 function saveDraft() {
 	if (props.instant || props.mock) return;
 
-	const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}');
+	const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record<string, NoteDraftItem>;
 
 	draftData[draftKey.value] = {
-		updatedAt: new Date(),
+		updatedAt: new Date().toISOString(),
+		channel: channel.value ? {
+			id: channel.value.id,
+			name: channel.value.name,
+		} : undefined,
+		renote: renote.value ? {
+			id: renote.value.id,
+			text: (renote.value.cw ?? renote.value.text)?.substring(0, 100),
+			user: {
+				id: renote.value.userId,
+				username: renote.value.user.username,
+				host: renote.value.user.host,
+			},
+		} : undefined,
+		reply: reply.value ? {
+			id: reply.value.id,
+			text: (reply.value.cw ?? reply.value.text)?.substring(0, 100),
+			user: {
+				id: reply.value.userId,
+				username: reply.value.user.username,
+				host: reply.value.user.host,
+			},
+		} : undefined,
 		data: {
 			text: text.value,
 			useCw: useCw.value,
@@ -700,13 +731,75 @@ function saveDraft() {
 }
 
 function deleteDraft() {
-	const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}');
+	const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record<string, NoteDraftItem>;
 
 	delete draftData[draftKey.value];
 
+	draftId.value = Date.now().toString();
+
 	miLocalStorage.setItem('drafts', JSON.stringify(draftData));
 }
 
+async function openDrafts() {
+	const { canceled, selected } = await new Promise<{canceled: boolean, selected: string | undefined}>(resolve => {
+		os.popup(MkDraftsDialog, {}, {
+			done: result => {
+				resolve(typeof result.selected === 'string' ? result : { canceled: true, selected: undefined });
+			},
+		}, 'closed');
+	});
+
+	if (canceled) return;
+
+	if (selected) {
+		const channelId = selected.startsWith('channel:') ? selected.match(/channel:(.+?)(renote|reply|note):/)?.[1] : undefined;
+		const renoteId = selected.includes('renote:') ? selected.match(/renote:(.+)/)?.[1] : undefined;
+		const replyId = selected.includes('reply:') ? selected.match(/reply:(.+)/)?.[1] : undefined;
+
+		channel.value = channelId ? await misskeyApi('channels/show', { channelId }) : null;
+		renote.value = renoteId ? await misskeyApi('notes/show', { noteId: renoteId }) : null;
+		reply.value = replyId ? await misskeyApi('notes/show', { noteId: replyId }) : null;
+
+		if (!renote.value && !reply.value) {
+			draftId.value = selected.match(/note:(.+)/)?.[1] ?? Date.now().toString();
+		} else {
+			draftId.value = Date.now().toString();
+		}
+
+		loadDraft(true);
+	}
+}
+
+function loadDraft(exactMatch: boolean = false) {
+	const drafts = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record<string, NoteDraftItem>;
+	const scope = exactMatch ? draftKey.value : draftKey.value.replace(`note:${draftId.value}`, 'note:');
+	const draft = Object.entries(drafts).filter(([k]) => k.startsWith(scope))
+		.map(r => ({ key: r[0], value: { ...r[1], updatedAt: new Date(r[1].updatedAt).getTime() } }))
+		.sort((a, b) => b.value.updatedAt - a.value.updatedAt).at(0);
+
+	if (draft) {
+		if (scope !== draft.key) {
+			draftId.value = draft.key.replace(scope, '');
+		}
+
+		text.value = draft.value.data.text;
+		useCw.value = draft.value.data.useCw;
+		cw.value = draft.value.data.cw;
+		visibility.value = draft.value.data.visibility;
+		localOnly.value = draft.value.data.localOnly;
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		files.value = draft.value.data.files?.filter(f => f?.id && f.type && f.name) || [];
+		if (draft.value.data.poll) {
+			poll.value = draft.value.data.poll;
+		}
+		if (draft.value.data.visibleUserIds) {
+			misskeyApi('users/show', { userIds: draft.value.data.visibleUserIds }).then(users => {
+				users.forEach(u => pushVisibleUser(u));
+			});
+		}
+	}
+}
+
 async function post(ev?: MouseEvent) {
 	if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
 		os.alert({
@@ -764,9 +857,9 @@ async function post(ev?: MouseEvent) {
 		text: text.value === '' ? null : text.value,
 		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		fileIds: files.value.length > 0 ? files.value.filter(f => f?.id).map(f => f.id) : undefined,
-		replyId: props.reply ? props.reply.id : undefined,
-		renoteId: props.renote ? props.renote.id : quoteId.value ? quoteId.value : undefined,
-		channelId: props.channel ? props.channel.id : undefined,
+		replyId: reply.value ? reply.value.id : undefined,
+		renoteId: renote.value ? renote.value.id : quoteId.value ? quoteId.value : undefined,
+		channelId: channel.value ? channel.value.id : undefined,
 		poll: poll.value,
 		cw: useCw.value ? cw.value ?? '' : null,
 		localOnly: localOnly.value,
@@ -854,7 +947,7 @@ async function post(ev?: MouseEvent) {
 				claimAchievement('brainDiver');
 			}
 
-			if (props.renote && (props.renote.userId === $i.id) && text.length > 0) {
+			if (renote.value && (renote.value.userId === $i.id) && text.length > 0) {
 				claimAchievement('selfQuote');
 			}
 
@@ -957,25 +1050,8 @@ onMounted(() => {
 
 	nextTick(() => {
 		// 書きかけの投稿を復元
-		if (!props.instant && !props.mention && !props.specified && !props.mock) {
-			const draft = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}')[draftKey.value];
-			if (draft) {
-				text.value = draft.data.text;
-				useCw.value = draft.data.useCw;
-				cw.value = draft.data.cw;
-				visibility.value = draft.data.visibility;
-				localOnly.value = draft.data.localOnly;
-				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-				files.value = draft.data.files?.filter(f => f?.id && f.type && f.name) || [];
-				if (draft.data.poll) {
-					poll.value = draft.data.poll;
-				}
-				if (draft.data.visibleUserIds) {
-					misskeyApi('users/show', { userIds: draft.data.visibleUserIds }).then(users => {
-						users.forEach(u => pushVisibleUser(u));
-					});
-				}
-			}
+		if (!props.instant && !props.mention && !props.specified && !props.mock && defaultStore.state.autoloadDrafts) {
+			loadDraft();
 		}
 
 		// 削除して編集
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index db7d5ddcf7..978175d528 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -42,6 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton v-if="defaultStore.reactiveState.pinnedUserLists.value.length === 0" @click="setPinnedList()">{{ i18n.ts.add }}</MkButton>
 				<MkButton v-else danger @click="removePinnedList()"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
 			</MkFolder>
+			<MkSwitch v-model="autoloadDrafts">{{ i18n.ts.autoloadDrafts }}</MkSwitch>
 		</div>
 	</FormSection>
 
@@ -302,6 +303,7 @@ const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
 const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
 const showFixedPostForm = computed(defaultStore.makeGetterSetter('showFixedPostForm'));
 const showFixedPostFormInChannel = computed(defaultStore.makeGetterSetter('showFixedPostFormInChannel'));
+const autoloadDrafts = computed(defaultStore.makeGetterSetter('autoloadDrafts'));
 const numberOfPageCache = computed(defaultStore.makeGetterSetter('numberOfPageCache'));
 const instanceTicker = computed(defaultStore.makeGetterSetter('instanceTicker'));
 const enableInfiniteScroll = computed(defaultStore.makeGetterSetter('enableInfiniteScroll'));
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index da6fb5f6b0..999e9a89f2 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -84,6 +84,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'useBlurEffect',
 	'showFixedPostForm',
 	'showFixedPostFormInChannel',
+	'autoloadDrafts',
 	'enableInfiniteScroll',
 	'useReactionPickerForContextMenu',
 	'showGapBetweenNotesInTimeline',
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 81b21dd5e3..d2e73dd8a6 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -279,6 +279,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	autoloadDrafts: {
+		where: 'device',
+		default: true,
+	},
 	enableInfiniteScroll: {
 		where: 'device',
 		default: true,
diff --git a/packages/frontend/src/types/note-draft-item.ts b/packages/frontend/src/types/note-draft-item.ts
new file mode 100644
index 0000000000..a7ec5962e5
--- /dev/null
+++ b/packages/frontend/src/types/note-draft-item.ts
@@ -0,0 +1,38 @@
+import * as Misskey from 'misskey-js';
+import type { PollEditorModelValue } from '@/components/MkPollEditor.vue';
+
+export type NoteDraftItem = {
+	updatedAt: string;
+	channel?: {
+		id: string;
+		name: string;
+	};
+	renote?: {
+		id: string;
+		text: string | null;
+		user: {
+			id: string;
+			username: string;
+			host: string | null;
+		};
+	};
+	reply?: {
+		id: string;
+		text: string | null;
+		user: {
+			id: string;
+			username: string;
+			host: string | null;
+		};
+	};
+	data: {
+		text: string;
+		useCw: boolean;
+		cw: string | null;
+		visibility: 'public' | 'followers' | 'home' | 'specified';
+		localOnly: boolean;
+		files: Misskey.entities.DriveFile[];
+		poll: PollEditorModelValue | null;
+		visibleUserIds?: string[];
+	};
+};

From f280ce2a3912796d19d4f63945515794fe7bbb6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:36:36 +0900
Subject: [PATCH 6/6] Bump up version to 2024.5.0-io.6 (MisskeyIO#882)

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a1ea5befe6..797ee2ef05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.5e",
+	"version": "2024.5.0-io.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 76cd9c55bf..710b831042 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.5e",
+	"version": "2024.5.0-io.6",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {