From 85bc401e471454c82c43093926ae2ba16fa93088 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sat, 31 May 2025 00:40:13 +0800
Subject: [PATCH 01/14] feat(page.note): add delay and retry to embedded note
 loading

---
 .../src/components/page/page.note.vue         | 49 +++++++++++++++++--
 .../frontend/src/components/page/page.vue     |  2 +-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index df26874c17..98f72f0d9d 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkNote from '@/components/MkNote.vue';
 import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
@@ -20,16 +20,57 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 const props = defineProps<{
 	block: Misskey.entities.PageBlock,
 	page: Misskey.entities.Page,
+	index: number;
 }>();
 
 const note = ref<Misskey.entities.Note | null>(null);
 
+let timeoutId = null;
+
+async function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => {
+	    setTimeout(() => {
+		    resolve()
+		}, ms);
+	});
+}
+
+async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount: number = 5): Promise<T> {
+    let lastResult: T = undefined!;
+	const r = Math.random();
+	for(let i=0; i<retryCount; i++) {
+		const [ok, resultOrError] = await f()
+			.then(result => [true, result])
+			.catch(err => [false, err]);
+        
+        lastResult = resultOrError;
+
+		if (ok) {
+			break;
+		}
+
+		// RATE_LIMIT_EXCEEDED
+		if (resultOrError?.id === "d5826d14-3982-4d2e-8011-b9e9f02499ef") {
+			await sleep(resultOrError?.info?.fullResetMs ?? 1000);
+			continue;
+		}
+
+		throw resultOrError;
+	}
+    return lastResult;
+}
+
 onMounted(() => {
 	if (props.block.note == null) return;
-	misskeyApi('notes/show', { noteId: props.block.note })
-		.then(result => {
-			note.value = result;
+	timeoutId = setTimeout(() => {
+		retryOnThrottle(() => misskeyApi('notes/show', { noteId: props.block.note })).then(result => {
+		    note.value = result;
 		});
+	}, 500 * props.index); // rate limit is 2 reqs per sec
+});
+
+onUnmounted(() => {
+    if (timeoutId !== null) clearTimeout(timeoutId);
 });
 </script>
 
diff --git a/packages/frontend/src/components/page/page.vue b/packages/frontend/src/components/page/page.vue
index a31c5eff28..9f9feeed49 100644
--- a/packages/frontend/src/components/page/page.vue
+++ b/packages/frontend/src/components/page/page.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="{ [$style.center]: page.alignCenter, [$style.serif]: page.font === 'serif' }" class="_gaps">
-	<XBlock v-for="child in page.content" :key="child.id" :page="page" :block="child" :h="2"/>
+	<XBlock v-for="(child, index) in page.content" :key="child.id" :index="index" :page="page" :block="child" :h="2"/>
 </div>
 </template>
 

From 5e6c6fccc482283bfd0fc369557ffab6cf8617bd Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sat, 31 May 2025 10:09:46 +0800
Subject: [PATCH 02/14] chore: lint

---
 .../src/components/page/page.note.vue         | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index 98f72f0d9d..f459a437d2 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -25,52 +25,54 @@ const props = defineProps<{
 
 const note = ref<Misskey.entities.Note | null>(null);
 
-let timeoutId = null;
+// eslint-disable-next-line id-denylist
+let timeoutId: ReturnType<typeof window.setTimeout> | null = null;
 
 async function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => {
-	    setTimeout(() => {
-		    resolve()
+	return new Promise((resolve) => {
+		window.setTimeout(() => {
+			resolve();
 		}, ms);
 	});
 }
 
-async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount: number = 5): Promise<T> {
-    let lastResult: T = undefined!;
-	const r = Math.random();
-	for(let i=0; i<retryCount; i++) {
+async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T> {
+	let lastResult: T;
+	for (let i = 0; i < retryCount; i++) {
 		const [ok, resultOrError] = await f()
 			.then(result => [true, result])
 			.catch(err => [false, err]);
-        
-        lastResult = resultOrError;
+
+		lastResult = resultOrError;
 
 		if (ok) {
 			break;
 		}
 
 		// RATE_LIMIT_EXCEEDED
-		if (resultOrError?.id === "d5826d14-3982-4d2e-8011-b9e9f02499ef") {
+		if (resultOrError?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
 			await sleep(resultOrError?.info?.fullResetMs ?? 1000);
 			continue;
 		}
 
 		throw resultOrError;
 	}
-    return lastResult;
+	return lastResult;
 }
 
 onMounted(() => {
 	if (props.block.note == null) return;
-	timeoutId = setTimeout(() => {
+	timeoutId = window.setTimeout(() => {
 		retryOnThrottle(() => misskeyApi('notes/show', { noteId: props.block.note })).then(result => {
-		    note.value = result;
+			note.value = result;
 		});
 	}, 500 * props.index); // rate limit is 2 reqs per sec
 });
 
 onUnmounted(() => {
-    if (timeoutId !== null) clearTimeout(timeoutId);
+	if (timeoutId !== null) {
+		window.clearTimeout(timeoutId);
+	}
 });
 </script>
 

From e36ea27517c43352fe3173f54e558ad549388f0e Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sat, 31 May 2025 22:50:21 +0800
Subject: [PATCH 03/14] fix(page.note): throw (not return) on all attempts
 throttled

---
 .../frontend/src/components/page/page.note.vue    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index f459a437d2..cc1075d42a 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -37,13 +37,15 @@ async function sleep(ms: number): Promise<void> {
 }
 
 async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T> {
-	let lastResult: T;
+	let lastOk: boolean;
+	let lastResultOrError: T;
 	for (let i = 0; i < retryCount; i++) {
 		const [ok, resultOrError] = await f()
 			.then(result => [true, result])
 			.catch(err => [false, err]);
 
-		lastResult = resultOrError;
+		lastOk = ok;
+		lastResultOrError = resultOrError;
 
 		if (ok) {
 			break;
@@ -55,9 +57,16 @@ async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T>
 			continue;
 		}
 
+		// Throw for non-throttling errors
 		throw resultOrError;
 	}
-	return lastResult;
+
+	if (lastOk) {
+		return lastResultOrError;
+	} else {
+		// Give up after getting throttled too many times
+		throw lastResultOrError;
+	}
 }
 
 onMounted(() => {

From de7f7984cdd0255e6f84414b0861d547511248a4 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sun, 1 Jun 2025 06:30:28 +0800
Subject: [PATCH 04/14] chore: move `retryOnThrottled` to frontend-shared

---
 .../frontend-shared/js/retry-on-throttled.ts  | 40 +++++++++++++++++
 .../src/components/page/page.note.vue         | 44 +------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 packages/frontend-shared/js/retry-on-throttled.ts

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
new file mode 100644
index 0000000000..4234a18b51
--- /dev/null
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -0,0 +1,40 @@
+async function sleep(ms: number): Promise<void> {
+	return new Promise((resolve) => {
+		window.setTimeout(() => {
+			resolve();
+		}, ms);
+	});
+}
+
+export async function retryOnThrottled<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T> {
+	let lastOk = false;
+	let lastResultOrError: T;
+	for (let i = 0; i < retryCount; i++) {
+		const [ok, resultOrError] = await f()
+			.then(result => [true, result])
+			.catch(err => [false, err]);
+
+		lastOk = ok;
+		lastResultOrError = resultOrError;
+
+		if (ok) {
+			break;
+		}
+
+		// RATE_LIMIT_EXCEEDED
+		if (resultOrError?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
+			await sleep(resultOrError?.info?.fullResetMs ?? 1000);
+			continue;
+		}
+
+		// Throw for non-throttling errors
+		throw resultOrError;
+	}
+
+	if (lastOk) {
+		return lastResultOrError!;
+	} else {
+		// Give up after getting throttled too many times
+		throw lastResultOrError!;
+	}
+}
\ No newline at end of file
diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index cc1075d42a..3a3c0e4c7b 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -13,6 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { retryOnThrottled } from '@@/js/retry-on-throttled.js';
 import MkNote from '@/components/MkNote.vue';
 import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
@@ -28,51 +29,10 @@ const note = ref<Misskey.entities.Note | null>(null);
 // eslint-disable-next-line id-denylist
 let timeoutId: ReturnType<typeof window.setTimeout> | null = null;
 
-async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => {
-		window.setTimeout(() => {
-			resolve();
-		}, ms);
-	});
-}
-
-async function retryOnThrottle<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T> {
-	let lastOk: boolean;
-	let lastResultOrError: T;
-	for (let i = 0; i < retryCount; i++) {
-		const [ok, resultOrError] = await f()
-			.then(result => [true, result])
-			.catch(err => [false, err]);
-
-		lastOk = ok;
-		lastResultOrError = resultOrError;
-
-		if (ok) {
-			break;
-		}
-
-		// RATE_LIMIT_EXCEEDED
-		if (resultOrError?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
-			await sleep(resultOrError?.info?.fullResetMs ?? 1000);
-			continue;
-		}
-
-		// Throw for non-throttling errors
-		throw resultOrError;
-	}
-
-	if (lastOk) {
-		return lastResultOrError;
-	} else {
-		// Give up after getting throttled too many times
-		throw lastResultOrError;
-	}
-}
-
 onMounted(() => {
 	if (props.block.note == null) return;
 	timeoutId = window.setTimeout(() => {
-		retryOnThrottle(() => misskeyApi('notes/show', { noteId: props.block.note })).then(result => {
+		retryOnThrottled(() => misskeyApi('notes/show', { noteId: props.block.note })).then(result => {
 			note.value = result;
 		});
 	}, 500 * props.index); // rate limit is 2 reqs per sec

From 3889457d50e0ba6feef71646ae6b8b1634acbd24 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sun, 1 Jun 2025 06:55:31 +0800
Subject: [PATCH 05/14] chore: lint

---
 packages/frontend-shared/js/retry-on-throttled.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 4234a18b51..9287f3a715 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -6,10 +6,10 @@ async function sleep(ms: number): Promise<void> {
 	});
 }
 
-export async function retryOnThrottled<T>(f: ()=>Promise<T>, retryCount = 5): Promise<T> {
+export async function retryOnThrottled<T>(f: () => Promise<T>, retryCount = 5): Promise<T> {
 	let lastOk = false;
-	let lastResultOrError: T;
-	for (let i = 0; i < retryCount; i++) {
+	let lastResultOrError: T | Error = new Error("No attempt has been done");
+	for (let i = 0; i < Math.min(retryCount, 1); i++) {
 		const [ok, resultOrError] = await f()
 			.then(result => [true, result])
 			.catch(err => [false, err]);
@@ -32,9 +32,9 @@ export async function retryOnThrottled<T>(f: ()=>Promise<T>, retryCount = 5): Pr
 	}
 
 	if (lastOk) {
-		return lastResultOrError!;
+		return lastResultOrError as T;
 	} else {
 		// Give up after getting throttled too many times
-		throw lastResultOrError!;
+		throw lastResultOrError;
 	}
-}
\ No newline at end of file
+}

From e8f218027998d394406b03c70de73889669fc286 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sun, 1 Jun 2025 13:07:57 +0800
Subject: [PATCH 06/14] fix: simplify the code

---
 .../frontend-shared/js/retry-on-throttled.ts  | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 9287f3a715..37a7f40c73 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -7,34 +7,20 @@ async function sleep(ms: number): Promise<void> {
 }
 
 export async function retryOnThrottled<T>(f: () => Promise<T>, retryCount = 5): Promise<T> {
-	let lastOk = false;
-	let lastResultOrError: T | Error = new Error("No attempt has been done");
-	for (let i = 0; i < Math.min(retryCount, 1); i++) {
-		const [ok, resultOrError] = await f()
-			.then(result => [true, result])
-			.catch(err => [false, err]);
-
-		lastOk = ok;
-		lastResultOrError = resultOrError;
-
-		if (ok) {
-			break;
-		}
-
-		// RATE_LIMIT_EXCEEDED
-		if (resultOrError?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
-			await sleep(resultOrError?.info?.fullResetMs ?? 1000);
-			continue;
-		}
-
-		// Throw for non-throttling errors
-		throw resultOrError;
+  let lastError;
+  for (let i = 0; i < Math.min(retryCount, 1); i++) {
+	try {
+	  return await f();
+	} catch (err) {
+	  // RATE_LIMIT_EXCEEDED
+	  if (err?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
+		lastError = err;
+		await sleep(err?.info?.fullResetMs ?? 1000);
+	  } else {
+		throw err;
+	  }
 	}
+  }
 
-	if (lastOk) {
-		return lastResultOrError as T;
-	} else {
-		// Give up after getting throttled too many times
-		throw lastResultOrError;
-	}
+  throw lastError;
 }

From 3f77cca7af76191cfd31694fc96199030cb18709 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sun, 1 Jun 2025 13:20:19 +0800
Subject: [PATCH 07/14] chore: lint

---
 packages/frontend-shared/js/retry-on-throttled.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 37a7f40c73..962a067e29 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -13,9 +13,9 @@ export async function retryOnThrottled<T>(f: () => Promise<T>, retryCount = 5):
 	  return await f();
 	} catch (err) {
 	  // RATE_LIMIT_EXCEEDED
-	  if (err?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
+	  if ((err as T)?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
 		lastError = err;
-		await sleep(err?.info?.fullResetMs ?? 1000);
+		await sleep((err as T)?.info?.fullResetMs ?? 1000);
 	  } else {
 		throw err;
 	  }

From d0641eaf209835b347844ff0efa1a0946d76db8b Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Sun, 1 Jun 2025 13:30:24 +0800
Subject: [PATCH 08/14] chore: lint

---
 packages/frontend-shared/js/retry-on-throttled.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 962a067e29..762b824eed 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -11,11 +11,11 @@ export async function retryOnThrottled<T>(f: () => Promise<T>, retryCount = 5):
   for (let i = 0; i < Math.min(retryCount, 1); i++) {
 	try {
 	  return await f();
-	} catch (err) {
+	} catch (err: any) {
 	  // RATE_LIMIT_EXCEEDED
-	  if ((err as T)?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
+	  if (err?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
 		lastError = err;
-		await sleep((err as T)?.info?.fullResetMs ?? 1000);
+		await sleep(err?.info?.fullResetMs ?? 1000);
 	  } else {
 		throw err;
 	  }

From 4d8efa9be4c9871efef30a546306a9b981c205c5 Mon Sep 17 00:00:00 2001
From: Marie <github@yuugi.dev>
Date: Sun, 1 Jun 2025 17:35:53 +0000
Subject: [PATCH 09/14] add spdx header

---
 packages/frontend-shared/js/retry-on-throttled.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 762b824eed..598c94f362 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: outvi and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+*/
+
 async function sleep(ms: number): Promise<void> {
 	return new Promise((resolve) => {
 		window.setTimeout(() => {

From fc47460ae22a2050aebc1b261090631c06fed5c4 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Mon, 2 Jun 2025 09:23:15 +0800
Subject: [PATCH 10/14] chore: simplify the call

---
 packages/frontend/src/components/page/page.note.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index 3a3c0e4c7b..543e9afdaf 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -31,10 +31,8 @@ let timeoutId: ReturnType<typeof window.setTimeout> | null = null;
 
 onMounted(() => {
 	if (props.block.note == null) return;
-	timeoutId = window.setTimeout(() => {
-		retryOnThrottled(() => misskeyApi('notes/show', { noteId: props.block.note })).then(result => {
-			note.value = result;
-		});
+	timeoutId = window.setTimeout(async () => {
+		note.value = await retryOnThrottled(() => misskeyApi('notes/show', { noteId: props.block.note }));
 	}, 500 * props.index); // rate limit is 2 reqs per sec
 });
 

From b83123003e7b6d4015e4e0b2a94fe1fd25f410f8 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Tue, 3 Jun 2025 00:27:53 +0800
Subject: [PATCH 11/14] feat(page-editor.el.note): make it retry on throttle

---
 .../frontend/src/pages/page-editor/els/page-editor.el.note.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
index f275ec9517..62cea2b56b 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
@@ -25,6 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 /* eslint-disable vue/no-mutating-props */
 import { watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { retryOnThrottled } from '@@/js/retry-on-throttled.js';
 import XContainer from '../page-editor.container.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
@@ -58,7 +59,7 @@ watch(id, async () => {
 		...props.modelValue,
 		note: id.value,
 	});
-	note.value = await misskeyApi('notes/show', { noteId: id.value });
+	note.value = await retryOnThrottled(() => misskeyApi('notes/show', { noteId: id.value }));
 }, {
 	immediate: true,
 });

From fd22f5770db3976cbba287a8a61d85dc6667cda3 Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Tue, 3 Jun 2025 00:33:41 +0800
Subject: [PATCH 12/14] feat(page-editor.el.note): also add delayed load

---
 .../src/pages/page-editor/els/page-editor.el.note.vue  |  9 ++++++++-
 .../src/pages/page-editor/page-editor.blocks.vue       | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
index 62cea2b56b..e6ee7f6b02 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
@@ -36,6 +36,7 @@ import { i18n } from '@/i18n.js';
 
 const props = defineProps<{
 	modelValue: Misskey.entities.PageBlock & { type: 'note' };
+	index: number;
 }>();
 
 const emit = defineEmits<{
@@ -59,7 +60,13 @@ watch(id, async () => {
 		...props.modelValue,
 		note: id.value,
 	});
-	note.value = await retryOnThrottled(() => misskeyApi('notes/show', { noteId: id.value }));
+	const timeoutId = window.setTimeout(async () => {
+		note.value = await retryOnThrottled(() => misskeyApi('notes/show', { noteId: id.value }));
+	}, 500 * props.index); // rate limit is 2 reqs per sec
+
+	return () => {
+		window.clearTimeout(timeoutId);
+	}
 }, {
 	immediate: true,
 });
diff --git a/packages/frontend/src/pages/page-editor/page-editor.blocks.vue b/packages/frontend/src/pages/page-editor/page-editor.blocks.vue
index f191320180..8d7ba1a3ab 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.blocks.vue
+++ b/packages/frontend/src/pages/page-editor/page-editor.blocks.vue
@@ -5,10 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <Sortable :modelValue="modelValue" tag="div" itemKey="id" handle=".drag-handle" :group="{ name: 'blocks' }" :animation="150" :swapThreshold="0.5" @update:modelValue="v => emit('update:modelValue', v)">
-	<template #item="{element}">
+	<template #item="{element, index}">
 		<div :class="$style.item">
 			<!-- divが無いとエラーになる https://github.com/SortableJS/vue.draggable.next/issues/189 -->
-			<component :is="getComponent(element.type)" :modelValue="element" @update:modelValue="updateItem" @remove="() => removeItem(element)"/>
+			<component
+				:is="getComponent(element.type)"
+				:modelValue="element"
+				:index="index"
+				@update:modelValue="updateItem"
+				@remove="() => removeItem(element)"
+			/>
 		</div>
 	</template>
 </Sortable>

From 66e9e25ddaf629871594c43fe7479c0448ff083a Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Tue, 3 Jun 2025 00:41:17 +0800
Subject: [PATCH 13/14] chore: lint

---
 .../frontend/src/pages/page-editor/els/page-editor.el.note.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
index e6ee7f6b02..7d56743967 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
@@ -66,7 +66,7 @@ watch(id, async () => {
 
 	return () => {
 		window.clearTimeout(timeoutId);
-	}
+	};
 }, {
 	immediate: true,
 });

From 909239bbe581596298dc3d87fe85b857b397074a Mon Sep 17 00:00:00 2001
From: Outvi V <git@outv.im>
Date: Wed, 4 Jun 2025 09:23:15 +0800
Subject: [PATCH 14/14] chore: add per comments

---
 packages/frontend-shared/js/retry-on-throttled.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-shared/js/retry-on-throttled.ts b/packages/frontend-shared/js/retry-on-throttled.ts
index 598c94f362..f73e19b5c7 100644
--- a/packages/frontend-shared/js/retry-on-throttled.ts
+++ b/packages/frontend-shared/js/retry-on-throttled.ts
@@ -18,7 +18,7 @@ export async function retryOnThrottled<T>(f: () => Promise<T>, retryCount = 5):
 	  return await f();
 	} catch (err: any) {
 	  // RATE_LIMIT_EXCEEDED
-	  if (err?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
+	  if (typeof err === 'object' && err?.id === 'd5826d14-3982-4d2e-8011-b9e9f02499ef') {
 		lastError = err;
 		await sleep(err?.info?.fullResetMs ?? 1000);
 	  } else {