From 9f246e3dc7f8d71e7435960c348e32747fda7bdc Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 07:53:56 +0000
Subject: [PATCH 001/102] test

---
 .../frontend/src/components/MkPagination.vue  | 73 ++++++++++++++-----
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 661b04c365..1033c9701a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -54,7 +54,17 @@ const APPEAR_MINIMUM_INTERVAL = 600;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
 	endpoint: E;
+
+	/**
+	 * 一度にAPIへ取得する件数
+	 */
 	limit: number;
+
+	/**
+	 * タイムラインに表示する最大件数
+	 */
+	displayLimit?: number;
+
 	params?: misskey.Endpoints[E]['req'] | ComputedRef<misskey.Endpoints[E]['req']>;
 
 	/**
@@ -89,9 +99,7 @@ import { infoImageUrl } from '@/instance';
 const props = withDefaults(defineProps<{
 	pagination: Paging;
 	disableAutoLoad?: boolean;
-	displayLimit?: number;
 }>(), {
-	displayLimit: 20,
 });
 
 const emit = defineEmits<{
@@ -124,17 +132,23 @@ const offset = ref(0);
  */
 const fetching = ref(true);
 
+/**
+ * onActivatedでtrue, onDeactivatedでfalseになる
+ */
+const active = ref(false);
+
 const moreFetching = ref(false);
 const more = ref(false);
 const preventAppearFetchMore = ref(false);
 const preventAppearFetchMoreTimer = ref<number | null>(null);
-const isBackTop = ref(false);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
 const {
 	enableInfiniteScroll,
 } = defaultStore.reactiveState;
 
+const displayLimit = computed(() => props.pagination.displayLimit ?? props.pagination.limit * 2);
+
 const contentEl = $computed(() => props.pagination.pageEl ?? rootEl);
 const scrollableElement = $computed(() => contentEl ? getScrollContainer(contentEl) : document.body);
 
@@ -339,9 +353,9 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 	fetchMoreAppearTimeout();
 };
 
-const isTop = (): boolean => isBackTop.value || (props.pagination.reversed ? isBottomVisible : isTopVisible)(contentEl!, TOLERANCE);
+const isTop = (): boolean => (props.pagination.reversed ? isBottomVisible : isTopVisible)(contentEl!, TOLERANCE);
 
-watch(visibility, () => {
+function visibilityChange() {
 	if (visibility.value === 'hidden') {
 		timerForSetPause = window.setTimeout(() => {
 			isPausingUpdate = true;
@@ -354,13 +368,24 @@ watch(visibility, () => {
 			timerForSetPause = null;
 		} else {
 			isPausingUpdate = false;
-			if (isTop()) {
+			if (isTop() && active.value) {
 				executeQueue();
 			}
 		}
 	}
+}
+
+onActivated(() => {
+	active.value = true;
+	visibilityChange();
 });
 
+onDeactivated(() => {
+	active.value = false;
+});
+
+watch(visibility, visibilityChange);
+
 /**
  * 最新のものとして1つだけアイテムを追加する
  * ストリーミングから降ってきたアイテムはこれで追加する
@@ -373,19 +398,28 @@ const prepend = (item: MisskeyEntity): void => {
 		return;
 	}
 
-	if (isTop() && !isPausingUpdate) unshiftItems([item]);
-	else prependQueue(item);
+	if (
+		isTop() && // 先頭に表示されていない時はキューに追加する
+		!isPausingUpdate && // タブがバックグラウンドの時はキューに追加する
+		active.value // keepAliveで隠されている間はキューに追加する
+	) {
+		if (!items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
+		unshiftItems([item]);
+	} else {
+		prependQueue(item);
+	}
 };
 
 /**
- * 新着アイテムをitemsの先頭に追加し、displayLimitを適用する
+ * 新着アイテムをitemsの先頭に追加し、limitを適用する
  * @param newItems 新しいアイテムの配列
+ * @param limit デフォルトはdisplayLimit
  */
-function unshiftItems(newItems: MisskeyEntity[]) {
+function unshiftItems(newItems: MisskeyEntity[], limit = displayLimit.value) {
 	const length = newItems.length + items.value.size;
-	items.value = new Map([...arrayToEntries(newItems), ...items.value].slice(0, props.displayLimit));
+	items.value = new Map([...arrayToEntries(newItems), ...items.value].slice(0, limit));
 
-	if (length >= props.displayLimit) more.value = true;
+	if (length >= displayLimit.value) more.value = true;
 }
 
 /**
@@ -394,18 +428,19 @@ function unshiftItems(newItems: MisskeyEntity[]) {
  */
 function concatItems(oldItems: MisskeyEntity[]) {
 	const length = oldItems.length + items.value.size;
-	items.value = new Map([...items.value, ...arrayToEntries(oldItems)].slice(0, props.displayLimit));
+	items.value = new Map([...items.value, ...arrayToEntries(oldItems)].slice(0, displayLimit.value));
 
-	if (length >= props.displayLimit) more.value = true;
+	if (length >= displayLimit.value) more.value = true;
 }
 
 function executeQueue() {
-	unshiftItems(Array.from(queue.value.values()));
-	queue.value = new Map();
+	const queueArr = Array.from(queue.value.entries());
+	unshiftItems(queueArr.slice(-1 * props.pagination.limit).map(v => v[1]));
+	queue.value = new Map(queueArr.slice(0, -1 * props.pagination.limit));
 }
 
 function prependQueue(newItem: MisskeyEntity) {
-	queue.value = new Map([[newItem.id, newItem], ...queue.value].slice(0, props.displayLimit) as [string, MisskeyEntity][]);
+	queue.value = new Map([[newItem.id, newItem], ...queue.value] as [string, MisskeyEntity][]);
 }
 
 /*
@@ -431,11 +466,11 @@ const updateItem = (id: MisskeyEntity['id'], replacer: (old: MisskeyEntity) => M
 const inited = init();
 
 onActivated(() => {
-	isBackTop.value = false;
+	// nothing to do
 });
 
 onDeactivated(() => {
-	isBackTop.value = props.pagination.reversed ? window.scrollY >= (rootEl ? rootEl.scrollHeight - window.innerHeight : 0) : window.scrollY === 0;
+	// nothing to do
 });
 
 function toBottom() {

From 5f1cd1e532ae920a405e2b38c7d0789192bb60c9 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 12:36:45 +0000
Subject: [PATCH 002/102] wip

---
 .../frontend/src/components/MkPagination.vue  | 32 ++++++++++++-------
 packages/frontend/src/scripts/scroll.ts       |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 1033c9701a..ac95b68b8e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { onScrollTop, isTopVisible, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isBottomVisible } from '@/scripts/scroll';
+import { onScrollTop, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -49,7 +49,7 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const TOLERANCE = 16;
+const TOLERANCE = 64;
 const APPEAR_MINIMUM_INTERVAL = 600;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
@@ -108,7 +108,10 @@ const emit = defineEmits<{
 
 let rootEl = $shallowRef<HTMLElement>();
 
-// 遡り中かどうか
+/**
+ * スクロールが先頭にある場合はfalse
+ * スクロールが先頭にない場合にtrue
+ */
 let backed = $ref(false);
 
 let scrollRemove = $ref<(() => void) | null>(null);
@@ -158,8 +161,11 @@ let isPausingUpdate = false;
 let timerForSetPause: number | null = null;
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
-// 先頭が表示されているかどうかを検出
-// https://qiita.com/mkataigi/items/0154aefd2223ce23398e
+//#region scrolling
+/**
+ * IntersectionObserverで大まかに検出
+ * https://qiita.com/mkataigi/items/0154aefd2223ce23398e
+ */
 let scrollObserver = $ref<IntersectionObserver>();
 
 watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
@@ -170,7 +176,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		threshold: 0.01,
+		threshold: 0.1, // 10%ぐらいになったらqueueを読む
 	});
 }, { immediate: true });
 
@@ -181,16 +187,20 @@ watch($$(rootEl), () => {
 	});
 });
 
+/**
+ * onScrollTop/onScrollBottomで細かく検出する
+ */
 watch([$$(backed), $$(contentEl)], () => {
-	if (!backed) {
-		if (!contentEl) return;
+	if (!contentEl) return;
 
+	if (!backed) {
 		scrollRemove = (props.pagination.reversed ? onScrollBottom : onScrollTop)(contentEl, executeQueue, TOLERANCE);
 	} else {
 		if (scrollRemove) scrollRemove();
 		scrollRemove = null;
 	}
 });
+//#endregion
 
 if (props.pagination.params && isRef(props.pagination.params)) {
 	watch(props.pagination.params, init, { deep: true });
@@ -353,8 +363,6 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 	fetchMoreAppearTimeout();
 };
 
-const isTop = (): boolean => (props.pagination.reversed ? isBottomVisible : isTopVisible)(contentEl!, TOLERANCE);
-
 function visibilityChange() {
 	if (visibility.value === 'hidden') {
 		timerForSetPause = window.setTimeout(() => {
@@ -368,7 +376,7 @@ function visibilityChange() {
 			timerForSetPause = null;
 		} else {
 			isPausingUpdate = false;
-			if (isTop() && active.value) {
+			if (!backed && active.value) {
 				executeQueue();
 			}
 		}
@@ -399,7 +407,7 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
-		isTop() && // 先頭に表示されていない時はキューに追加する
+		!backed && // 先頭に表示されていない時はキューに追加する
 		!isPausingUpdate && // タブがバックグラウンドの時はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
diff --git a/packages/frontend/src/scripts/scroll.ts b/packages/frontend/src/scripts/scroll.ts
index a002f02b5a..5826d4d31f 100644
--- a/packages/frontend/src/scripts/scroll.ts
+++ b/packages/frontend/src/scripts/scroll.ts
@@ -25,7 +25,7 @@ export function getScrollPosition(el: HTMLElement | null): number {
 
 export function onScrollTop(el: HTMLElement, cb: () => unknown, tolerance = 1, once = false) {
 	// とりあえず評価してみる
-	if (isTopVisible(el)) {
+	if (isTopVisible(el, tolerance)) {
 		cb();
 		if (once) return null;
 	}

From 2481123972f5813f40e350129bb79062a5d5b1ae Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 12:47:06 +0000
Subject: [PATCH 003/102] 128

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index ac95b68b8e..8c3f76916b 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -49,7 +49,7 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const TOLERANCE = 64;
+const TOLERANCE = 128;
 const APPEAR_MINIMUM_INTERVAL = 600;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {

From 28f914f67f839d66ea73b1b141857dc131e4323e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 13:11:25 +0000
Subject: [PATCH 004/102] wip

---
 .../frontend/src/components/MkPagination.vue  | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8c3f76916b..db834310e4 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { onScrollTop, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scroll } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -113,6 +113,7 @@ let rootEl = $shallowRef<HTMLElement>();
  * スクロールが先頭にない場合にtrue
  */
 let backed = $ref(false);
+let weakBacked = $ref(false);
 
 let scrollRemove = $ref<(() => void) | null>(null);
 
@@ -153,7 +154,7 @@ const {
 const displayLimit = computed(() => props.pagination.displayLimit ?? props.pagination.limit * 2);
 
 const contentEl = $computed(() => props.pagination.pageEl ?? rootEl);
-const scrollableElement = $computed(() => contentEl ? getScrollContainer(contentEl) : document.body);
+const scrollableElement = $computed(() => contentEl ? getScrollContainer(contentEl) ?? document.body : document.body);
 
 const visibility = useDocumentVisibility();
 
@@ -172,7 +173,8 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	if (scrollObserver) scrollObserver.disconnect();
 
 	scrollObserver = new IntersectionObserver(entries => {
-		backed = entries[0].isIntersecting;
+		weakBacked = entries[0].isIntersecting;
+		if (weakBacked) backed = true;
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
@@ -190,15 +192,46 @@ watch($$(rootEl), () => {
 /**
  * onScrollTop/onScrollBottomで細かく検出する
  */
-watch([$$(backed), $$(contentEl)], () => {
-	if (!contentEl) return;
+function onHead() {
+	console.log('onHead');
+	backed = false;
+	executeQueue();
+}
 
-	if (!backed) {
-		scrollRemove = (props.pagination.reversed ? onScrollBottom : onScrollTop)(contentEl, executeQueue, TOLERANCE);
-	} else {
+function onBacked() {
+	backed = true;
+}
+
+watch([$$(weakBacked), $$(contentEl)], () => {
+	if (weakBacked || !contentEl) {
 		if (scrollRemove) scrollRemove();
 		scrollRemove = null;
+		return;
 	}
+
+	scrollRemove = (() => {
+		const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
+		const el = contentEl;
+		const tolerance = TOLERANCE;
+
+		const onScroll = () => {
+			if (!document.body.contains(el)) return;
+			if (checkFn(el, tolerance)) {
+				onHead();
+			} else {
+				onBacked();
+			}
+		};
+
+		// とりあえず評価してみる
+		onScroll();
+
+		const container = scrollableElement;
+
+		function removeListener() { container.removeEventListener('scroll', onScroll); }
+		container.addEventListener('scroll', onScroll, { passive: true });
+		return removeListener;
+	})();
 });
 //#endregion
 
@@ -516,7 +549,6 @@ onBeforeUnmount(() => {
 defineExpose({
 	items,
 	queue,
-	backed,
 	more,
 	inited,
 	reload,

From b4d532efb43c980917c0fd722fc0cf03ad36e400 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 13:23:56 +0000
Subject: [PATCH 005/102] fix

---
 .../frontend/src/components/MkPagination.vue  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index db834310e4..c91655138a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -192,15 +192,11 @@ watch($$(rootEl), () => {
 /**
  * onScrollTop/onScrollBottomで細かく検出する
  */
-function onHead() {
-	console.log('onHead');
-	backed = false;
-	executeQueue();
-}
-
-function onBacked() {
-	backed = true;
-}
+watch($$(backed), () => {
+	if (!backed) {
+		executeQueue();
+	}
+});
 
 watch([$$(weakBacked), $$(contentEl)], () => {
 	if (weakBacked || !contentEl) {
@@ -217,9 +213,9 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 		const onScroll = () => {
 			if (!document.body.contains(el)) return;
 			if (checkFn(el, tolerance)) {
-				onHead();
+				backed = false;
 			} else {
-				onBacked();
+				backed = true;
 			}
 		};
 
@@ -444,7 +440,7 @@ const prepend = (item: MisskeyEntity): void => {
 		!isPausingUpdate && // タブがバックグラウンドの時はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
-		if (!items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
+		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
 		unshiftItems([item]);
 	} else {
 		prependQueue(item);

From 035c98dc15707fdc5638112cf9999e874599551b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 14:14:15 +0000
Subject: [PATCH 006/102] :v:

---
 locales/index.d.ts                            |  2 +-
 locales/ja-JP.yml                             |  2 +-
 .../frontend/src/components/MkPagination.vue  | 79 ++++++++++++-------
 .../frontend/src/components/MkTimeline.vue    |  6 ++
 .../frontend/src/pages/antenna-timeline.vue   |  4 +-
 packages/frontend/src/pages/timeline.vue      |  4 +-
 .../frontend/src/pages/user-list-timeline.vue |  4 +-
 7 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 8697b22e21..453465839f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -527,7 +527,7 @@ export interface Locale {
     "deleteAll": string;
     "showFixedPostForm": string;
     "showFixedPostFormInChannel": string;
-    "newNoteRecived": string;
+    "goToTheHeadOfTimeline": string;
     "sounds": string;
     "sound": string;
     "listen": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 82efc8a469..2febef0a9e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -524,7 +524,7 @@ serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
 showFixedPostFormInChannel: "タイムライン上部に投稿フォームを表示する(チャンネル)"
-newNoteRecived: "新しいノートがあります"
+goToTheHeadOfTimeline: "最新のノートに移動"
 sounds: "サウンド"
 sound: "サウンド"
 listen: "聴く"
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index c91655138a..985b9a4973 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -8,7 +8,7 @@
 >
 	<MkLoading v-if="fetching"/>
 
-	<MkError v-else-if="error" @retry="init()"/>
+	<MkError v-else-if="error" @retry="reload()"/>
 
 	<div v-else-if="empty" key="_empty_" class="empty">
 		<slot name="empty">
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scroll } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scroll, scrollToTop } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -125,7 +125,7 @@ const items = ref<MisskeyEntityMap>(new Map());
 
 /**
  * タブが非アクティブなどの場合に更新を貯めておく
- * 最新が0番目
+ * 最新が最後（パフォーマンス上の理由でitemsと逆にした）
  */
 const queue = ref<MisskeyEntityMap>(new Map());
 
@@ -231,15 +231,17 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 });
 //#endregion
 
-if (props.pagination.params && isRef(props.pagination.params)) {
-	watch(props.pagination.params, init, { deep: true });
-}
-
 watch(queue, (a, b) => {
 	if (a.size === 0 && b.size === 0) return;
 	emit('queue', queue.value.size);
 }, { deep: true });
 
+/**
+ * 初期化
+ * scrollAfterInitなどの後処理もあるので、reload関数を使うべき
+ * 
+ * 注意: moreFetchingをtrueにするのでfalseにする必要がある
+ */
 async function init(): Promise<void> {
 	items.value = new Map();
 	queue.value = new Map();
@@ -258,7 +260,7 @@ async function init(): Promise<void> {
 			concatItems(res);
 			more.value = false;
 		} else {
-			if (props.pagination.reversed) moreFetching.value = true;
+			moreFetching.value = true;
 			concatItems(res);
 			more.value = true;
 		}
@@ -272,10 +274,43 @@ async function init(): Promise<void> {
 	});
 }
 
-const reload = (): Promise<void> => {
-	return init();
+/**
+ * initの後に呼ぶ
+ * コンポーネント作成直後でinitが呼ばれた時はonMountedで呼ばれる
+ * reloadでinitが呼ばれた時はreload内でinitの後に呼ばれる
+ */
+function scrollAfterInit() {
+	if (props.pagination.reversed) {
+		nextTick(() => {
+			setTimeout(() => {
+				if (contentEl) scrollToBottom(contentEl);
+			}, 200);
+
+			// scrollToBottomでmoreFetchingボタンが画面外まで出るまで
+			// more = trueを遅らせる
+			setTimeout(() => {
+				moreFetching.value = false;
+			}, 2000);
+		});
+	} else {
+		nextTick(() => {
+			setTimeout(() => {
+				if (contentEl) scrollToTop(contentEl);
+				moreFetching.value = false;
+			}, 200);
+		});
+	}
+}
+
+const reload = async (): Promise<void> => {
+	await init();
+	scrollAfterInit();
 };
 
+if (props.pagination.params && isRef(props.pagination.params)) {
+	watch(props.pagination.params, reload, { deep: true });
+}
+
 const fetchMore = async (): Promise<void> => {
 	if (!more.value || fetching.value || moreFetching.value || items.value.size === 0) return;
 	moreFetching.value = true;
@@ -472,12 +507,12 @@ function concatItems(oldItems: MisskeyEntity[]) {
 
 function executeQueue() {
 	const queueArr = Array.from(queue.value.entries());
-	unshiftItems(queueArr.slice(-1 * props.pagination.limit).map(v => v[1]));
-	queue.value = new Map(queueArr.slice(0, -1 * props.pagination.limit));
+	unshiftItems(queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse());
+	queue.value = new Map(queueArr.slice(props.pagination.limit));
 }
 
 function prependQueue(newItem: MisskeyEntity) {
-	queue.value = new Map([[newItem.id, newItem], ...queue.value] as [string, MisskeyEntity][]);
+	queue.value.set(newItem.id, newItem);
 }
 
 /*
@@ -510,24 +545,8 @@ onDeactivated(() => {
 	// nothing to do
 });
 
-function toBottom() {
-	scrollToBottom(contentEl!);
-}
-
 onMounted(() => {
-	inited.then(() => {
-		if (props.pagination.reversed) {
-			nextTick(() => {
-				setTimeout(toBottom, 800);
-
-				// scrollToBottomでmoreFetchingボタンが画面外まで出るまで
-				// more = trueを遅らせる
-				setTimeout(() => {
-					moreFetching.value = false;
-				}, 2000);
-			});
-		}
-	});
+	inited.then(scrollAfterInit);
 });
 
 onBeforeUnmount(() => {
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 2595ebc45d..13d5b9f88d 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -164,4 +164,10 @@ const timetravel = (date?: Date) => {
 	this.$refs.tl.reload();
 };
 */
+
+defineExpose({
+	reload: () => {
+		tlComponent.pagingComponent?.reload();
+	},
+});
 </script>
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index a22714791f..b2bc889cfb 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -3,7 +3,7 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl" v-hotkey.global="keymap">
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
+			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlEl" :key="antennaId"
@@ -46,7 +46,7 @@ function queueUpdated(q) {
 }
 
 function top() {
-	scroll(rootEl, { top: 0 });
+	tlEl?.reload();
 }
 
 async function timetravel() {
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index a441c6f728..20b35c9a25 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -6,7 +6,7 @@
 			<XTutorial v-if="$i && defaultStore.reactiveState.timelineTutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
 			<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
 
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
+			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlComponent"
@@ -58,7 +58,7 @@ function queueUpdated(q: number): void {
 }
 
 function top(): void {
-	if (rootEl) scroll(rootEl, { top: 0 });
+	tlComponent?.reload();
 }
 
 async function chooseList(ev: MouseEvent): Promise<void> {
diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue
index f66670e1f6..67a576ce83 100644
--- a/packages/frontend/src/pages/user-list-timeline.vue
+++ b/packages/frontend/src/pages/user-list-timeline.vue
@@ -3,7 +3,7 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl">
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
+			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlEl" :key="listId"
@@ -49,7 +49,7 @@ function queueUpdated(q) {
 }
 
 function top() {
-	scroll(rootEl, { top: 0 });
+	tlEl?.reload();
 }
 
 function settings() {

From ddb41bd0ba562e8c4ad1972b6a34e75691c5a1e3 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 14:39:59 +0000
Subject: [PATCH 007/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 25 +++++++++++--------
 .../frontend/src/components/MkTimeline.vue    |  6 +++--
 .../frontend/src/pages/antenna-timeline.vue   |  8 +-----
 packages/frontend/src/pages/timeline.vue      |  9 +------
 .../frontend/src/pages/user-list-timeline.vue |  9 +------
 5 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 985b9a4973..52a2c3af37 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -102,10 +102,6 @@ const props = withDefaults(defineProps<{
 }>(), {
 });
 
-const emit = defineEmits<{
-	(ev: 'queue', count: number): void;
-}>();
-
 let rootEl = $shallowRef<HTMLElement>();
 
 /**
@@ -128,6 +124,7 @@ const items = ref<MisskeyEntityMap>(new Map());
  * 最新が最後（パフォーマンス上の理由でitemsと逆にした）
  */
 const queue = ref<MisskeyEntityMap>(new Map());
+const queueSize = computed(() => queue.value.size);
 
 const offset = ref(0);
 
@@ -231,11 +228,6 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 });
 //#endregion
 
-watch(queue, (a, b) => {
-	if (a.size === 0 && b.size === 0) return;
-	emit('queue', queue.value.size);
-}, { deep: true });
-
 /**
  * 初期化
  * scrollAfterInitなどの後処理もあるので、reload関数を使うべき
@@ -283,7 +275,12 @@ function scrollAfterInit() {
 	if (props.pagination.reversed) {
 		nextTick(() => {
 			setTimeout(() => {
-				if (contentEl) scrollToBottom(contentEl);
+				if (contentEl) {
+					scrollToBottom(contentEl);
+					// scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある
+					weakBacked = false;
+					backed = false;
+				}
 			}, 200);
 
 			// scrollToBottomでmoreFetchingボタンが画面外まで出るまで
@@ -295,7 +292,11 @@ function scrollAfterInit() {
 	} else {
 		nextTick(() => {
 			setTimeout(() => {
-				if (contentEl) scrollToTop(contentEl);
+				scrollToTop(scrollableElement);
+				// scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある
+				weakBacked = false;
+				backed = false;
+
 				moreFetching.value = false;
 			}, 200);
 		});
@@ -471,6 +472,7 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
+		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		!backed && // 先頭に表示されていない時はキューに追加する
 		!isPausingUpdate && // タブがバックグラウンドの時はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
@@ -566,6 +568,7 @@ defineExpose({
 	queue,
 	more,
 	inited,
+	queueSize,
 	reload,
 	prepend,
 	append: appendItem,
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 13d5b9f88d..bc15ebfcaf 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -1,5 +1,5 @@
 <template>
-<MkNotes ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)"/>
+<MkNotes ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination"/>
 </template>
 
 <script lang="ts" setup>
@@ -21,7 +21,6 @@ const props = defineProps<{
 
 const emit = defineEmits<{
 	(ev: 'note'): void;
-	(ev: 'queue', count: number): void;
 }>();
 
 provide('inChannel', computed(() => props.src === 'channel'));
@@ -169,5 +168,8 @@ defineExpose({
 	reload: () => {
 		tlComponent.pagingComponent?.reload();
 	},
+	queueSize: computed(() => {
+		return tlComponent.pagingComponent?.queueSize ?? 0;
+	}),
 });
 </script>
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index b2bc889cfb..693259a0e5 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -3,14 +3,13 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl" v-hotkey.global="keymap">
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
+			<div v-if="tlEl?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlEl" :key="antennaId"
 					src="antenna"
 					:antenna="antennaId"
 					:sound="true"
-					@queue="queueUpdated"
 				/>
 			</div>
 		</div>
@@ -34,17 +33,12 @@ const props = defineProps<{
 }>();
 
 let antenna = $ref(null);
-let queue = $ref(0);
 let rootEl = $shallowRef<HTMLElement>();
 let tlEl = $shallowRef<InstanceType<typeof MkTimeline>>();
 const keymap = $computed(() => ({
 	't': focus,
 }));
 
-function queueUpdated(q) {
-	queue = q;
-}
-
 function top() {
 	tlEl?.reload();
 }
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 20b35c9a25..f045d53a69 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -6,14 +6,13 @@
 			<XTutorial v-if="$i && defaultStore.reactiveState.timelineTutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
 			<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
 
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
+			<div v-if="tlComponent?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlComponent"
 					:key="src"
 					:src="src"
 					:sound="true"
-					@queue="queueUpdated"
 				/>
 			</div>
 		</div>
@@ -26,7 +25,6 @@ import { defineAsyncComponent, computed, watch, provide } from 'vue';
 import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
-import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { defaultStore } from '@/store';
 import { i18n } from '@/i18n';
@@ -47,16 +45,11 @@ const keymap = {
 const tlComponent = $shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = $shallowRef<HTMLElement>();
 
-let queue = $ref(0);
 let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global');
 const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) });
 
 watch ($$(src), () => queue = 0);
 
-function queueUpdated(q: number): void {
-	queue = q;
-}
-
 function top(): void {
 	tlComponent?.reload();
 }
diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue
index 67a576ce83..e297e1747e 100644
--- a/packages/frontend/src/pages/user-list-timeline.vue
+++ b/packages/frontend/src/pages/user-list-timeline.vue
@@ -3,14 +3,13 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl">
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
+			<div v-if="tlEl?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
 			<div :class="$style.tl">
 				<MkTimeline
 					ref="tlEl" :key="listId"
 					src="list"
 					:list="listId"
 					:sound="true"
-					@queue="queueUpdated"
 				/>
 			</div>
 		</div>
@@ -21,7 +20,6 @@
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
 import MkTimeline from '@/components/MkTimeline.vue';
-import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
@@ -34,7 +32,6 @@ const props = defineProps<{
 }>();
 
 let list = $ref(null);
-let queue = $ref(0);
 let tlEl = $shallowRef<InstanceType<typeof MkTimeline>>();
 let rootEl = $shallowRef<HTMLElement>();
 
@@ -44,10 +41,6 @@ watch(() => props.listId, async () => {
 	});
 }, { immediate: true });
 
-function queueUpdated(q) {
-	queue = q;
-}
-
 function top() {
 	tlEl?.reload();
 }

From f5a019a6d6feb8afa9c1cf8185a43c7de3bed976 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 11 Jul 2023 15:17:52 +0000
Subject: [PATCH 008/102] active?

---
 packages/frontend/src/components/MkPagination.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 52a2c3af37..54a1980c53 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -136,7 +136,7 @@ const fetching = ref(true);
 /**
  * onActivatedでtrue, onDeactivatedでfalseになる
  */
-const active = ref(false);
+const active = ref(true);
 
 const moreFetching = ref(false);
 const more = ref(false);
@@ -539,15 +539,8 @@ const updateItem = (id: MisskeyEntity['id'], replacer: (old: MisskeyEntity) => M
 
 const inited = init();
 
-onActivated(() => {
-	// nothing to do
-});
-
-onDeactivated(() => {
-	// nothing to do
-});
-
 onMounted(() => {
+	active.value = true;
 	inited.then(scrollAfterInit);
 });
 

From 974f7c13d31ae010896299c5be7ab43e36ba3be5 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 03:53:48 +0000
Subject: [PATCH 009/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 54a1980c53..335e82473e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -226,6 +226,25 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 		return removeListener;
 	})();
 });
+
+/**
+ * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
+ * @param fn DOM操作(unshiftItemsなどで)
+ */
+function adjustScroll(fn: () => void) {
+	const oldHeight = scrollableElement.scrollHeight;
+	const oldScroll = scrollableElement.scrollTop;
+	fn();
+	return nextTick(() => {
+		const top = oldScroll + (scrollableElement.scrollHeight - oldHeight);
+		scroll(scrollableElement, { top, behavior: 'instant' });
+		if (top > TOLERANCE) {
+			weakBacked = true;
+			backed = true;
+		}
+		return nextTick();
+	});
+}
 //#endregion
 
 /**
@@ -493,7 +512,7 @@ function unshiftItems(newItems: MisskeyEntity[], limit = displayLimit.value) {
 	const length = newItems.length + items.value.size;
 	items.value = new Map([...arrayToEntries(newItems), ...items.value].slice(0, limit));
 
-	if (length >= displayLimit.value) more.value = true;
+	if (length >= limit) more.value = true;
 }
 
 /**
@@ -507,9 +526,16 @@ function concatItems(oldItems: MisskeyEntity[]) {
 	if (length >= displayLimit.value) more.value = true;
 }
 
-function executeQueue() {
+async function executeQueue() {
 	const queueArr = Array.from(queue.value.entries());
-	unshiftItems(queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse());
+	adjustScroll(() => {
+		unshiftItems(
+			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
+			Infinity,
+		);
+	}).then(() => {
+		items.value = new Map([...items.value].slice(0, displayLimit.value));
+	});
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 }
 

From 88315d3e80a671c5090ab6e5bf2b41cbdc0a4f4b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 04:15:32 +0000
Subject: [PATCH 010/102] :v:

---
 packages/frontend/src/components/MkPagination.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 335e82473e..71c110b67a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -231,7 +231,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
  * @param fn DOM操作(unshiftItemsなどで)
  */
-function adjustScroll(fn: () => void) {
+function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement.scrollHeight;
 	const oldScroll = scrollableElement.scrollTop;
 	fn();
@@ -493,7 +493,7 @@ const prepend = (item: MisskeyEntity): void => {
 	if (
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		!backed && // 先頭に表示されていない時はキューに追加する
-		!isPausingUpdate && // タブがバックグラウンドの時はキューに追加する
+		!isPausingUpdate && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
@@ -528,15 +528,17 @@ function concatItems(oldItems: MisskeyEntity[]) {
 
 async function executeQueue() {
 	const queueArr = Array.from(queue.value.entries());
-	adjustScroll(() => {
+	queue.value = new Map(queueArr.slice(props.pagination.limit));
+	isPausingUpdate = true;
+	await adjustScroll(() => {
 		unshiftItems(
 			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
 			Infinity,
 		);
-	}).then(() => {
-		items.value = new Map([...items.value].slice(0, displayLimit.value));
 	});
-	queue.value = new Map(queueArr.slice(props.pagination.limit));
+	items.value = new Map([...items.value].slice(0, displayLimit.value));
+	await nextTick();
+	isPausingUpdate = false;
 }
 
 function prependQueue(newItem: MisskeyEntity) {

From 877a7a81bba32febe1decc611c1bb2f598d116a0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 04:38:04 +0000
Subject: [PATCH 011/102] ?

---
 .../frontend/src/components/MkPagination.vue  | 33 ++++++-------------
 .../frontend/src/pages/antenna-timeline.vue   |  1 -
 packages/frontend/src/scripts/scroll.ts       | 16 +++++----
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 71c110b67a..6d8ab687c8 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scroll, scrollToTop } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scrollToTop, scroll } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -151,7 +151,8 @@ const {
 const displayLimit = computed(() => props.pagination.displayLimit ?? props.pagination.limit * 2);
 
 const contentEl = $computed(() => props.pagination.pageEl ?? rootEl);
-const scrollableElement = $computed(() => contentEl ? getScrollContainer(contentEl) ?? document.body : document.body);
+const scrollableElement = $computed(() => contentEl ? getScrollContainer(contentEl) ?? null : null);
+const scrollableElementOrHtml = $computed(() => scrollableElement ?? document.getElementsByName('html')[0]);
 
 const visibility = useDocumentVisibility();
 
@@ -173,7 +174,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].isIntersecting;
 		if (weakBacked) backed = true;
 	}, {
-		root: scrollableElement,
+		root: scrollableElementOrHtml,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
 		threshold: 0.1, // 10%ぐらいになったらqueueを読む
 	});
@@ -219,7 +220,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 		// とりあえず評価してみる
 		onScroll();
 
-		const container = scrollableElement;
+		const container = scrollableElementOrHtml;
 
 		function removeListener() { container.removeEventListener('scroll', onScroll); }
 		container.addEventListener('scroll', onScroll, { passive: true });
@@ -232,11 +233,12 @@ watch([$$(weakBacked), $$(contentEl)], () => {
  * @param fn DOM操作(unshiftItemsなどで)
  */
 function adjustScroll(fn: () => void): Promise<void> {
-	const oldHeight = scrollableElement.scrollHeight;
-	const oldScroll = scrollableElement.scrollTop;
+	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
+	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
+
 	fn();
 	return nextTick(() => {
-		const top = oldScroll + (scrollableElement.scrollHeight - oldHeight);
+		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 		scroll(scrollableElement, { top, behavior: 'instant' });
 		if (top > TOLERANCE) {
 			weakBacked = true;
@@ -349,22 +351,7 @@ const fetchMore = async (): Promise<void> => {
 			if (i === 10) item._shouldInsertAd_ = true;
 		}
 
-		const reverseConcat = _res => {
-			const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
-			const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
-
-			items.value = concatMapWithArray(items.value, _res);
-
-			return nextTick(() => {
-				if (scrollableElement) {
-					scroll(scrollableElement, { top: oldScroll + (scrollableElement.scrollHeight - oldHeight), behavior: 'instant' });
-				} else {
-					window.scroll({ top: oldScroll + (getBodyScrollHeight() - oldHeight), behavior: 'instant' });
-				}
-
-				return nextTick();
-			});
-		};
+		const reverseConcat = (_res) => adjustScroll(() => concatMapWithArray(items.value, _res));
 
 		if (res.length === 0) {
 			if (props.pagination.reversed) {
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index 693259a0e5..327f1b4b14 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -20,7 +20,6 @@
 <script lang="ts" setup>
 import { computed, watch } from 'vue';
 import MkTimeline from '@/components/MkTimeline.vue';
-import { scroll } from '@/scripts/scroll';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
diff --git a/packages/frontend/src/scripts/scroll.ts b/packages/frontend/src/scripts/scroll.ts
index 5826d4d31f..94f5757b35 100644
--- a/packages/frontend/src/scripts/scroll.ts
+++ b/packages/frontend/src/scripts/scroll.ts
@@ -70,12 +70,16 @@ export function onScrollBottom(el: HTMLElement, cb: () => unknown, tolerance = 1
 	return removeListener;
 }
 
-export function scroll(el: HTMLElement, options: ScrollToOptions | undefined) {
-	const container = getScrollContainer(el);
-	if (container == null) {
+/**
+ * コンテナを指定してスクロールする
+ * @param el Container element
+ * @param options ScrollToOptions
+ */
+export function scroll(el: HTMLElement | null, options: ScrollToOptions | undefined) {
+	if (el == null) {
 		window.scroll(options);
 	} else {
-		container.scroll(options);
+		el.scroll(options);
 	}
 }
 
@@ -84,8 +88,8 @@ export function scroll(el: HTMLElement, options: ScrollToOptions | undefined) {
  * @param el Scroll container element
  * @param options Scroll options
  */
-export function scrollToTop(el: HTMLElement, options: { behavior?: ScrollBehavior; } = {}) {
-	scroll(el, { top: 0, ...options });
+export function scrollToTop(el: HTMLElement | null, options: { behavior?: ScrollBehavior; } = {}) {
+	scroll(getScrollContainer(el), { top: 0, ...options });
 }
 
 /**

From fae912a7541e1cf4596e65ec777ca7fa1220020d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 05:27:53 +0000
Subject: [PATCH 012/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 6d8ab687c8..3c7d1f75c0 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -161,6 +161,12 @@ let timerForSetPause: number | null = null;
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
 //#region scrolling
+const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
+const checkTop = () => {
+	if (!contentEl) return;
+	if (!document.body.contains(contentEl)) return;
+	return checkFn(contentEl, TOLERANCE, scrollableElement);
+};
 /**
  * IntersectionObserverで大まかに検出
  * https://qiita.com/mkataigi/items/0154aefd2223ce23398e
@@ -172,15 +178,14 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 
 	scrollObserver = new IntersectionObserver(entries => {
 		weakBacked = entries[0].isIntersecting;
-		if (weakBacked) backed = true;
 	}, {
-		root: scrollableElementOrHtml,
+		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
 		threshold: 0.1, // 10%ぐらいになったらqueueを読む
 	});
 }, { immediate: true });
 
-watch($$(rootEl), () => {
+watch([$$(rootEl), $$(scrollObserver)], () => {
 	scrollObserver?.disconnect();
 	nextTick(() => {
 		if (rootEl) scrollObserver?.observe(rootEl);
@@ -197,33 +202,26 @@ watch($$(backed), () => {
 });
 
 watch([$$(weakBacked), $$(contentEl)], () => {
+	if (scrollRemove) scrollRemove();
+	scrollRemove = null;
+
 	if (weakBacked || !contentEl) {
-		if (scrollRemove) scrollRemove();
-		scrollRemove = null;
+		if (weakBacked) backed = true;
 		return;
 	}
 
 	scrollRemove = (() => {
-		const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
-		const el = contentEl;
-		const tolerance = TOLERANCE;
-
-		const onScroll = () => {
-			if (!document.body.contains(el)) return;
-			if (checkFn(el, tolerance)) {
-				backed = false;
-			} else {
-				backed = true;
-			}
+		const checkBacked = () => {
+			backed = !checkTop();
 		};
 
 		// とりあえず評価してみる
-		onScroll();
+		checkBacked();
 
 		const container = scrollableElementOrHtml;
 
 		function removeListener() { container.removeEventListener('scroll', onScroll); }
-		container.addEventListener('scroll', onScroll, { passive: true });
+		container.addEventListener('scroll', checkBacked, { passive: true });
 		return removeListener;
 	})();
 });
@@ -240,10 +238,6 @@ function adjustScroll(fn: () => void): Promise<void> {
 	return nextTick(() => {
 		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 		scroll(scrollableElement, { top, behavior: 'instant' });
-		if (top > TOLERANCE) {
-			weakBacked = true;
-			backed = true;
-		}
 		return nextTick();
 	});
 }
@@ -295,12 +289,11 @@ async function init(): Promise<void> {
 function scrollAfterInit() {
 	if (props.pagination.reversed) {
 		nextTick(() => {
-			setTimeout(() => {
+			setTimeout(async () => {
 				if (contentEl) {
 					scrollToBottom(contentEl);
 					// scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある
 					weakBacked = false;
-					backed = false;
 				}
 			}, 200);
 
@@ -316,7 +309,6 @@ function scrollAfterInit() {
 				scrollToTop(scrollableElement);
 				// scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある
 				weakBacked = false;
-				backed = false;
 
 				moreFetching.value = false;
 			}, 200);
@@ -523,6 +515,7 @@ async function executeQueue() {
 			Infinity,
 		);
 	});
+	weakBacked = !checkTop();
 	items.value = new Map([...items.value].slice(0, displayLimit.value));
 	await nextTick();
 	isPausingUpdate = false;

From 130ece74f9cc82ccd949b3e2354fd4d1554667ac Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 05:36:32 +0000
Subject: [PATCH 013/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 3c7d1f75c0..af880a3e05 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -220,7 +220,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 
 		const container = scrollableElementOrHtml;
 
-		function removeListener() { container.removeEventListener('scroll', onScroll); }
+		function removeListener() { container.removeEventListener('scroll', checkBacked); }
 		container.addEventListener('scroll', checkBacked, { passive: true });
 		return removeListener;
 	})();

From 68d647d6b88901a5b94a7fbbfa71a2d72ca6f3cd Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 05:48:18 +0000
Subject: [PATCH 014/102] ?

---
 packages/frontend/src/components/MkPagination.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index af880a3e05..a04a664b7a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -233,6 +233,8 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
+	// スクロールをやめさせる
+	scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
 
 	fn();
 	return nextTick(() => {

From 8213380dedba19d33dec1e88c0b86846faa0b691 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 05:58:17 +0000
Subject: [PATCH 015/102] :v:

---
 packages/frontend/src/components/MkPagination.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index a04a664b7a..6f209aca25 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -226,6 +226,10 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	})();
 });
 
+function preventDefault(ev: Event) {
+	ev.preventDefault();
+}
+
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
  * @param fn DOM操作(unshiftItemsなどで)
@@ -234,12 +238,16 @@ function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
 	// スクロールをやめさせる
+	scrollableElementOrHtml.addEventListener('mousewheel', preventDefault, { passive: false });
+	scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
 	scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
 
 	fn();
 	return nextTick(() => {
 		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 		scroll(scrollableElement, { top, behavior: 'instant' });
+		scrollableElementOrHtml.removeEventListener('mousewheel', preventDefault);
+		scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
 		return nextTick();
 	});
 }

From a26f289dd5ca492454cfa9ce3bf65c13a30756d2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 06:10:42 +0000
Subject: [PATCH 016/102] ???

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 6f209aca25..b72e531063 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -243,6 +243,7 @@ function adjustScroll(fn: () => void): Promise<void> {
 	scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
 
 	fn();
+
 	return nextTick(() => {
 		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 		scroll(scrollableElement, { top, behavior: 'instant' });

From 2bbada3cd4377aec5a14669991f650b0e8e45283 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 06:24:40 +0000
Subject: [PATCH 017/102] 256

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index b72e531063..1c7611b828 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -49,7 +49,7 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const TOLERANCE = 128;
+const TOLERANCE = 256;
 const APPEAR_MINIMUM_INTERVAL = 600;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {

From ba3fa8b43192b0f1825319d3acbb5192cbe4a486 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Jul 2023 07:20:11 +0000
Subject: [PATCH 018/102] ??

---
 .../frontend/src/components/MkPagination.vue  | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 1c7611b828..c44f8aa5ec 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -177,25 +177,27 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	if (scrollObserver) scrollObserver.disconnect();
 
 	scrollObserver = new IntersectionObserver(entries => {
+		console.log('scrollObserver', entries[0].isIntersecting);
 		weakBacked = entries[0].isIntersecting;
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
 		threshold: 0.1, // 10%ぐらいになったらqueueを読む
 	});
+	console.log('new scrollObserver', scrollObserver);
 }, { immediate: true });
 
 watch([$$(rootEl), $$(scrollObserver)], () => {
 	scrollObserver?.disconnect();
-	nextTick(() => {
-		if (rootEl) scrollObserver?.observe(rootEl);
-	});
+	if (rootEl) scrollObserver?.observe(rootEl);
+	console.log('scrollObserver observe', rootEl);
 });
 
 /**
  * onScrollTop/onScrollBottomで細かく検出する
  */
 watch($$(backed), () => {
+	console.log('backed changed', backed);
 	if (!backed) {
 		executeQueue();
 	}
@@ -206,13 +208,16 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	scrollRemove = null;
 
 	if (weakBacked || !contentEl) {
+		console.log('weakBacked watcher remove scrollRemove', weakBacked, contentEl);
 		if (weakBacked) backed = true;
 		return;
 	}
 
+	console.log('weakBacked watcher add scrollRemove', weakBacked, contentEl);
 	scrollRemove = (() => {
 		const checkBacked = () => {
 			backed = !checkTop();
+			console.log('checkBacked', backed);
 		};
 
 		// とりあえず評価してみる
@@ -235,20 +240,33 @@ function preventDefault(ev: Event) {
  * @param fn DOM操作(unshiftItemsなどで)
  */
 function adjustScroll(fn: () => void): Promise<void> {
+	console.log('adjustScroll');
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
 	// スクロールをやめさせる
-	scrollableElementOrHtml.addEventListener('mousewheel', preventDefault, { passive: false });
-	scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
-	scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
+	try {
+		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+		scrollableElementOrHtml.addEventListener('mousewheel', preventDefault, { passive: false });
+		scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
+		// ついでにtryに入れてみる
+		scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
+	} catch (err) {
+		console.error(err, { scrollableElementOrHtml });
+	}
 
 	fn();
 
 	return nextTick(() => {
-		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
-		scroll(scrollableElement, { top, behavior: 'instant' });
-		scrollableElementOrHtml.removeEventListener('mousewheel', preventDefault);
-		scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
+		try {
+			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
+			scroll(scrollableElement, { top, behavior: 'instant' });
+
+			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+			scrollableElementOrHtml.removeEventListener('mousewheel', preventDefault);
+			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
+		} catch (err) {
+			console.error(err, { scrollableElementOrHtml });
+		}
 		return nextTick();
 	});
 }
@@ -261,6 +279,7 @@ function adjustScroll(fn: () => void): Promise<void> {
  * 注意: moreFetchingをtrueにするのでfalseにする必要がある
  */
 async function init(): Promise<void> {
+	console.log('init');
 	items.value = new Map();
 	queue.value = new Map();
 	fetching.value = true;
@@ -298,6 +317,7 @@ async function init(): Promise<void> {
  * reloadでinitが呼ばれた時はreload内でinitの後に呼ばれる
  */
 function scrollAfterInit() {
+	console.log('scrollAfterInit');
 	if (props.pagination.reversed) {
 		nextTick(() => {
 			setTimeout(async () => {
@@ -474,6 +494,8 @@ watch(visibility, visibilityChange);
  * @param item アイテム
  */
 const prepend = (item: MisskeyEntity): void => {
+	console.log('prepend', item, 'queueSize', queueSize.value, 'backed', backed, 'isPausingUpdate', isPausingUpdate, 'active', active.value);
+
 	if (items.value.size === 0) {
 		items.value.set(item.id, item);
 		fetching.value = false;
@@ -517,19 +539,23 @@ function concatItems(oldItems: MisskeyEntity[]) {
 }
 
 async function executeQueue() {
+	console.log('executeQueue');
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdate = true;
-	await adjustScroll(() => {
-		unshiftItems(
-			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-			Infinity,
-		);
-	});
-	weakBacked = !checkTop();
-	items.value = new Map([...items.value].slice(0, displayLimit.value));
-	await nextTick();
-	isPausingUpdate = false;
+	try {
+		await adjustScroll(() => {
+			unshiftItems(
+				queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
+				Infinity,
+			);
+		});
+		weakBacked = !checkTop();
+		items.value = new Map([...items.value].slice(0, displayLimit.value));
+		await nextTick();
+	} finally {
+		isPausingUpdate = false;
+	}
 }
 
 function prependQueue(newItem: MisskeyEntity) {
@@ -573,6 +599,7 @@ onBeforeUnmount(() => {
 		preventAppearFetchMoreTimer.value = null;
 	}
 	scrollObserver?.disconnect();
+	if (scrollRemove) scrollRemove();
 });
 
 defineExpose({

From 752c01ba91152fb1deb8f6c485104a38282a2966 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 05:25:44 +0000
Subject: [PATCH 019/102] ?

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index c44f8aa5ec..827879d4df 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -182,7 +182,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		threshold: 0.1, // 10%ぐらいになったらqueueを読む
+		threshold: [0.01, 0.05, 0.1], // ターゲットの可視範囲は10%以上（0.01を含めないと検出されないことがある）
 	});
 	console.log('new scrollObserver', scrollObserver);
 }, { immediate: true });

From 4fabe26b0709aa4e1f0a8a04cb8871aff5b69dd6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 07:09:46 +0000
Subject: [PATCH 020/102] lob

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 827879d4df..9deb1de43e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -469,6 +469,7 @@ function visibilityChange() {
 			clearTimeout(timerForSetPause);
 			timerForSetPause = null;
 		} else {
+			console.log('visibilityChange: executeQueue', 'backed', backed, 'active', active.value);
 			isPausingUpdate = false;
 			if (!backed && active.value) {
 				executeQueue();

From c7c3c3287118dcb46d059d2b7d0a8af5e000de7f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 07:19:43 +0000
Subject: [PATCH 021/102] skip executeQueue if no queue

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 9deb1de43e..e3b7be9501 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -541,6 +541,7 @@ function concatItems(oldItems: MisskeyEntity[]) {
 
 async function executeQueue() {
 	console.log('executeQueue');
+	if (queue.value.size === 0) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdate = true;

From a1b90d6dd3b056afc632fdf6f686286124e2809b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 07:20:45 +0000
Subject: [PATCH 022/102] at

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index e3b7be9501..ea933f2c8a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -366,7 +366,7 @@ const fetchMore = async (): Promise<void> => {
 		...(props.pagination.offsetMode ? {
 			offset: offset.value,
 		} : {
-			untilId: Array.from(items.value.keys())[items.value.size - 1],
+			untilId: Array.from(items.value.keys()).at(-1),
 		}),
 	}).then(res => {
 		for (let i = 0; i < res.length; i++) {
@@ -415,7 +415,7 @@ const fetchMoreAhead = async (): Promise<void> => {
 		...(props.pagination.offsetMode ? {
 			offset: offset.value,
 		} : {
-			sinceId: Array.from(items.value.keys())[items.value.size - 1],
+			sinceId: Array.from(items.value.keys()).at(-1),
 		}),
 	}).then(res => {
 		if (res.length === 0) {

From 7d4f33d2c050f85a464855db9508714eacf2f374 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 11:12:32 +0000
Subject: [PATCH 023/102] :v:

---
 packages/frontend/src/components/MkNotes.vue  |  7 +++-
 .../src/components/MkNotifications.vue        |  6 +--
 .../frontend/src/components/MkPagination.vue  | 42 ++++++++++++-------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index b49c8fa8b7..140e44752f 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -7,7 +7,7 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notes }">
+	<template #default="{ items: notes, denyMoveTransition }">
 		<div :class="[$style.root, { [$style.noGap]: noGap }]">
 			<MkDateSeparatedList
 				ref="notes"
@@ -17,7 +17,10 @@
 				:reversed="pagination.reversed"
 				:noGap="noGap"
 				:ad="true"
-				:class="$style.notes"
+				:class="{
+					[$style.notes]: true,
+					'deny-move-transition': denyMoveTransition,
+				}"
 			>
 				<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
 			</MkDateSeparatedList>
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index d4a30d1916..5fd42fc1e9 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -7,9 +7,9 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notifications }">
-		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true">
-			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
+	<template #default="{ items: notifications, denyMoveTransition }">
+		<MkDateSeparatedList v-slot="{ item: notification }" :class="{ [$style.list]: true, 'deny-move-transition': denyMoveTransition }" :items="notifications" :noGap="true">
+			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="`showNotificationAsNote:${notification.id}`" :note="notification.note"/>
 			<XNotification v-else :key="notification.id" :notification="notification" :withTime="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>
 	</template>
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index ea933f2c8a..d7565f9feb 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -26,7 +26,7 @@
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
-		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching"></slot>
+		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
 		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
 			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
@@ -144,6 +144,7 @@ const preventAppearFetchMore = ref(false);
 const preventAppearFetchMoreTimer = ref<number | null>(null);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
+const denyMoveTransition = ref(false);
 const {
 	enableInfiniteScroll,
 } = defaultStore.reactiveState;
@@ -156,8 +157,8 @@ const scrollableElementOrHtml = $computed(() => scrollableElement ?? document.ge
 
 const visibility = useDocumentVisibility();
 
-let isPausingUpdate = false;
-let timerForSetPause: number | null = null;
+const isPausingUpdate = ref(false);
+const timerForSetPause = ref<number | null>(null);
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
 //#region scrolling
@@ -254,6 +255,8 @@ function adjustScroll(fn: () => void): Promise<void> {
 		console.error(err, { scrollableElementOrHtml });
 	}
 
+	denyMoveTransition.value = true;
+
 	fn();
 
 	return nextTick(() => {
@@ -267,6 +270,7 @@ function adjustScroll(fn: () => void): Promise<void> {
 		} catch (err) {
 			console.error(err, { scrollableElementOrHtml });
 		}
+		denyMoveTransition.value = false;
 		return nextTick();
 	});
 }
@@ -459,18 +463,18 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 
 function visibilityChange() {
 	if (visibility.value === 'hidden') {
-		timerForSetPause = window.setTimeout(() => {
-			isPausingUpdate = true;
-			timerForSetPause = null;
+		timerForSetPause.value = window.setTimeout(() => {
+			isPausingUpdate.value = true;
+			timerForSetPause.value = null;
 		},
 		BACKGROUND_PAUSE_WAIT_SEC * 1000);
 	} else { // 'visible'
-		if (timerForSetPause) {
-			clearTimeout(timerForSetPause);
-			timerForSetPause = null;
+		if (timerForSetPause.value) {
+			clearTimeout(timerForSetPause.value);
+			timerForSetPause.value = null;
 		} else {
 			console.log('visibilityChange: executeQueue', 'backed', backed, 'active', active.value);
-			isPausingUpdate = false;
+			isPausingUpdate.value = false;
 			if (!backed && active.value) {
 				executeQueue();
 			}
@@ -506,7 +510,7 @@ const prepend = (item: MisskeyEntity): void => {
 	if (
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		!backed && // 先頭に表示されていない時はキューに追加する
-		!isPausingUpdate && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
+		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
@@ -544,7 +548,7 @@ async function executeQueue() {
 	if (queue.value.size === 0) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
-	isPausingUpdate = true;
+	isPausingUpdate.value = true;
 	try {
 		await adjustScroll(() => {
 			unshiftItems(
@@ -552,11 +556,17 @@ async function executeQueue() {
 				Infinity,
 			);
 		});
+
+		// 念の為backedを再チェック
 		weakBacked = !checkTop();
+
+		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
+		denyMoveTransition.value = true;
 		items.value = new Map([...items.value].slice(0, displayLimit.value));
 		await nextTick();
 	} finally {
-		isPausingUpdate = false;
+		isPausingUpdate.value = false;
+		denyMoveTransition.value = false;
 	}
 }
 
@@ -592,9 +602,9 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
-	if (timerForSetPause) {
-		clearTimeout(timerForSetPause);
-		timerForSetPause = null;
+	if (timerForSetPause.value) {
+		clearTimeout(timerForSetPause.value);
+		timerForSetPause.value = null;
 	}
 	if (preventAppearFetchMoreTimer.value) {
 		clearTimeout(preventAppearFetchMoreTimer.value);

From 04ff07e4e77426346587c802ae34944714212f19 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 12:03:59 +0000
Subject: [PATCH 024/102] :art:

---
 .../frontend/src/components/MkPagination.vue  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index d7565f9feb..89abf229d1 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -49,8 +49,10 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const TOLERANCE = 256;
+const BACK_TO_TOP_TOLERANCE = 256;
+const TOP_STATIC_TOLERANCE = 64;
 const APPEAR_MINIMUM_INTERVAL = 600;
+const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
 	endpoint: E;
@@ -159,14 +161,13 @@ const visibility = useDocumentVisibility();
 
 const isPausingUpdate = ref(false);
 const timerForSetPause = ref<number | null>(null);
-const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
 //#region scrolling
 const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
-const checkTop = () => {
+const checkTop = (tolerance?: number) => {
 	if (!contentEl) return;
 	if (!document.body.contains(contentEl)) return;
-	return checkFn(contentEl, TOLERANCE, scrollableElement);
+	return checkFn(contentEl, tolerance, scrollableElement);
 };
 /**
  * IntersectionObserverで大まかに検出
@@ -217,7 +218,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	console.log('weakBacked watcher add scrollRemove', weakBacked, contentEl);
 	scrollRemove = (() => {
 		const checkBacked = () => {
-			backed = !checkTop();
+			backed = !checkTop(BACK_TO_TOP_TOLERANCE);
 			console.log('checkBacked', backed);
 		};
 
@@ -508,10 +509,10 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
-		queueSize.value === 0 && // キューに残っている場合はキューに追加する
-		!backed && // 先頭に表示されていない時はキューに追加する
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
-		active.value // keepAliveで隠されている間はキューに追加する
+		queueSize.value === 0 && // キューに残っている場合はキューに追加する
+		active.value && // keepAliveで隠されている間はキューに追加する
+		checkTop(TOP_STATIC_TOLERANCE) // 先頭に表示されていない時はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
 		unshiftItems([item]);
@@ -558,7 +559,7 @@ async function executeQueue() {
 		});
 
 		// 念の為backedを再チェック
-		weakBacked = !checkTop();
+		weakBacked = !checkTop(BACK_TO_TOP_TOLERANCE);
 
 		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
 		denyMoveTransition.value = true;

From f30275a975be874f6585b2f12b5785a4d9c3c4db Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 14 Jul 2023 13:11:59 +0000
Subject: [PATCH 025/102] fix?

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 89abf229d1..e86760d88c 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -165,8 +165,8 @@ const timerForSetPause = ref<number | null>(null);
 //#region scrolling
 const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
 const checkTop = (tolerance?: number) => {
-	if (!contentEl) return;
-	if (!document.body.contains(contentEl)) return;
+	if (!contentEl) return true;
+	if (!document.body.contains(contentEl)) return true;
 	return checkFn(contentEl, tolerance, scrollableElement);
 };
 /**

From 7fe882d0e29880cc96c50ab91db325f86fc984fe Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 07:38:42 +0000
Subject: [PATCH 026/102] wip

---
 .../frontend/src/components/MkPagination.vue  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index e86760d88c..f94392ef1a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -49,8 +49,7 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const BACK_TO_TOP_TOLERANCE = 256;
-const TOP_STATIC_TOLERANCE = 64;
+const TOLERANCE = 256;
 const APPEAR_MINIMUM_INTERVAL = 600;
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
@@ -110,7 +109,9 @@ let rootEl = $shallowRef<HTMLElement>();
  * スクロールが先頭にある場合はfalse
  * スクロールが先頭にない場合にtrue
  */
+// 先頭にいるか（prependでキューに追加するかどうかの判定に使う）
 let backed = $ref(false);
+// true→falseの変更でexecuteQueueする
 let weakBacked = $ref(false);
 
 let scrollRemove = $ref<(() => void) | null>(null);
@@ -184,7 +185,8 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		threshold: [0.01, 0.05, 0.1], // ターゲットの可視範囲は10%以上（0.01を含めないと検出されないことがある）
+		// 12%以上先頭にいる場合はweakBackedをtrueにしたい
+		threshold: [0, 0.02, 0.04, 0.06, 0.08, 0.10, 0.12],
 	});
 	console.log('new scrollObserver', scrollObserver);
 }, { immediate: true });
@@ -196,15 +198,17 @@ watch([$$(rootEl), $$(scrollObserver)], () => {
 });
 
 /**
- * onScrollTop/onScrollBottomで細かく検出する
+ * weakBackedがtrue→falseになったらexecuteQueue
  */
-watch($$(backed), () => {
-	console.log('backed changed', backed);
-	if (!backed) {
+watch($$(weakBacked), () => {
+	if (!weakBacked) {
 		executeQueue();
 	}
 });
 
+/**
+ * onScrollTop/onScrollBottomでbackedを厳密に検出する
+ */
 watch([$$(weakBacked), $$(contentEl)], () => {
 	if (scrollRemove) scrollRemove();
 	scrollRemove = null;
@@ -218,7 +222,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	console.log('weakBacked watcher add scrollRemove', weakBacked, contentEl);
 	scrollRemove = (() => {
 		const checkBacked = () => {
-			backed = !checkTop(BACK_TO_TOP_TOLERANCE);
+			backed = !checkTop(TOLERANCE);
 			console.log('checkBacked', backed);
 		};
 
@@ -512,7 +516,7 @@ const prepend = (item: MisskeyEntity): void => {
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value && // keepAliveで隠されている間はキューに追加する
-		checkTop(TOP_STATIC_TOLERANCE) // 先頭に表示されていない時はキューに追加する
+		!backed // 先頭に表示されていない時はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
 		unshiftItems([item]);
@@ -559,7 +563,7 @@ async function executeQueue() {
 		});
 
 		// 念の為backedを再チェック
-		weakBacked = !checkTop(BACK_TO_TOP_TOLERANCE);
+		weakBacked = !checkTop(TOLERANCE);
 
 		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
 		denyMoveTransition.value = true;

From e609b3b7dce45917d3dc1cc9015943645f1a9306 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 08:06:54 +0000
Subject: [PATCH 027/102] test

---
 packages/frontend/src/components/MkPagination.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index f94392ef1a..51e4ca6e06 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -184,9 +184,8 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].isIntersecting;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		// 12%以上先頭にいる場合はweakBackedをtrueにしたい
-		threshold: [0, 0.02, 0.04, 0.06, 0.08, 0.10, 0.12],
+		rootMargin: props.pagination.reversed ? '-110% 0px 110% 0px' : '110% 0px -110% 0px',
+		threshold: [0],
 	});
 	console.log('new scrollObserver', scrollObserver);
 }, { immediate: true });

From 4bef4953b89e448eaa5634a5c0d788d2356d2af0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 08:13:46 +0000
Subject: [PATCH 028/102] 15%

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 51e4ca6e06..1ea1e48c2c 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -184,7 +184,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].isIntersecting;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-110% 0px 110% 0px' : '110% 0px -110% 0px',
+		rootMargin: props.pagination.reversed ? '-115% 0px 115% 0px' : '115% 0px -115% 0px',
 		threshold: [0],
 	});
 	console.log('new scrollObserver', scrollObserver);

From e7251220d5624b9b210a0c4a0b3e33da96e5ccc6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 08:46:32 +0000
Subject: [PATCH 029/102] =?UTF-8?q?RouterView=E3=81=ABScrollPositiionManag?=
 =?UTF-8?q?er=E3=82=92=E5=9F=8B=E3=82=81=E8=BE=BC=E3=82=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/MkPageWindow.vue  |  7 +-
 .../src/components/global/RouterView.vue      | 46 +++++++++++--
 packages/frontend/src/nirax.ts                | 66 +++++++------------
 packages/frontend/src/ui/deck/main-column.vue |  6 +-
 packages/frontend/src/ui/universal.vue        |  5 +-
 5 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index 6e35ad4241..af9c95eeaf 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -18,7 +18,7 @@
 	</template>
 
 	<div ref="contents" :class="$style.root" style="container-type: inline-size;">
-		<RouterView :key="reloadCount" :router="router"/>
+		<RouterView :key="reloadCount" :router="router" :scrollContainer="contents"/>
 	</div>
 </MkWindow>
 </template>
@@ -32,12 +32,11 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { url } from '@/config';
 import { mainRouter, routes, page } from '@/router';
 import { $i } from '@/account';
-import { Router, useScrollPositionManager } from '@/nirax';
+import { Router } from '@/nirax';
 import { i18n } from '@/i18n';
 import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
 import { openingWindowsCount } from '@/os';
 import { claimAchievement } from '@/scripts/achievements';
-import { getScrollContainer } from '@/scripts/scroll';
 
 const props = defineProps<{
 	initialPath: string;
@@ -141,8 +140,6 @@ function popout() {
 	windowEl.close();
 }
 
-useScrollPositionManager(() => getScrollContainer(contents.value), router);
-
 onMounted(() => {
 	openingWindowsCount.value++;
 	if (openingWindowsCount.value >= 3) {
diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index 5763c84e81..76b1559a30 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -11,12 +11,18 @@
 </template>
 
 <script lang="ts" setup>
-import { inject, onBeforeUnmount, provide } from 'vue';
-import { Resolved, Router } from '@/nirax';
+import { computed, inject, onBeforeUnmount, provide, nextTick } from 'vue';
+import { NiraxChangeEvent, Resolved, Router } from '@/nirax';
 import { defaultStore } from '@/store';
+import { getScrollContainer } from '@/scripts/scroll';
 
 const props = defineProps<{
 	router?: Router;
+
+	/**
+	 * Set any element if scroll position management needed
+	 */
+	scrollContainer?: HTMLElement | null;
 }>();
 
 const router = props.router ?? inject('router');
@@ -45,17 +51,49 @@ let currentPageComponent = $shallowRef(current.route.component);
 let currentPageProps = $ref(current.props);
 let key = $ref(current.route.path + JSON.stringify(Object.fromEntries(current.props)));
 
-function onChange({ resolved, key: newKey }) {
-	const current = resolveNested(resolved);
+const scrollContainer = computed(() => props.scrollContainer ? (getScrollContainer(props.scrollContainer) ?? document.getElementsByTagName('html')[0]) : undefined);
+
+const scrollPosStore = new Map<string, number>();
+
+function onChange(ctx: NiraxChangeEvent) {
+	// save scroll position
+	if (scrollContainer.value) scrollPosStore.set(key, scrollContainer.value.scrollTop);
+
+	//#region change page
+	const current = resolveNested(ctx.resolved);
 	if (current == null) return;
 	currentPageComponent = current.route.component;
 	currentPageProps = current.props;
 	key = current.route.path + JSON.stringify(Object.fromEntries(current.props));
+	//#endregion
+
+	//#region scroll
+	nextTick(() => {
+		if (!scrollContainer.value) return;
+
+		const scrollPos = scrollPosStore.get(key) ?? 0;
+		scrollContainer.value.scroll({ top: scrollPos, behavior: 'instant' });
+		if (scrollPos !== 0) {
+			window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
+				if (!scrollContainer.value) return;
+				scrollContainer.value.scroll({ top: scrollPos, behavior: 'instant' });
+			}, 100);
+		}
+	});
+	//#endregion
 }
 
 router.addListener('change', onChange);
 
+function onSame() {
+	if (!scrollContainer.value) return;
+	scrollContainer.value.scroll({ top: 0, behavior: 'smooth' });
+}
+
+router.addListener('same', onSame);
+
 onBeforeUnmount(() => {
 	router.removeListener('change', onChange);
+	router.removeListener('same', onSame);
 });
 </script>
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 3a03444de2..5a92507bce 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -49,24 +49,30 @@ function parsePath(path: string): ParsedPath {
 	return res;
 }
 
+export type NiraxChangeEvent = {
+	beforePath: string;
+	path: string;
+	resolved: Resolved;
+	key: string;
+};
+
+export type NiraxExportEvent = {
+	path: string;
+	key: string;
+};
+
+export type NiraxPushEvent = {
+	beforePath: string;
+	path: string;
+	route: RouteDef | null;
+	props: Map<string, string> | null;
+	key: string;
+};
+
 export class Router extends EventEmitter<{
-	change: (ctx: {
-		beforePath: string;
-		path: string;
-		resolved: Resolved;
-		key: string;
-	}) => void;
-	replace: (ctx: {
-		path: string;
-		key: string;
-	}) => void;
-	push: (ctx: {
-		beforePath: string;
-		path: string;
-		route: RouteDef | null;
-		props: Map<string, string> | null;
-		key: string;
-	}) => void;
+	change: (ctx: NiraxChangeEvent) => void;
+	replace: (ctx: NiraxExportEvent) => void;
+	push: (ctx: NiraxExportEvent) => void;
 	same: () => void;
 }> {
 	private routes: RouteDef[];
@@ -271,29 +277,3 @@ export class Router extends EventEmitter<{
 		this.navigate(path, key);
 	}
 }
-
-export function useScrollPositionManager(getScrollContainer: () => HTMLElement, router: Router) {
-	const scrollPosStore = new Map<string, number>();
-
-	onMounted(() => {
-		const scrollContainer = getScrollContainer();
-
-		scrollContainer.addEventListener('scroll', () => {
-			scrollPosStore.set(router.getCurrentKey(), scrollContainer.scrollTop);
-		}, { passive: true });
-
-		router.addListener('change', ctx => {
-			const scrollPos = scrollPosStore.get(ctx.key) ?? 0;
-			scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
-			if (scrollPos !== 0) {
-				window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
-					scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
-				}, 100);
-			}
-		});
-
-		router.addListener('same', () => {
-			scrollContainer.scroll({ top: 0, behavior: 'smooth' });
-		});
-	});
-}
diff --git a/packages/frontend/src/ui/deck/main-column.vue b/packages/frontend/src/ui/deck/main-column.vue
index 0413307955..9d730171eb 100644
--- a/packages/frontend/src/ui/deck/main-column.vue
+++ b/packages/frontend/src/ui/deck/main-column.vue
@@ -8,7 +8,7 @@
 	</template>
 
 	<div ref="contents">
-		<RouterView @contextmenu.stop="onContextmenu"/>
+		<RouterView :scrollContainer="contents" @contextmenu.stop="onContextmenu"/>
 	</div>
 </XColumn>
 </template>
@@ -21,8 +21,6 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
-import { useScrollPositionManager } from '@/nirax';
-import { getScrollContainer } from '@/scripts/scroll';
 
 defineProps<{
 	column: Column;
@@ -66,6 +64,4 @@ function onContextmenu(ev: MouseEvent) {
 		},
 	}], ev);
 }
-
-useScrollPositionManager(() => getScrollContainer(contents.value), mainRouter);
 </script>
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index 9ae43c39d3..4f80e8cbbb 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -4,7 +4,7 @@
 
 	<MkStickyContainer ref="contents" :class="$style.contents" style="container-type: inline-size;" @contextmenu.stop="onContextmenu">
 		<template #header><XStatusBars :class="$style.statusbars"/></template>
-		<RouterView/>
+		<RouterView :scrollContainer="contents?.rootEl"/>
 		<div :class="$style.spacer"></div>
 	</MkStickyContainer>
 
@@ -95,7 +95,6 @@ import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import { miLocalStorage } from '@/local-storage';
 import { CURRENT_STICKY_BOTTOM } from '@/const';
-import { useScrollPositionManager } from '@/nirax';
 
 const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
 const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
@@ -214,8 +213,6 @@ watch($$(navFooter), () => {
 }, {
 	immediate: true,
 });
-
-useScrollPositionManager(() => contents.value.rootEl, mainRouter);
 </script>
 
 <style>

From 3bbeac4be2ec4108e6a78ad7483044aaaf25edfe Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 08:59:47 +0000
Subject: [PATCH 030/102] :v:

---
 packages/frontend/src/components/MkPagination.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 1ea1e48c2c..8d2fdd3d6c 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -180,6 +180,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 	if (scrollObserver) scrollObserver.disconnect();
 
 	scrollObserver = new IntersectionObserver(entries => {
+		if (!active.value) return; // activeでない時は触らない
 		console.log('scrollObserver', entries[0].isIntersecting);
 		weakBacked = entries[0].isIntersecting;
 	}, {
@@ -221,6 +222,7 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	console.log('weakBacked watcher add scrollRemove', weakBacked, contentEl);
 	scrollRemove = (() => {
 		const checkBacked = () => {
+			if (!active.value) return; // activeでない時は触らない
 			backed = !checkTop(TOLERANCE);
 			console.log('checkBacked', backed);
 		};
@@ -487,11 +489,15 @@ function visibilityChange() {
 }
 
 onActivated(() => {
+	console.log('activated');
 	active.value = true;
-	visibilityChange();
+	nextTick(() => {
+		visibilityChange();
+	});
 });
 
 onDeactivated(() => {
+	console.log('deactivated');
 	active.value = false;
 });
 

From b446bfb0b6b2f71cbac35c3f29d1dcf0284b101f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 09:11:31 +0000
Subject: [PATCH 031/102] a

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8d2fdd3d6c..25e1d36663 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -490,8 +490,8 @@ function visibilityChange() {
 
 onActivated(() => {
 	console.log('activated');
-	active.value = true;
 	nextTick(() => {
+		active.value = true;
 		visibilityChange();
 	});
 });

From bec510e37d01601568648b35977443c519b3c1a0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 09:19:42 +0000
Subject: [PATCH 032/102] 130%

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 25e1d36663..0eae6aacff 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -185,7 +185,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].isIntersecting;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-115% 0px 115% 0px' : '115% 0px -115% 0px',
+		rootMargin: props.pagination.reversed ? '-130% 0px 130% 0px' : '130% 0px -130% 0px',
 		threshold: [0],
 	});
 	console.log('new scrollObserver', scrollObserver);

From f565e0f8a53221a1066d7b664cdc0a749917bac8 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 09:29:52 +0000
Subject: [PATCH 033/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 0eae6aacff..89f358c8ca 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -49,7 +49,8 @@ import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
-const TOLERANCE = 256;
+const TOLERANCE = 6;
+const WEAK_TOLERAMCE = 256;
 const APPEAR_MINIMUM_INTERVAL = 600;
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
@@ -181,20 +182,17 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 
 	scrollObserver = new IntersectionObserver(entries => {
 		if (!active.value) return; // activeでない時は触らない
-		console.log('scrollObserver', entries[0].isIntersecting);
 		weakBacked = entries[0].isIntersecting;
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-130% 0px 130% 0px' : '130% 0px -130% 0px',
 		threshold: [0],
 	});
-	console.log('new scrollObserver', scrollObserver);
 }, { immediate: true });
 
 watch([$$(rootEl), $$(scrollObserver)], () => {
 	scrollObserver?.disconnect();
 	if (rootEl) scrollObserver?.observe(rootEl);
-	console.log('scrollObserver observe', rootEl);
 });
 
 /**
@@ -214,17 +212,14 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	scrollRemove = null;
 
 	if (weakBacked || !contentEl) {
-		console.log('weakBacked watcher remove scrollRemove', weakBacked, contentEl);
 		if (weakBacked) backed = true;
 		return;
 	}
 
-	console.log('weakBacked watcher add scrollRemove', weakBacked, contentEl);
 	scrollRemove = (() => {
 		const checkBacked = () => {
 			if (!active.value) return; // activeでない時は触らない
 			backed = !checkTop(TOLERANCE);
-			console.log('checkBacked', backed);
 		};
 
 		// とりあえず評価してみる
@@ -247,7 +242,6 @@ function preventDefault(ev: Event) {
  * @param fn DOM操作(unshiftItemsなどで)
  */
 function adjustScroll(fn: () => void): Promise<void> {
-	console.log('adjustScroll');
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
 	// スクロールをやめさせる
@@ -289,7 +283,6 @@ function adjustScroll(fn: () => void): Promise<void> {
  * 注意: moreFetchingをtrueにするのでfalseにする必要がある
  */
 async function init(): Promise<void> {
-	console.log('init');
 	items.value = new Map();
 	queue.value = new Map();
 	fetching.value = true;
@@ -327,7 +320,6 @@ async function init(): Promise<void> {
  * reloadでinitが呼ばれた時はreload内でinitの後に呼ばれる
  */
 function scrollAfterInit() {
-	console.log('scrollAfterInit');
 	if (props.pagination.reversed) {
 		nextTick(() => {
 			setTimeout(async () => {
@@ -479,7 +471,6 @@ function visibilityChange() {
 			clearTimeout(timerForSetPause.value);
 			timerForSetPause.value = null;
 		} else {
-			console.log('visibilityChange: executeQueue', 'backed', backed, 'active', active.value);
 			isPausingUpdate.value = false;
 			if (!backed && active.value) {
 				executeQueue();
@@ -489,7 +480,6 @@ function visibilityChange() {
 }
 
 onActivated(() => {
-	console.log('activated');
 	nextTick(() => {
 		active.value = true;
 		visibilityChange();
@@ -497,7 +487,6 @@ onActivated(() => {
 });
 
 onDeactivated(() => {
-	console.log('deactivated');
 	active.value = false;
 });
 
@@ -509,8 +498,6 @@ watch(visibility, visibilityChange);
  * @param item アイテム
  */
 const prepend = (item: MisskeyEntity): void => {
-	console.log('prepend', item, 'queueSize', queueSize.value, 'backed', backed, 'isPausingUpdate', isPausingUpdate, 'active', active.value);
-
 	if (items.value.size === 0) {
 		items.value.set(item.id, item);
 		fetching.value = false;
@@ -554,7 +541,6 @@ function concatItems(oldItems: MisskeyEntity[]) {
 }
 
 async function executeQueue() {
-	console.log('executeQueue');
 	if (queue.value.size === 0) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
@@ -568,7 +554,7 @@ async function executeQueue() {
 		});
 
 		// 念の為backedを再チェック
-		weakBacked = !checkTop(TOLERANCE);
+		weakBacked = !checkTop(WEAK_TOLERAMCE);
 
 		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
 		denyMoveTransition.value = true;

From 78944bf441f94bf3299ce0d91c154d8346d0d335 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 09:50:34 +0000
Subject: [PATCH 034/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 89f358c8ca..924db25d0b 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -233,43 +233,23 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	})();
 });
 
-function preventDefault(ev: Event) {
-	ev.preventDefault();
-}
-
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
  * @param fn DOM操作(unshiftItemsなどで)
  */
 function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
-	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
-	// スクロールをやめさせる
-	try {
-		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
-		scrollableElementOrHtml.addEventListener('mousewheel', preventDefault, { passive: false });
-		scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
-		// ついでにtryに入れてみる
-		scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
-	} catch (err) {
-		console.error(err, { scrollableElementOrHtml });
-	}
 
 	denyMoveTransition.value = true;
 
 	fn();
 
 	return nextTick(() => {
-		try {
-			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
-			scroll(scrollableElement, { top, behavior: 'instant' });
+		const diff = (scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight;
+		const newScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
+		const top = newScroll + diff;
+		scroll(scrollableElement, { top, behavior: 'instant' });
 
-			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
-			scrollableElementOrHtml.removeEventListener('mousewheel', preventDefault);
-			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
-		} catch (err) {
-			console.error(err, { scrollableElementOrHtml });
-		}
 		denyMoveTransition.value = false;
 		return nextTick();
 	});

From 5a5ef7564a35ec1078ba2ac4661cb12ae5e9996a Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 09:58:31 +0000
Subject: [PATCH 035/102] ????

---
 packages/frontend/src/components/MkPagination.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 924db25d0b..e10d63e16f 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -239,15 +239,14 @@ watch([$$(weakBacked), $$(contentEl)], () => {
  */
 function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
+	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
 
 	denyMoveTransition.value = true;
 
 	fn();
 
 	return nextTick(() => {
-		const diff = (scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight;
-		const newScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
-		const top = newScroll + diff;
+		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 		scroll(scrollableElement, { top, behavior: 'instant' });
 
 		denyMoveTransition.value = false;

From 41824ae3831737cac13285c8f357b15ec90da9ff Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 10:16:19 +0000
Subject: [PATCH 036/102] revert...

---
 .../frontend/src/components/MkPagination.vue  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index e10d63e16f..5d3a938c0a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -233,6 +233,10 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	})();
 });
 
+function preventDefault(ev: Event) {
+	ev.preventDefault();
+}
+
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
  * @param fn DOM操作(unshiftItemsなどで)
@@ -240,15 +244,32 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 function adjustScroll(fn: () => void): Promise<void> {
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
+	// スクロールをやめさせる
+	try {
+		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+		scrollableElementOrHtml.addEventListener('wheel', preventDefault, { passive: false });
+		scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
+		// ついでにtryに入れてみる
+		scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
+	} catch (err) {
+		console.error(err, { scrollableElementOrHtml });
+	}
 
 	denyMoveTransition.value = true;
 
 	fn();
 
 	return nextTick(() => {
-		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
-		scroll(scrollableElement, { top, behavior: 'instant' });
+		try {
+			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
+			scroll(scrollableElement, { top, behavior: 'instant' });
 
+			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+			scrollableElementOrHtml.removeEventListener('wheel', preventDefault);
+			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
+		} catch (err) {
+			console.error(err, { scrollableElementOrHtml });
+		}
 		denyMoveTransition.value = false;
 		return nextTick();
 	});

From 31b62db14b8d50f6b9a12f99562b3ab61bbe1545 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 10:24:18 +0000
Subject: [PATCH 037/102] =?UTF-8?q?backed=E3=81=8Ctrue=E2=86=92false?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=82=82executeQueue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPagination.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 5d3a938c0a..0bb7b69925 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -204,6 +204,15 @@ watch($$(weakBacked), () => {
 	}
 });
 
+/**
+ * backedがtrue→falseになってもexecuteQueue
+ */
+watch($$(backed), () => {
+	if (!backed) {
+		executeQueue();
+	}
+});
+
 /**
  * onScrollTop/onScrollBottomでbackedを厳密に検出する
  */

From 02054528f9dc1c14ed86253ab15b27fed543f2b2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 10:26:42 +0000
Subject: [PATCH 038/102] isPausingUpdate check

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 0bb7b69925..74af1be96b 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -551,6 +551,7 @@ function concatItems(oldItems: MisskeyEntity[]) {
 
 async function executeQueue() {
 	if (queue.value.size === 0) return;
+	if (isPausingUpdate.value) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdate.value = true;

From 0f64372abb9471e66cd32a0f5f76ae09a73b43e1 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 10:40:55 +0000
Subject: [PATCH 039/102] =?UTF-8?q?prepend()=E3=81=A7=E3=82=AD=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=81=8C5=E3=81=A4=E4=BB=A5=E4=B8=8B=E3=81=AE?=
 =?UTF-8?q?=E6=99=82=E3=81=AFexecuteQueue=E3=82=92=E5=91=BC=E3=82=93?=
 =?UTF-8?q?=E3=81=A7=E3=81=97=E3=81=BE=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPagination.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 74af1be96b..5ab5d6310a 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -515,12 +515,18 @@ const prepend = (item: MisskeyEntity): void => {
 
 	if (
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
-		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value && // keepAliveで隠されている間はキューに追加する
 		!backed // 先頭に表示されていない時はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-		unshiftItems([item]);
+		if (queueSize.value === 0) return unshiftItems([item]);
+		if (queueSize.value <= 5) {
+			// キューが5つ以下の時はexecuteQueueを呼んでしまう
+			prependQueue(item);
+			executeQueue();
+			return;
+		}
+		prependQueue(item);
 	} else {
 		prependQueue(item);
 	}

From 393160eedab686e559140b68172ade22ee390bc0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 10:42:05 +0000
Subject: [PATCH 040/102] :v:

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 5ab5d6310a..bc7b2f9360 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -526,6 +526,7 @@ const prepend = (item: MisskeyEntity): void => {
 			executeQueue();
 			return;
 		}
+		// キューが5つより多い時はキューに追加するだけ
 		prependQueue(item);
 	} else {
 		prependQueue(item);

From 568822944f05d1c99b9c2addcdc6fc5e0010ea77 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 11:40:22 +0000
Subject: [PATCH 041/102] comment

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index bc7b2f9360..a2e062bef8 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -248,6 +248,7 @@ function preventDefault(ev: Event) {
 
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
+ * ChromeやFirefoxはこれをいい感じにやってくれるが、Safariはやってくれないため自分で実装する必要がある
  * @param fn DOM操作(unshiftItemsなどで)
  */
 function adjustScroll(fn: () => void): Promise<void> {

From da4aba3247d50603da41a2737590559a2ed8b7cf Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 11:47:08 +0000
Subject: [PATCH 042/102] 10%?

---
 packages/frontend/src/components/MkPagination.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index a2e062bef8..5febf1b8f6 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -182,11 +182,11 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 
 	scrollObserver = new IntersectionObserver(entries => {
 		if (!active.value) return; // activeでない時は触らない
-		weakBacked = entries[0].isIntersecting;
+		weakBacked = entries[0].intersectionRatio > 0.1;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-130% 0px 130% 0px' : '130% 0px -130% 0px',
-		threshold: [0],
+		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
+		threshold: [0, 0.01, 0.02, 0.04, 0.08, 0.1, 0.12],
 	});
 }, { immediate: true });
 

From fc915268574b1f6507e504d2fb5d51f75d92bd94 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 14:05:06 +0000
Subject: [PATCH 043/102] ?

---
 packages/frontend/src/components/MkPagination.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 5febf1b8f6..8c48b4806d 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -199,6 +199,7 @@ watch([$$(rootEl), $$(scrollObserver)], () => {
  * weakBackedがtrue→falseになったらexecuteQueue
  */
 watch($$(weakBacked), () => {
+	console.log('weakBacked', weakBacked);
 	if (!weakBacked) {
 		executeQueue();
 	}
@@ -516,19 +517,12 @@ const prepend = (item: MisskeyEntity): void => {
 
 	if (
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
+		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value && // keepAliveで隠されている間はキューに追加する
 		!backed // 先頭に表示されていない時はキューに追加する
 	) {
 		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-		if (queueSize.value === 0) return unshiftItems([item]);
-		if (queueSize.value <= 5) {
-			// キューが5つ以下の時はexecuteQueueを呼んでしまう
-			prependQueue(item);
-			executeQueue();
-			return;
-		}
-		// キューが5つより多い時はキューに追加するだけ
-		prependQueue(item);
+		unshiftItems([item]);
 	} else {
 		prependQueue(item);
 	}

From 4881237955ffd4b2e93336507fc57b1102bc74d5 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 14:13:50 +0000
Subject: [PATCH 044/102] ?

---
 packages/frontend/src/components/MkPagination.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8c48b4806d..f1a1fdbbe2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -565,9 +565,6 @@ async function executeQueue() {
 			);
 		});
 
-		// 念の為backedを再チェック
-		weakBacked = !checkTop(WEAK_TOLERAMCE);
-
 		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
 		denyMoveTransition.value = true;
 		items.value = new Map([...items.value].slice(0, displayLimit.value));

From d82d03890d5974f335b69a45fdd0b85436897317 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 14:27:13 +0000
Subject: [PATCH 045/102] korede douda

---
 .../frontend/src/components/MkPagination.vue    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index f1a1fdbbe2..a9d7b646db 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -518,11 +518,20 @@ const prepend = (item: MisskeyEntity): void => {
 	if (
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
-		active.value && // keepAliveで隠されている間はキューに追加する
-		!backed // 先頭に表示されていない時はキューに追加する
+		active.value // keepAliveで隠されている間はキューに追加する
 	) {
-		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-		unshiftItems([item]);
+		if (!backed) {
+			// 先頭にいる場合は単に追加する
+			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
+			unshiftItems([item]);
+		} else if (!weakBacked) {
+			// ちょっと先頭にいる場合はスクロールを調整する
+			prependQueue(item);
+			executeQueue();
+		} else {
+			// 先頭にいない場合はキューに追加する
+			prependQueue(item);
+		}
 	} else {
 		prependQueue(item);
 	}

From d335da5ee4ebe76c2280032fefa72010a87592c0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 14:34:57 +0000
Subject: [PATCH 046/102] 1000%

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index a9d7b646db..17b3309aaf 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -185,7 +185,7 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].intersectionRatio > 0.1;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
+		rootMargin: props.pagination.reversed ? '-1000% 0px 100% 0px' : '100% 0px -1000% 0px',
 		threshold: [0, 0.01, 0.02, 0.04, 0.08, 0.1, 0.12],
 	});
 }, { immediate: true });

From 6152122d43681713c26fdb2501e8bc00b95c6f16 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 14:57:00 +0000
Subject: [PATCH 047/102] 0.02?

---
 .../frontend/src/components/MkPagination.vue  | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 17b3309aaf..18016ada3e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -182,10 +182,10 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 
 	scrollObserver = new IntersectionObserver(entries => {
 		if (!active.value) return; // activeでない時は触らない
-		weakBacked = entries[0].intersectionRatio > 0.1;
+		weakBacked = entries[0].intersectionRatio > 0.02;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-1000% 0px 100% 0px' : '100% 0px -1000% 0px',
+		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
 		threshold: [0, 0.01, 0.02, 0.04, 0.08, 0.1, 0.12],
 	});
 }, { immediate: true });
@@ -518,20 +518,11 @@ const prepend = (item: MisskeyEntity): void => {
 	if (
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
-		active.value // keepAliveで隠されている間はキューに追加する
+		active.value && // keepAliveで隠されている間はキューに追加する
+		!backed // 先頭に表示されていない時はキューに追加する
 	) {
-		if (!backed) {
-			// 先頭にいる場合は単に追加する
-			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-			unshiftItems([item]);
-		} else if (!weakBacked) {
-			// ちょっと先頭にいる場合はスクロールを調整する
-			prependQueue(item);
-			executeQueue();
-		} else {
-			// 先頭にいない場合はキューに追加する
-			prependQueue(item);
-		}
+		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
+		unshiftItems([item]);
 	} else {
 		prependQueue(item);
 	}

From b5f85aa9a89086a195e1073f568cfd98b6d0d7f3 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 15:04:48 +0000
Subject: [PATCH 048/102] ?

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 18016ada3e..068bf478ba 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -182,11 +182,11 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 
 	scrollObserver = new IntersectionObserver(entries => {
 		if (!active.value) return; // activeでない時は触らない
-		weakBacked = entries[0].intersectionRatio > 0.02;
+		weakBacked = entries[0].intersectionRatio >= 0.1;
 	}, {
 		root: scrollableElement,
 		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		threshold: [0, 0.01, 0.02, 0.04, 0.08, 0.1, 0.12],
+		threshold: [0, 0.5, 0.1, 0.15, 0.2],
 	});
 }, { immediate: true });
 

From b60dba701c3a1d6f1990d15031bc9e04f807c712 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 15:16:50 +0000
Subject: [PATCH 049/102] :v:

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 068bf478ba..ef121536b2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -185,8 +185,8 @@ watch([() => props.pagination.reversed, $$(scrollableElement)], () => {
 		weakBacked = entries[0].intersectionRatio >= 0.1;
 	}, {
 		root: scrollableElement,
-		rootMargin: props.pagination.reversed ? '-100% 0px 100% 0px' : '100% 0px -100% 0px',
-		threshold: [0, 0.5, 0.1, 0.15, 0.2],
+		rootMargin: props.pagination.reversed ? '-100% 0px 1000% 0px' : '1000% 0px -100% 0px',
+		threshold: [0.01, 0.05, 0.1, 0.12, 0.15],
 	});
 }, { immediate: true });
 

From f7425f5fe98d16895012dc27c5ae99b6b648e115 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 15:28:29 +0000
Subject: [PATCH 050/102] korede douda 2

---
 .../frontend/src/components/MkPagination.vue    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index ef121536b2..d9038665ba 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -518,11 +518,20 @@ const prepend = (item: MisskeyEntity): void => {
 	if (
 		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
-		active.value && // keepAliveで隠されている間はキューに追加する
-		!backed // 先頭に表示されていない時はキューに追加する
+		active.value // keepAliveで隠されている間はキューに追加する
 	) {
-		if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-		unshiftItems([item]);
+		if (!backed) {
+			// 先頭にいる場合は単に追加する
+			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
+			unshiftItems([item]);
+		} else if (!weakBacked) {
+			// ちょっと先頭にいる場合はスクロールを調整する
+			prependQueue(item);
+			executeQueue();
+		} else {
+			// 先頭にいない場合はキューに追加する
+			prependQueue(item);
+		}
 	} else {
 		prependQueue(item);
 	}

From d73ea541bf353a0362ba80352a2ea7f4118f08d2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 16:17:30 +0000
Subject: [PATCH 051/102] add a comment

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index d9038665ba..4a5fa679d0 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -272,6 +272,7 @@ function adjustScroll(fn: () => void): Promise<void> {
 
 	return nextTick(() => {
 		try {
+			// scrollByで移動すればいいように思うがうまくいかない、なぜ？？
 			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
 			scroll(scrollableElement, { top, behavior: 'instant' });
 

From 3f6f6a49b6d1c46112b10be5df3dbefb967f4512 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 17 Jul 2023 16:24:49 +0000
Subject: [PATCH 052/102] remove console.log

---
 packages/frontend/src/components/MkPagination.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 4a5fa679d0..f2defe25e2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -199,7 +199,6 @@ watch([$$(rootEl), $$(scrollObserver)], () => {
  * weakBackedがtrue→falseになったらexecuteQueue
  */
 watch($$(weakBacked), () => {
-	console.log('weakBacked', weakBacked);
 	if (!weakBacked) {
 		executeQueue();
 	}

From 106237129651c6acd3da62a9b78318a26aaba48a Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 01:29:33 +0000
Subject: [PATCH 053/102] fix lint

---
 packages/frontend/src/pages/timeline.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index f045d53a69..b5d1f5ba54 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -48,8 +48,6 @@ const rootEl = $shallowRef<HTMLElement>();
 let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global');
 const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) });
 
-watch ($$(src), () => queue = 0);
-
 function top(): void {
 	tlComponent?.reload();
 }

From cb63a1ed0051b80348d1a2fc97fc25ab3952e50a Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:24:53 +0000
Subject: [PATCH 054/102] test

---
 .../src/components/MkDateSeparatedList.vue         | 14 ++++++++------
 packages/frontend/src/components/MkNotes.vue       |  6 ++----
 .../frontend/src/components/MkNotifications.vue    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 6942a0e6c3..479f7d3ca8 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -33,6 +33,11 @@ export default defineComponent({
 			required: false,
 			default: false,
 		},
+		denyMoveTransition: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
 	},
 
 	setup(props, { slots, expose }) {
@@ -130,6 +135,7 @@ export default defineComponent({
 					[$style['reversed']]: props.reversed,
 					[$style['direction-down']]: props.direction === 'down',
 					[$style['direction-up']]: props.direction === 'up',
+					'deny-move-transition': props.denyMoveTransition,
 				},
 				...(defaultStore.state.animation ? {
 					name: 'list',
@@ -148,15 +154,11 @@ export default defineComponent({
 	container-type: inline-size;
 
 	&:global {
-	> .list-move {
+	&:not(.deny-move-transition) > .list-move {
 		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1);
 	}
 
-	&.deny-move-transition > .list-move {
-		transition: none !important;
-	}
-
-	> .list-enter-active {
+	&:not(.deny-move-transition) > .list-enter-active {
 		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
 	}
 
diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index 140e44752f..f00b709155 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -17,10 +17,8 @@
 				:reversed="pagination.reversed"
 				:noGap="noGap"
 				:ad="true"
-				:class="{
-					[$style.notes]: true,
-					'deny-move-transition': denyMoveTransition,
-				}"
+				:denyMoveTransition="denyMoveTransition"
+				:class="$style.notes"
 			>
 				<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
 			</MkDateSeparatedList>
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index 5fd42fc1e9..63a17cf61e 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -8,7 +8,7 @@
 	</template>
 
 	<template #default="{ items: notifications, denyMoveTransition }">
-		<MkDateSeparatedList v-slot="{ item: notification }" :class="{ [$style.list]: true, 'deny-move-transition': denyMoveTransition }" :items="notifications" :noGap="true">
+		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true" :denyMoveTransition="denyMoveTransition">
 			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="`showNotificationAsNote:${notification.id}`" :note="notification.note"/>
 			<XNotification v-else :key="notification.id" :notification="notification" :withTime="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>

From 0079f3394bdb4093e7e58426dcc3505abe8e653d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:33:38 +0000
Subject: [PATCH 055/102] nextTick?

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index f2defe25e2..6d7786a9d3 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -251,7 +251,11 @@ function preventDefault(ev: Event) {
  * ChromeやFirefoxはこれをいい感じにやってくれるが、Safariはやってくれないため自分で実装する必要がある
  * @param fn DOM操作(unshiftItemsなどで)
  */
-function adjustScroll(fn: () => void): Promise<void> {
+async function adjustScroll(fn: () => void): Promise<void> {
+	denyMoveTransition.value = true;
+
+	await nextTick();
+
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
 	// スクロールをやめさせる
@@ -265,11 +269,9 @@ function adjustScroll(fn: () => void): Promise<void> {
 		console.error(err, { scrollableElementOrHtml });
 	}
 
-	denyMoveTransition.value = true;
-
 	fn();
 
-	return nextTick(() => {
+	return await nextTick(() => {
 		try {
 			// scrollByで移動すればいいように思うがうまくいかない、なぜ？？
 			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);

From 76145701afeccb6d68e73be0c5462626f33e123f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:38:14 +0000
Subject: [PATCH 056/102] clean up

---
 packages/frontend/src/components/MkPagination.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 6d7786a9d3..c865f2640e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -50,7 +50,6 @@ import { i18n } from '@/i18n';
 
 const SECOND_FETCH_LIMIT = 30;
 const TOLERANCE = 6;
-const WEAK_TOLERAMCE = 256;
 const APPEAR_MINIMUM_INTERVAL = 600;
 const BACKGROUND_PAUSE_WAIT_SEC = 10;
 

From b2c1f5873d04de82029a037e2c03ea3d46f280df Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:39:10 +0000
Subject: [PATCH 057/102] watch??

---
 packages/frontend/src/components/MkDateSeparatedList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 479f7d3ca8..faccd96861 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, h, PropType, TransitionGroup, useCssModule } from 'vue';
+import { defineComponent, h, PropType, TransitionGroup, useCssModule, watch } from 'vue';
 import MkAd from '@/components/global/MkAd.vue';
 import { isDebuggerEnabled, stackTraceInstances } from '@/debug';
 import { i18n } from '@/i18n';
@@ -41,6 +41,8 @@ export default defineComponent({
 	},
 
 	setup(props, { slots, expose }) {
+		watch(() => props.denyMoveTransition, () => console.log('denyMoveTransition changed', props.denyMoveTransition));
+
 		const $style = useCssModule(); // カスタムレンダラなので使っても大丈夫
 		function getDateText(time: string) {
 			const date = new Date(time).getDate();

From 3677a91c4a95588a41cc639391a0381e8af2ecfc Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:49:06 +0000
Subject: [PATCH 058/102] log2

---
 packages/frontend/src/components/MkDateSeparatedList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index faccd96861..0cd7993dfe 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -42,6 +42,7 @@ export default defineComponent({
 
 	setup(props, { slots, expose }) {
 		watch(() => props.denyMoveTransition, () => console.log('denyMoveTransition changed', props.denyMoveTransition));
+		watch(() => props.items, () => console.log('items changed', props.items));
 
 		const $style = useCssModule(); // カスタムレンダラなので使っても大丈夫
 		function getDateText(time: string) {

From 81238fabd2156f02c5b5e78af9d30e17ceac2c1f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 03:55:44 +0000
Subject: [PATCH 059/102] flag test

---
 packages/frontend/src/components/MkPagination.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index c865f2640e..80396900ce 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -147,7 +147,7 @@ const preventAppearFetchMore = ref(false);
 const preventAppearFetchMoreTimer = ref<number | null>(null);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
-const denyMoveTransition = ref(false);
+const denyMoveTransition = ref(true);
 const {
 	enableInfiniteScroll,
 } = defaultStore.reactiveState;
@@ -282,7 +282,7 @@ async function adjustScroll(fn: () => void): Promise<void> {
 		} catch (err) {
 			console.error(err, { scrollableElementOrHtml });
 		}
-		denyMoveTransition.value = false;
+		//denyMoveTransition.value = false;
 		return nextTick();
 	});
 }
@@ -581,7 +581,7 @@ async function executeQueue() {
 		await nextTick();
 	} finally {
 		isPausingUpdate.value = false;
-		denyMoveTransition.value = false;
+		//denyMoveTransition.value = false;
 	}
 }
 

From dd02648f8d2e1e3f59dc36bef72e756cf69bc529 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 04:03:16 +0000
Subject: [PATCH 060/102] Revert "flag test"

This reverts commit 81238fabd2156f02c5b5e78af9d30e17ceac2c1f.
---
 packages/frontend/src/components/MkPagination.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 80396900ce..c865f2640e 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -147,7 +147,7 @@ const preventAppearFetchMore = ref(false);
 const preventAppearFetchMoreTimer = ref<number | null>(null);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
-const denyMoveTransition = ref(true);
+const denyMoveTransition = ref(false);
 const {
 	enableInfiniteScroll,
 } = defaultStore.reactiveState;
@@ -282,7 +282,7 @@ async function adjustScroll(fn: () => void): Promise<void> {
 		} catch (err) {
 			console.error(err, { scrollableElementOrHtml });
 		}
-		//denyMoveTransition.value = false;
+		denyMoveTransition.value = false;
 		return nextTick();
 	});
 }
@@ -581,7 +581,7 @@ async function executeQueue() {
 		await nextTick();
 	} finally {
 		isPausingUpdate.value = false;
-		//denyMoveTransition.value = false;
+		denyMoveTransition.value = false;
 	}
 }
 

From 054ea30955308cc8e968b9ac563932143a76e985 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 04:27:20 +0000
Subject: [PATCH 061/102] no adjusting scroll

---
 packages/frontend/src/components/MkNotes.vue  |  3 +-
 .../src/components/MkNotifications.vue        |  4 +-
 .../frontend/src/components/MkPagination.vue  | 65 ++-----------------
 3 files changed, 9 insertions(+), 63 deletions(-)

diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index f00b709155..b49c8fa8b7 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -7,7 +7,7 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notes, denyMoveTransition }">
+	<template #default="{ items: notes }">
 		<div :class="[$style.root, { [$style.noGap]: noGap }]">
 			<MkDateSeparatedList
 				ref="notes"
@@ -17,7 +17,6 @@
 				:reversed="pagination.reversed"
 				:noGap="noGap"
 				:ad="true"
-				:denyMoveTransition="denyMoveTransition"
 				:class="$style.notes"
 			>
 				<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index 63a17cf61e..9b1aa6230e 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -7,8 +7,8 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notifications, denyMoveTransition }">
-		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true" :denyMoveTransition="denyMoveTransition">
+	<template #default="{ items: notifications }">
+		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true">
 			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="`showNotificationAsNote:${notification.id}`" :note="notification.note"/>
 			<XNotification v-else :key="notification.id" :notification="notification" :withTime="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index c865f2640e..8adcccc820 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -26,7 +26,7 @@
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
-		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
+		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching"></slot>
 		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
 			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
@@ -147,7 +147,6 @@ const preventAppearFetchMore = ref(false);
 const preventAppearFetchMoreTimer = ref<number | null>(null);
 const empty = computed(() => items.value.size === 0);
 const error = ref(false);
-const denyMoveTransition = ref(false);
 const {
 	enableInfiniteScroll,
 } = defaultStore.reactiveState;
@@ -241,53 +240,6 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	})();
 });
 
-function preventDefault(ev: Event) {
-	ev.preventDefault();
-}
-
-/**
- * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
- * ChromeやFirefoxはこれをいい感じにやってくれるが、Safariはやってくれないため自分で実装する必要がある
- * @param fn DOM操作(unshiftItemsなどで)
- */
-async function adjustScroll(fn: () => void): Promise<void> {
-	denyMoveTransition.value = true;
-
-	await nextTick();
-
-	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
-	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
-	// スクロールをやめさせる
-	try {
-		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
-		scrollableElementOrHtml.addEventListener('wheel', preventDefault, { passive: false });
-		scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
-		// ついでにtryに入れてみる
-		scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
-	} catch (err) {
-		console.error(err, { scrollableElementOrHtml });
-	}
-
-	fn();
-
-	return await nextTick(() => {
-		try {
-			// scrollByで移動すればいいように思うがうまくいかない、なぜ？？
-			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
-			scroll(scrollableElement, { top, behavior: 'instant' });
-
-			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
-			scrollableElementOrHtml.removeEventListener('wheel', preventDefault);
-			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
-		} catch (err) {
-			console.error(err, { scrollableElementOrHtml });
-		}
-		denyMoveTransition.value = false;
-		return nextTick();
-	});
-}
-//#endregion
-
 /**
  * 初期化
  * scrollAfterInitなどの後処理もあるので、reload関数を使うべき
@@ -388,7 +340,7 @@ const fetchMore = async (): Promise<void> => {
 			if (i === 10) item._shouldInsertAd_ = true;
 		}
 
-		const reverseConcat = (_res) => adjustScroll(() => concatMapWithArray(items.value, _res));
+		const reverseConcat = (_res) => concatMapWithArray(items.value, _res);
 
 		if (res.length === 0) {
 			if (props.pagination.reversed) {
@@ -568,20 +520,15 @@ async function executeQueue() {
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdate.value = true;
 	try {
-		await adjustScroll(() => {
-			unshiftItems(
-				queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-				Infinity,
-			);
-		});
+		unshiftItems(
+			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
+			Infinity,
+		);
 
-		// adjustScrollが終わり次第タイムラインの下側を切り捨てる
-		denyMoveTransition.value = true;
 		items.value = new Map([...items.value].slice(0, displayLimit.value));
 		await nextTick();
 	} finally {
 		isPausingUpdate.value = false;
-		denyMoveTransition.value = false;
 	}
 }
 

From fd44a29f2b013f70be4f365d31315a20a89d3715 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 04:39:56 +0000
Subject: [PATCH 062/102] scroll...

---
 packages/frontend/src/components/MkPagination.vue |  6 +++++-
 packages/frontend/src/scripts/scroll.ts           | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8adcccc820..191fc449ff 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getBodyScrollHeight, getScrollContainer, scrollToBottom, scrollToTop, scroll } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop, scrollBy } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -428,6 +428,10 @@ function visibilityChange() {
 		timerForSetPause.value = window.setTimeout(() => {
 			isPausingUpdate.value = true;
 			timerForSetPause.value = null;
+			if (!backed) {
+				scrollBy(scrollableElement, { top: 16, behavior: 'instant' });
+				backed = true;
+			}
 		},
 		BACKGROUND_PAUSE_WAIT_SEC * 1000);
 	} else { // 'visible'
diff --git a/packages/frontend/src/scripts/scroll.ts b/packages/frontend/src/scripts/scroll.ts
index 94f5757b35..f34f5aff52 100644
--- a/packages/frontend/src/scripts/scroll.ts
+++ b/packages/frontend/src/scripts/scroll.ts
@@ -83,6 +83,19 @@ export function scroll(el: HTMLElement | null, options: ScrollToOptions | undefi
 	}
 }
 
+/**
+ * コンテナを指定してscrollByする
+ * @param el Container element
+ * @param options ScrollToOptions
+ */
+export function scrollBy(el: HTMLElement | null, options: ScrollToOptions | undefined) {
+	if (el == null) {
+		window.scrollBy(options);
+	} else {
+		el.scrollBy(options);
+	}
+}
+
 /**
  * Scroll to Top
  * @param el Scroll container element

From 7895474263b50b6461544b259acfa7c8b5351c0f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 04:44:52 +0000
Subject: [PATCH 063/102] remove console.log

---
 packages/frontend/src/components/MkDateSeparatedList.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 0cd7993dfe..dcae891ac3 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -41,9 +41,6 @@ export default defineComponent({
 	},
 
 	setup(props, { slots, expose }) {
-		watch(() => props.denyMoveTransition, () => console.log('denyMoveTransition changed', props.denyMoveTransition));
-		watch(() => props.items, () => console.log('items changed', props.items));
-
 		const $style = useCssModule(); // カスタムレンダラなので使っても大丈夫
 		function getDateText(time: string) {
 			const date = new Date(time).getDate();

From 1ccac0c1e3c48175f34dd8ba326d5e4b639b76da Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 04:48:22 +0000
Subject: [PATCH 064/102] 32?

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 191fc449ff..98e06c02d8 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -429,7 +429,7 @@ function visibilityChange() {
 			isPausingUpdate.value = true;
 			timerForSetPause.value = null;
 			if (!backed) {
-				scrollBy(scrollableElement, { top: 16, behavior: 'instant' });
+				scrollBy(scrollableElement, { top: 32, behavior: 'instant' });
 				backed = true;
 			}
 		},

From 954d934505b6154362420a8687b93c6a95ad1229 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 05:22:45 +0000
Subject: [PATCH 065/102] =?UTF-8?q?isPausingUpdate=E3=82=92=E7=9C=81?=
 =?UTF-8?q?=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 98e06c02d8..231cc17b49 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -426,7 +426,6 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 function visibilityChange() {
 	if (visibility.value === 'hidden') {
 		timerForSetPause.value = window.setTimeout(() => {
-			isPausingUpdate.value = true;
 			timerForSetPause.value = null;
 			if (!backed) {
 				scrollBy(scrollableElement, { top: 32, behavior: 'instant' });
@@ -439,8 +438,7 @@ function visibilityChange() {
 			clearTimeout(timerForSetPause.value);
 			timerForSetPause.value = null;
 		} else {
-			isPausingUpdate.value = false;
-			if (!backed && active.value) {
+			if (!weakBacked && active.value) {
 				executeQueue();
 			}
 		}
@@ -473,7 +471,7 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
-		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
+		!isPausingUpdate.value && // スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {

From 72998adfb6438d23db13921963dd6004649ce148 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 06:54:05 +0000
Subject: [PATCH 066/102] =?UTF-8?q?Revert=20"isPausingUpdate=E3=82=92?=
 =?UTF-8?q?=E7=9C=81=E7=95=A5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 954d934505b6154362420a8687b93c6a95ad1229.
---
 packages/frontend/src/components/MkPagination.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 231cc17b49..98e06c02d8 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -426,6 +426,7 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 function visibilityChange() {
 	if (visibility.value === 'hidden') {
 		timerForSetPause.value = window.setTimeout(() => {
+			isPausingUpdate.value = true;
 			timerForSetPause.value = null;
 			if (!backed) {
 				scrollBy(scrollableElement, { top: 32, behavior: 'instant' });
@@ -438,7 +439,8 @@ function visibilityChange() {
 			clearTimeout(timerForSetPause.value);
 			timerForSetPause.value = null;
 		} else {
-			if (!weakBacked && active.value) {
+			isPausingUpdate.value = false;
+			if (!backed && active.value) {
 				executeQueue();
 			}
 		}
@@ -471,7 +473,7 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
-		!isPausingUpdate.value && // スクロール調整中はキューに追加する
+		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {

From b0c6675ef331c6f5719546acb5ebae532e5196f4 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 06:55:08 +0000
Subject: [PATCH 067/102] :art:

---
 packages/frontend/src/components/MkPagination.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 98e06c02d8..d857f924ca 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop, scrollBy } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -428,10 +428,6 @@ function visibilityChange() {
 		timerForSetPause.value = window.setTimeout(() => {
 			isPausingUpdate.value = true;
 			timerForSetPause.value = null;
-			if (!backed) {
-				scrollBy(scrollableElement, { top: 32, behavior: 'instant' });
-				backed = true;
-			}
 		},
 		BACKGROUND_PAUSE_WAIT_SEC * 1000);
 	} else { // 'visible'

From f3a08395523531aeec2e403e8fc12c0387f0b828 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 07:15:20 +0000
Subject: [PATCH 068/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index d857f924ca..40f2cbaba3 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop, scrollBy } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -159,9 +159,11 @@ const scrollableElementOrHtml = $computed(() => scrollableElement ?? document.ge
 
 const visibility = useDocumentVisibility();
 
-const isPausingUpdate = ref(false);
+const isPausingUpdateByVisibility = ref(false);
 const timerForSetPause = ref<number | null>(null);
 
+const isPausingUpdateByExecutingQueue = ref(false);
+
 //#region scrolling
 const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
 const checkTop = (tolerance?: number) => {
@@ -426,7 +428,7 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 function visibilityChange() {
 	if (visibility.value === 'hidden') {
 		timerForSetPause.value = window.setTimeout(() => {
-			isPausingUpdate.value = true;
+			isPausingUpdateByVisibility.value = true;
 			timerForSetPause.value = null;
 		},
 		BACKGROUND_PAUSE_WAIT_SEC * 1000);
@@ -435,7 +437,7 @@ function visibilityChange() {
 			clearTimeout(timerForSetPause.value);
 			timerForSetPause.value = null;
 		} else {
-			isPausingUpdate.value = false;
+			isPausingUpdateByVisibility.value = false;
 			if (!backed && active.value) {
 				executeQueue();
 			}
@@ -469,14 +471,24 @@ const prepend = (item: MisskeyEntity): void => {
 	}
 
 	if (
-		!isPausingUpdate.value && // タブがバックグラウンドの時/スクロール調整中はキューに追加する
+		!isPausingUpdateByExecutingQueue.value && // スクロール調整中はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
 		if (!backed) {
-			// 先頭にいる場合は単に追加する
+			// かなりスクロールの先頭にいる場合
 			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-			unshiftItems([item]);
+			if (isPausingUpdateByVisibility.value) {
+				// バックグラウンドかつスクロールの先頭にいる場合は
+				// prependQueueしつつちょっと特殊な処理を挟む…
+				prependQueue(item);
+				// スクロールを進めておくことで復帰時にスクロールを進めないでよくなる
+				scrollBy(scrollableElement, { top: 24, behavior: 'instant' });
+				// 一応backedを強制的にtrueにする
+				backed = true;
+			} else {
+				unshiftItems([item]);
+			}
 		} else if (!weakBacked) {
 			// ちょっと先頭にいる場合はスクロールを調整する
 			prependQueue(item);
@@ -515,21 +527,18 @@ function concatItems(oldItems: MisskeyEntity[]) {
 
 async function executeQueue() {
 	if (queue.value.size === 0) return;
-	if (isPausingUpdate.value) return;
+	if (isPausingUpdateByExecutingQueue.value) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
-	isPausingUpdate.value = true;
-	try {
-		unshiftItems(
-			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-			Infinity,
-		);
-
-		items.value = new Map([...items.value].slice(0, displayLimit.value));
-		await nextTick();
-	} finally {
-		isPausingUpdate.value = false;
-	}
+	isPausingUpdateByExecutingQueue.value = true;
+	unshiftItems(
+		queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
+		Infinity,
+	);
+	await nextTick();
+	items.value = new Map([...items.value].slice(0, displayLimit.value));
+	await nextTick();
+	isPausingUpdateByExecutingQueue.value = false;
 }
 
 function prependQueue(newItem: MisskeyEntity) {

From d5b4fa7e50a9bf7456d3bb23c6ec385e1f422fe8 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 07:24:44 +0000
Subject: [PATCH 069/102] test

---
 .../frontend/src/components/MkPagination.vue  | 47 +++----------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 40f2cbaba3..001567f894 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -51,7 +51,6 @@ import { i18n } from '@/i18n';
 const SECOND_FETCH_LIMIT = 30;
 const TOLERANCE = 6;
 const APPEAR_MINIMUM_INTERVAL = 600;
-const BACKGROUND_PAUSE_WAIT_SEC = 10;
 
 export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
 	endpoint: E;
@@ -159,9 +158,6 @@ const scrollableElementOrHtml = $computed(() => scrollableElement ?? document.ge
 
 const visibility = useDocumentVisibility();
 
-const isPausingUpdateByVisibility = ref(false);
-const timerForSetPause = ref<number | null>(null);
-
 const isPausingUpdateByExecutingQueue = ref(false);
 
 //#region scrolling
@@ -346,10 +342,9 @@ const fetchMore = async (): Promise<void> => {
 
 		if (res.length === 0) {
 			if (props.pagination.reversed) {
-				reverseConcat(res).then(() => {
-					more.value = false;
-					moreFetching.value = false;
-				});
+				reverseConcat(res);
+				more.value = false;
+				moreFetching.value = false;
 			} else {
 				items.value = concatMapWithArray(items.value, res);
 				more.value = false;
@@ -357,10 +352,9 @@ const fetchMore = async (): Promise<void> => {
 			}
 		} else {
 			if (props.pagination.reversed) {
-				reverseConcat(res).then(() => {
-					more.value = true;
-					moreFetching.value = false;
-				});
+				reverseConcat(res);
+				more.value = true;
+				moreFetching.value = false;
 			} else {
 				items.value = concatMapWithArray(items.value, res);
 				more.value = true;
@@ -425,30 +419,9 @@ const appearFetchMoreAhead = async (): Promise<void> => {
 	fetchMoreAppearTimeout();
 };
 
-function visibilityChange() {
-	if (visibility.value === 'hidden') {
-		timerForSetPause.value = window.setTimeout(() => {
-			isPausingUpdateByVisibility.value = true;
-			timerForSetPause.value = null;
-		},
-		BACKGROUND_PAUSE_WAIT_SEC * 1000);
-	} else { // 'visible'
-		if (timerForSetPause.value) {
-			clearTimeout(timerForSetPause.value);
-			timerForSetPause.value = null;
-		} else {
-			isPausingUpdateByVisibility.value = false;
-			if (!backed && active.value) {
-				executeQueue();
-			}
-		}
-	}
-}
-
 onActivated(() => {
 	nextTick(() => {
 		active.value = true;
-		visibilityChange();
 	});
 });
 
@@ -456,8 +429,6 @@ onDeactivated(() => {
 	active.value = false;
 });
 
-watch(visibility, visibilityChange);
-
 /**
  * 最新のものとして1つだけアイテムを追加する
  * ストリーミングから降ってきたアイテムはこれで追加する
@@ -478,7 +449,7 @@ const prepend = (item: MisskeyEntity): void => {
 		if (!backed) {
 			// かなりスクロールの先頭にいる場合
 			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-			if (isPausingUpdateByVisibility.value) {
+			if (visibility.value === 'hidden') {
 				// バックグラウンドかつスクロールの先頭にいる場合は
 				// prependQueueしつつちょっと特殊な処理を挟む…
 				prependQueue(item);
@@ -573,10 +544,6 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
-	if (timerForSetPause.value) {
-		clearTimeout(timerForSetPause.value);
-		timerForSetPause.value = null;
-	}
 	if (preventAppearFetchMoreTimer.value) {
 		clearTimeout(preventAppearFetchMoreTimer.value);
 		preventAppearFetchMoreTimer.value = null;

From f7d776e4da914d5926233f64fd32fedd6acc8692 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 07:36:47 +0000
Subject: [PATCH 070/102] add comment

---
 packages/frontend/src/components/MkPagination.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 001567f894..42e84ee0a3 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -452,6 +452,7 @@ const prepend = (item: MisskeyEntity): void => {
 			if (visibility.value === 'hidden') {
 				// バックグラウンドかつスクロールの先頭にいる場合は
 				// prependQueueしつつちょっと特殊な処理を挟む…
+				// (Safariのスクロールの仕様が良くなればunshiftItemsにしたいところ)
 				prependQueue(item);
 				// スクロールを進めておくことで復帰時にスクロールを進めないでよくなる
 				scrollBy(scrollableElement, { top: 24, behavior: 'instant' });

From 94f9ebc80ccafe0444a2f801f3af884b33e08d15 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 13:02:20 +0000
Subject: [PATCH 071/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 42e84ee0a3..577ea064b6 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -443,24 +443,14 @@ const prepend = (item: MisskeyEntity): void => {
 
 	if (
 		!isPausingUpdateByExecutingQueue.value && // スクロール調整中はキューに追加する
+		visibility.value !== 'hidden' && // バックグラウンドの場合はキューに追加する
 		queueSize.value === 0 && // キューに残っている場合はキューに追加する
 		active.value // keepAliveで隠されている間はキューに追加する
 	) {
 		if (!backed) {
 			// かなりスクロールの先頭にいる場合
 			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
-			if (visibility.value === 'hidden') {
-				// バックグラウンドかつスクロールの先頭にいる場合は
-				// prependQueueしつつちょっと特殊な処理を挟む…
-				// (Safariのスクロールの仕様が良くなればunshiftItemsにしたいところ)
-				prependQueue(item);
-				// スクロールを進めておくことで復帰時にスクロールを進めないでよくなる
-				scrollBy(scrollableElement, { top: 24, behavior: 'instant' });
-				// 一応backedを強制的にtrueにする
-				backed = true;
-			} else {
-				unshiftItems([item]);
-			}
+			unshiftItems([item]);
 		} else if (!weakBacked) {
 			// ちょっと先頭にいる場合はスクロールを調整する
 			prependQueue(item);
@@ -503,6 +493,15 @@ async function executeQueue() {
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdateByExecutingQueue.value = true;
+	if (!backed) {
+		// スクロールが先頭の場合
+		// スクロールを進めることでChromeやFirefoxはいい感じにスクロールを調整してくれる
+		scrollBy(scrollableElement, { top: 24, behavior: 'instant' });
+		// 一応backedを強制的にtrueにする
+		backed = true;
+
+		await nextTick();
+	}
 	unshiftItems(
 		queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
 		Infinity,

From 7e06305b9655063dec6b0d3021211e8e9d4013e1 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 13:11:42 +0000
Subject: [PATCH 072/102] executeQueue after visible

---
 packages/frontend/src/components/MkPagination.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 577ea064b6..e302691695 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -429,6 +429,12 @@ onDeactivated(() => {
 	active.value = false;
 });
 
+watch(visibility, () => {
+	if (active.value && visibility.value === 'visible') {
+		executeQueue();
+	}
+});
+
 /**
  * 最新のものとして1つだけアイテムを追加する
  * ストリーミングから降ってきたアイテムはこれで追加する

From e9486d00850f43449761f8ead5b2f226c556bfac Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jul 2023 13:19:04 +0000
Subject: [PATCH 073/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index e302691695..8f5ae87e58 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -430,7 +430,7 @@ onDeactivated(() => {
 });
 
 watch(visibility, () => {
-	if (active.value && visibility.value === 'visible') {
+	if (!backed && active.value && visibility.value === 'visible') {
 		executeQueue();
 	}
 });

From 4aee99b61ae0c1178cc573bde4c6377ab0f78e09 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 03:23:31 +0000
Subject: [PATCH 074/102] test...

---
 packages/frontend/package.json                    | 1 +
 packages/frontend/src/components/MkPagination.vue | 7 ++++++-
 pnpm-lock.yaml                                    | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 90c0cca440..d9d5bdecbd 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -68,6 +68,7 @@
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typescript": "5.1.6",
+		"ua-parser-js": "2.0.0-alpha.2",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
 		"vite": "4.4.4",
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8f5ae87e58..a554fc4115 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -47,6 +47,7 @@ import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
 import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
+import { UAParser } from 'ua-parser-js';
 
 const SECOND_FETCH_LIMIT = 30;
 const TOLERANCE = 6;
@@ -92,6 +93,10 @@ function arrayToEntries(entities: MisskeyEntity[]): [string, MisskeyEntity][] {
 function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): MisskeyEntityMap {
 	return new Map([...map, ...arrayToEntries(entities)]);
 }
+
+const ua = new UAParser(navigator.userAgent);
+const isWebKit = ua.getEngine().name === 'WebKit';
+console.log('isWebKit', isWebKit);
 </script>
 <script lang="ts" setup>
 import { infoImageUrl } from '@/instance';
@@ -457,7 +462,7 @@ const prepend = (item: MisskeyEntity): void => {
 			// かなりスクロールの先頭にいる場合
 			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
 			unshiftItems([item]);
-		} else if (!weakBacked) {
+		} else if (!isWebKit && !weakBacked) {
 			// ちょっと先頭にいる場合はスクロールを調整する
 			prependQueue(item);
 			executeQueue();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 205efb2ab7..240b9451d5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -787,6 +787,9 @@ importers:
       typescript:
         specifier: 5.1.6
         version: 5.1.6
+      ua-parser-js:
+        specifier: 2.0.0-alpha.2
+        version: 2.0.0-alpha.2
       uuid:
         specifier: 9.0.0
         version: 9.0.0
@@ -20334,6 +20337,10 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  /ua-parser-js@2.0.0-alpha.2:
+    resolution: {integrity: sha512-Vz+BJN/EFC1OaUv0eu5kPyX7HEZIO7Dv29jIK7rMuKjUB1qqq+Is/XIpu5iV5XDvoNl62dM7ay8DtzYjBDI0WA==}
+    dev: false
+
   /ufo@1.1.2:
     resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
     dev: true

From e8316dc4c4ca29a1b6d37ee8cc129302dc71b490 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 03:29:06 +0000
Subject: [PATCH 075/102] :v:

---
 packages/frontend/src/components/MkPagination.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index a554fc4115..df2b423f39 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -96,7 +96,6 @@ function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): M
 
 const ua = new UAParser(navigator.userAgent);
 const isWebKit = ua.getEngine().name === 'WebKit';
-console.log('isWebKit', isWebKit);
 </script>
 <script lang="ts" setup>
 import { infoImageUrl } from '@/instance';
@@ -200,7 +199,7 @@ watch([$$(rootEl), $$(scrollObserver)], () => {
  * weakBackedがtrue→falseになったらexecuteQueue
  */
 watch($$(weakBacked), () => {
-	if (!weakBacked) {
+	if (!isWebKit && !weakBacked) {
 		executeQueue();
 	}
 });

From 18611ab521282988f30cf1841ac4894bf144dc5c Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 04:45:24 +0000
Subject: [PATCH 076/102] wip

---
 .../frontend/src/components/MkTimeline.vue    | 76 ++++++++++++++++---
 .../src/components/MkVisitorDashboard.vue     |  4 +-
 .../frontend/src/pages/antenna-timeline.vue   | 35 ++-------
 packages/frontend/src/pages/channel.vue       |  2 +-
 packages/frontend/src/pages/timeline.vue      | 35 ++-------
 .../frontend/src/pages/user-list-timeline.vue | 34 ++-------
 packages/frontend/src/ui/deck/tl-column.vue   | 34 +--------
 .../frontend/src/widgets/WidgetTimeline.vue   | 31 +-------
 8 files changed, 91 insertions(+), 160 deletions(-)

diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index bc15ebfcaf..a667f5d79f 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -1,5 +1,15 @@
 <template>
-<MkNotes ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination"/>
+<div>
+	<div v-if="queueSize > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="reload()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
+	<div v-if="(((src === 'local' || src === 'social') && !isLocalTimelineAvailable) || (src === 'global' && !isGlobalTimelineAvailable))" :class="$style.disabled">
+		<p :class="$style.disabledTitle">
+			<i class="ti ti-circle-minus"></i>
+			{{ i18n.ts._disabledTimeline.title }}
+		</p>
+		<p :class="$style.disabledDescription">{{ i18n.ts._disabledTimeline.description }}</p>
+	</div>
+	<MkNotes v-else ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination"/>
+</div>
 </template>
 
 <script lang="ts" setup>
@@ -9,6 +19,8 @@ import { useStream } from '@/stream';
 import * as sound from '@/scripts/sound';
 import { $i } from '@/account';
 import { defaultStore } from '@/store';
+import { i18n } from '@/i18n';
+import { instance } from '@/instance';
 
 const props = defineProps<{
 	src: string;
@@ -21,14 +33,22 @@ const props = defineProps<{
 
 const emit = defineEmits<{
 	(ev: 'note'): void;
+	(ev: 'reload'): void;
 }>();
 
+const isLocalTimelineAvailable = (($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable));
+const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable));
+
 provide('inChannel', computed(() => props.src === 'channel'));
 
-const tlComponent: InstanceType<typeof MkNotes> = $ref();
+let tlComponent: InstanceType<typeof MkNotes> | undefined = $ref();
+
+const queueSize = computed(() => {
+	return tlComponent?.pagingComponent?.queueSize ?? 0;
+});
 
 const prepend = note => {
-	tlComponent.pagingComponent?.prepend(note);
+	tlComponent?.pagingComponent?.prepend(note);
 
 	emit('note');
 
@@ -38,11 +58,11 @@ const prepend = note => {
 };
 
 const onUserAdded = () => {
-	tlComponent.pagingComponent?.reload();
+	tlComponent?.pagingComponent?.reload();
 };
 
 const onUserRemoved = () => {
-	tlComponent.pagingComponent?.reload();
+	tlComponent?.pagingComponent?.reload();
 };
 
 let endpoint;
@@ -164,12 +184,46 @@ const timetravel = (date?: Date) => {
 };
 */
 
+const reload = () => {
+	tlComponent?.pagingComponent?.reload();
+	emit('reload');
+};
+
 defineExpose({
-	reload: () => {
-		tlComponent.pagingComponent?.reload();
-	},
-	queueSize: computed(() => {
-		return tlComponent.pagingComponent?.queueSize ?? 0;
-	}),
+	reload,
+	queueSize,
 });
 </script>
+
+<style lang="scss" module>
+.new {
+	position: sticky;
+	top: calc(var(--stickyTop, 0px) + 16px);
+	z-index: 1000;
+	width: 100%;
+	margin: calc(-0.675em - 8px) 0;
+
+	&:first-child {
+		margin-top: calc(-0.675em - 8px - var(--margin));
+	}
+}
+
+.newButton {
+	display: block;
+	margin: var(--margin) auto 0 auto;
+	padding: 8px 16px;
+	border-radius: 32px;
+}
+
+.disabled {
+	text-align: center;
+}
+
+.disabledTitle {
+	margin: 16px;
+}
+
+.disabledDescription {
+	font-size: 90%;
+}
+</style>
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index 9566cc651f..a176da821d 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -35,9 +35,7 @@
 	</div>
 	<div v-if="instance.policies.ltlAvailable" :class="[$style.tl, $style.panel]">
 		<div :class="$style.tlHeader">{{ i18n.ts.letsLookAtTimeline }}</div>
-		<div :class="$style.tlBody">
-			<MkTimeline src="local"/>
-		</div>
+		<MkTimeline src="local" :class="$style.tlBody"/>
 	</div>
 	<div :class="$style.panel">
 		<XActiveUsersChart/>
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index 327f1b4b14..705ebb72c3 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -3,15 +3,13 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl" v-hotkey.global="keymap">
-			<div v-if="tlEl?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
-			<div :class="$style.tl">
-				<MkTimeline
-					ref="tlEl" :key="antennaId"
-					src="antenna"
-					:antenna="antennaId"
-					:sound="true"
-				/>
-			</div>
+			<MkTimeline
+				ref="tlEl" :key="antennaId"
+				src="antenna"
+				:antenna="antennaId"
+				:sound="true"
+				:class="$style.tl"
+			/>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -84,25 +82,6 @@ definePageMetadata(computed(() => antenna ? {
 </script>
 
 <style lang="scss" module>
-.new {
-	position: sticky;
-	top: calc(var(--stickyTop, 0px) + 16px);
-	z-index: 1000;
-	width: 100%;
-	margin: calc(-0.675em - 8px) 0;
-
-	&:first-child {
-		margin-top: calc(-0.675em - 8px - var(--margin));
-	}
-}
-
-.newButton {
-	display: block;
-	margin: var(--margin) auto 0 auto;
-	padding: 8px 16px;
-	border-radius: 32px;
-}
-
 .tl {
 	background: var(--bg);
 	border-radius: var(--radius);
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 2a056f21d4..3897291f2e 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -32,7 +32,7 @@
 			<!-- スマホ・タブレットの場合、キーボードが表示されると投稿が見づらくなるので、デスクトップ場合のみ自動でフォーカスを当てる -->
 			<MkPostForm v-if="$i && defaultStore.reactiveState.showFixedPostFormInChannel.value" :channel="channel" class="post-form _panel" fixed :autofocus="deviceKind === 'desktop'"/>
 
-			<MkTimeline :key="channelId" src="channel" :channel="channelId" @before="before" @after="after"/>
+			<MkTimeline :key="channelId" src="channel" :channel="channelId" />
 		</div>
 		<div v-else-if="tab === 'featured'">
 			<MkNotes :pagination="featuredPagination"/>
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index b5d1f5ba54..23713cc908 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -6,15 +6,13 @@
 			<XTutorial v-if="$i && defaultStore.reactiveState.timelineTutorial.value != -1" class="_panel" style="margin-bottom: var(--margin);"/>
 			<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
 
-			<div v-if="tlComponent?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
-			<div :class="$style.tl">
-				<MkTimeline
-					ref="tlComponent"
-					:key="src"
-					:src="src"
-					:sound="true"
-				/>
-			</div>
+			<MkTimeline
+				ref="tlComponent"
+				:key="src"
+				:src="src"
+				:sound="true"
+				:class="$style.tl"
+			/>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -168,25 +166,6 @@ definePageMetadata(computed(() => ({
 </script>
 
 <style lang="scss" module>
-.new {
-	position: sticky;
-	top: calc(var(--stickyTop, 0px) + 16px);
-	z-index: 1000;
-	width: 100%;
-	margin: calc(-0.675em - 8px) 0;
-
-	&:first-child {
-		margin-top: calc(-0.675em - 8px - var(--margin));
-	}
-}
-
-.newButton {
-	display: block;
-	margin: var(--margin) auto 0 auto;
-	padding: 8px 16px;
-	border-radius: 32px;
-}
-
 .postForm {
 	border-radius: var(--radius);
 }
diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue
index e297e1747e..4e2cc88add 100644
--- a/packages/frontend/src/pages/user-list-timeline.vue
+++ b/packages/frontend/src/pages/user-list-timeline.vue
@@ -3,15 +3,13 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
 		<div ref="rootEl">
-			<div v-if="tlEl?.queueSize ?? 0 > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.goToTheHeadOfTimeline }}</button></div>
-			<div :class="$style.tl">
-				<MkTimeline
-					ref="tlEl" :key="listId"
-					src="list"
-					:list="listId"
-					:sound="true"
-				/>
-			</div>
+			<MkTimeline
+				ref="tlEl" :key="listId"
+				src="list"
+				:list="listId"
+				:sound="true"
+				:class="$style.tl"
+			/>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -77,24 +75,6 @@ definePageMetadata(computed(() => list ? {
 </script>
 
 <style lang="scss" module>
-.new {
-	position: sticky;
-	top: calc(var(--stickyTop, 0px) + 16px);
-	z-index: 1000;
-	width: 100%;
-	margin: calc(-0.675em - 8px) 0;
-
-	&:first-child {
-		margin-top: calc(-0.675em - 8px - var(--margin));
-	}
-}
-
-.newButton {
-	display: block;
-	margin: var(--margin) auto 0 auto;
-	padding: 8px 16px;
-	border-radius: 32px;
-}
 
 .tl {
 	background: var(--bg);
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index 4844ad11ff..3ba1244fae 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -8,14 +8,7 @@
 		<span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
 
-	<div v-if="(((column.tl === 'local' || column.tl === 'social') && !isLocalTimelineAvailable) || (column.tl === 'global' && !isGlobalTimelineAvailable))" :class="$style.disabled">
-		<p :class="$style.disabledTitle">
-			<i class="ti ti-circle-minus"></i>
-			{{ i18n.ts._disabledTimeline.title }}
-		</p>
-		<p :class="$style.disabledDescription">{{ i18n.ts._disabledTimeline.description }}</p>
-	</div>
-	<MkTimeline v-else-if="column.tl" ref="timeline" :key="column.tl" :src="column.tl"/>
+	<MkTimeline v-if="column.tl" ref="timeline" :key="column.tl" :src="column.tl"/>
 </XColumn>
 </template>
 
@@ -25,27 +18,16 @@ import XColumn from './column.vue';
 import { removeColumn, updateColumn, Column } from './deck-store';
 import MkTimeline from '@/components/MkTimeline.vue';
 import * as os from '@/os';
-import { $i } from '@/account';
 import { i18n } from '@/i18n';
-import { instance } from '@/instance';
 
 const props = defineProps<{
 	column: Column;
 	isStacked: boolean;
 }>();
 
-let disabled = $ref(false);
-
-const isLocalTimelineAvailable = (($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable));
-const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable));
-
 onMounted(() => {
 	if (props.column.tl == null) {
 		setType();
-	} else if ($i) {
-		disabled = (
-			(!((instance.policies.ltlAvailable) || ($i.policies.ltlAvailable)) && ['local', 'social'].includes(props.column.tl)) ||
-			(!((instance.policies.gtlAvailable) || ($i.policies.gtlAvailable)) && ['global'].includes(props.column.tl)));
 	}
 });
 
@@ -79,17 +61,3 @@ const menu = [{
 	action: setType,
 }];
 </script>
-
-<style lang="scss" module>
-.disabled {
-	text-align: center;
-}
-
-.disabledTitle {
-	margin: 16px;
-}
-
-.disabledDescription {
-	font-size: 90%;
-}
-</style>
diff --git a/packages/frontend/src/widgets/WidgetTimeline.vue b/packages/frontend/src/widgets/WidgetTimeline.vue
index 3d497c2e23..a8297f386f 100644
--- a/packages/frontend/src/widgets/WidgetTimeline.vue
+++ b/packages/frontend/src/widgets/WidgetTimeline.vue
@@ -15,33 +15,20 @@
 		</button>
 	</template>
 
-	<div v-if="(((widgetProps.src === 'local' || widgetProps.src === 'social') && !isLocalTimelineAvailable) || (widgetProps.src === 'global' && !isGlobalTimelineAvailable))" :class="$style.disabled">
-		<p :class="$style.disabledTitle">
-			<i class="ti ti-minus"></i>
-			{{ i18n.ts._disabledTimeline.title }}
-		</p>
-		<p :class="$style.disabledDescription">{{ i18n.ts._disabledTimeline.description }}</p>
-	</div>
-	<div v-else>
-		<MkTimeline :key="widgetProps.src === 'list' ? `list:${widgetProps.list.id}` : widgetProps.src === 'antenna' ? `antenna:${widgetProps.antenna.id}` : widgetProps.src" :src="widgetProps.src" :list="widgetProps.list ? widgetProps.list.id : null" :antenna="widgetProps.antenna ? widgetProps.antenna.id : null"/>
-	</div>
+	<MkTimeline :key="widgetProps.src === 'list' ? `list:${widgetProps.list.id}` : widgetProps.src === 'antenna' ? `antenna:${widgetProps.antenna.id}` : widgetProps.src" :src="widgetProps.src" :list="widgetProps.list ? widgetProps.list.id : null" :antenna="widgetProps.antenna ? widgetProps.antenna.id : null"/>
 </MkContainer>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
+import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget';
 import { GetFormResultType } from '@/scripts/form';
 import * as os from '@/os';
 import MkContainer from '@/components/MkContainer.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import { i18n } from '@/i18n';
-import { $i } from '@/account';
-import { instance } from '@/instance';
 
 const name = 'timeline';
-const isLocalTimelineAvailable = (($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable));
-const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable));
 
 const widgetPropsDef = {
 	showHeader: {
@@ -136,17 +123,3 @@ defineExpose<WidgetComponentExpose>({
 	id: props.widget ? props.widget.id : null,
 });
 </script>
-
-<style lang="scss" module>
-.disabled {
-	text-align: center;
-}
-
-.disabledTitle {
-	margin: 16px;
-}
-
-.disabledDescription {
-	font-size: 90%;
-}
-</style>

From e2f3091778523931c67166b92731d35a6c47ac79 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 05:14:42 +0000
Subject: [PATCH 077/102] :art:

---
 packages/frontend/src/components/MkTimeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index a667f5d79f..c3f6e3ab09 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -198,7 +198,7 @@ defineExpose({
 <style lang="scss" module>
 .new {
 	position: sticky;
-	top: calc(var(--stickyTop, 0px) + 16px);
+	top: calc(var(--stickyTop, 0px) + 12px);
 	z-index: 1000;
 	width: 100%;
 	margin: calc(-0.675em - 8px) 0;

From b02187d9d0e6499cc41053826ad349c8985bb89e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 05:20:10 +0000
Subject: [PATCH 078/102] :art:

---
 packages/frontend/src/components/MkTimeline.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index c3f6e3ab09..91e43126d3 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -225,5 +225,6 @@ defineExpose({
 
 .disabledDescription {
 	font-size: 90%;
+	margin: 16px;
 }
 </style>

From 05042a0697ed6ac80e48c7a50775c3dd9c379322 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 06:39:39 +0000
Subject: [PATCH 079/102] =?UTF-8?q?perf(backend):=20createPerson=E3=81=A7?=
 =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92=E7=A9=8D?=
 =?UTF-8?q?=E6=A5=B5=E7=9A=84=E3=81=AB=E5=88=A9=E7=94=A8=E3=81=99=E3=82=8B?=
 =?UTF-8?q?,=20=E3=83=88=E3=83=A9=E3=83=B3=E3=82=B6=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=9B=9E=E6=95=B0=E3=82=92=E6=B8=9B=E3=82=89?=
 =?UTF-8?q?=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activitypub/models/ApPersonService.ts     | 89 +++++++++----------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index e89ee4632c..22ef0b139e 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -43,6 +43,7 @@ import type { ApLoggerService } from '../ApLoggerService.js';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { ApImageService } from './ApImageService.js';
 import type { IActor, IObject } from '../type.js';
+import { ca } from 'date-fns/locale';
 
 const nameLength = 128;
 const summaryLength = 2048;
@@ -259,13 +260,49 @@ export class ApPersonService implements OnModuleInit {
 
 		// Create user
 		let user: RemoteUser | null = null;
+		const userAdditionalInfo: Pick<RemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash' | 'emojis'> = {
+			avatarId: null,
+			bannerId: null,
+			avatarUrl: null,
+			bannerUrl: null,
+			avatarBlurhash: null,
+			bannerBlurhash: null,
+			emojis: [],
+		};
+
+		try {
+			//#region アバターとヘッダー画像をフェッチ
+			const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
+				if (img == null) return null;
+				if (user == null) throw new Error('failed to create user: user is null');
+				return this.apImageService.resolveImage(user, img).catch(() => null);
+			}));
+
+			userAdditionalInfo.avatarId = avatar?.id ?? null;
+			userAdditionalInfo.bannerId = banner?.id ?? null;
+			userAdditionalInfo.avatarUrl = avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null;
+			userAdditionalInfo.bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
+			userAdditionalInfo.avatarBlurhash = avatar?.blurhash ?? null;
+			userAdditionalInfo.bannerBlurhash = banner?.blurhash ?? null;
+			//#endregion
+		} catch (err) {
+			this.logger.error('error occured while fetching user avatar/banner', { stack: err });
+		}
+
+		//#region カスタム絵文字取得
+		userAdditionalInfo.emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host)
+			.then(_emojis => _emojis.map(emoji => emoji.name))
+			.catch(err => {
+				this.logger.error(`error occured while fetching user emojis`, { stack: err });
+				return [];
+			});
+		//#endregion
+
 		try {
 			// Start transaction
 			await this.db.transaction(async transactionalEntityManager => {
 				user = await transactionalEntityManager.save(new User({
 					id: this.idService.genId(),
-					avatarId: null,
-					bannerId: null,
 					createdAt: new Date(),
 					lastFetchedAt: new Date(),
 					name: truncate(person.name, nameLength),
@@ -285,6 +322,7 @@ export class ApPersonService implements OnModuleInit {
 					tags,
 					isBot,
 					isCat: (person as any).isCat === true,
+					...userAdditionalInfo,
 				})) as RemoteUser;
 
 				await transactionalEntityManager.save(new UserProfile({
@@ -321,6 +359,9 @@ export class ApPersonService implements OnModuleInit {
 
 		if (user == null) throw new Error('failed to create user: user is null');
 
+		// Register to the cache
+		this.cacheService.uriPersonCache.set(user.uri, user);
+
 		// Register host
 		this.federatedInstanceService.fetch(host).then(async i => {
 			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
@@ -335,48 +376,6 @@ export class ApPersonService implements OnModuleInit {
 		// ハッシュタグ更新
 		this.hashtagService.updateUsertags(user, tags);
 
-		//#region アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
-			if (img == null) return null;
-			if (user == null) throw new Error('failed to create user: user is null');
-			return this.apImageService.resolveImage(user, img).catch(() => null);
-		}));
-
-		const avatarId = avatar?.id ?? null;
-		const bannerId = banner?.id ?? null;
-		const avatarUrl = avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null;
-		const bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
-		const avatarBlurhash = avatar?.blurhash ?? null;
-		const bannerBlurhash = banner?.blurhash ?? null;
-
-		await this.usersRepository.update(user.id, {
-			avatarId,
-			bannerId,
-			avatarUrl,
-			bannerUrl,
-			avatarBlurhash,
-			bannerBlurhash,
-		});
-
-		user.avatarId = avatarId;
-		user.bannerId = bannerId;
-		user.avatarUrl = avatarUrl;
-		user.bannerUrl = bannerUrl;
-		user.avatarBlurhash = avatarBlurhash;
-		user.bannerBlurhash = bannerBlurhash;
-		//#endregion
-
-		//#region カスタム絵文字取得
-		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host).catch(err => {
-			this.logger.info(`extractEmojis: ${err}`);
-			return [];
-		});
-
-		const emojiNames = emojis.map(emoji => emoji.name);
-
-		await this.usersRepository.update(user.id, { emojis: emojiNames });
-		//#endregion
-
 		await this.updateFeatured(user.id, resolver).catch(err => this.logger.error(err));
 
 		return user;
@@ -400,7 +399,7 @@ export class ApPersonService implements OnModuleInit {
 		if (uri.startsWith(`${this.config.url}/`)) return;
 
 		//#region このサーバーに既に登録されているか
-		const exist = await this.usersRepository.findOneBy({ uri }) as RemoteUser | null;
+		const exist = await this.fetchPerson(uri) as RemoteUser | null;
 		if (exist === null) return;
 		//#endregion
 

From fc50dc7a67b0ddb996dca0f3c5cd687257152022 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 06:43:09 +0000
Subject: [PATCH 080/102] move comment

---
 .../backend/src/core/activitypub/models/ApPersonService.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 22ef0b139e..aa3580599e 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -270,8 +270,8 @@ export class ApPersonService implements OnModuleInit {
 			emojis: [],
 		};
 
+		//#region アバターとヘッダー画像をフェッチ
 		try {
-			//#region アバターとヘッダー画像をフェッチ
 			const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
 				if (img == null) return null;
 				if (user == null) throw new Error('failed to create user: user is null');
@@ -284,10 +284,10 @@ export class ApPersonService implements OnModuleInit {
 			userAdditionalInfo.bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
 			userAdditionalInfo.avatarBlurhash = avatar?.blurhash ?? null;
 			userAdditionalInfo.bannerBlurhash = banner?.blurhash ?? null;
-			//#endregion
 		} catch (err) {
 			this.logger.error('error occured while fetching user avatar/banner', { stack: err });
 		}
+		//#endregion
 
 		//#region カスタム絵文字取得
 		userAdditionalInfo.emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host)

From 660b0302338d912e39bdd3f8d95cad7e58a734b0 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 06:59:12 +0000
Subject: [PATCH 081/102] fix

---
 .../activitypub/models/ApPersonService.ts     | 82 ++++++++-----------
 1 file changed, 34 insertions(+), 48 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index aa3580599e..37177a83e2 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -44,6 +44,7 @@ import type { ApLoggerService } from '../ApLoggerService.js';
 import type { ApImageService } from './ApImageService.js';
 import type { IActor, IObject } from '../type.js';
 import { ca } from 'date-fns/locale';
+import { users } from 'systeminformation';
 
 const nameLength = 128;
 const summaryLength = 2048;
@@ -221,6 +222,23 @@ export class ApPersonService implements OnModuleInit {
 		return null;
 	}
 
+	private async resolveAvatarAndBanner(user: RemoteUser, icon: any, image: any): Promise<Pick<RemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash'>> {
+		const [avatar, banner] = await Promise.all([icon, image].map(img => {
+			if (img == null) return null;
+			if (user == null) throw new Error('failed to create user: user is null');
+			return this.apImageService.resolveImage(user, img).catch(() => null);
+		}));
+
+		return {
+			avatarId: avatar?.id ?? null,
+			bannerId: banner?.id ?? null,
+			avatarUrl: avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null,
+			bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null,
+			avatarBlurhash: avatar?.blurhash ?? null,
+			bannerBlurhash: banner?.blurhash ?? null,
+		};
+	}
+
 	/**
 	 * Personを作成します。
 	 */
@@ -260,37 +278,9 @@ export class ApPersonService implements OnModuleInit {
 
 		// Create user
 		let user: RemoteUser | null = null;
-		const userAdditionalInfo: Pick<RemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash' | 'emojis'> = {
-			avatarId: null,
-			bannerId: null,
-			avatarUrl: null,
-			bannerUrl: null,
-			avatarBlurhash: null,
-			bannerBlurhash: null,
-			emojis: [],
-		};
-
-		//#region アバターとヘッダー画像をフェッチ
-		try {
-			const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
-				if (img == null) return null;
-				if (user == null) throw new Error('failed to create user: user is null');
-				return this.apImageService.resolveImage(user, img).catch(() => null);
-			}));
-
-			userAdditionalInfo.avatarId = avatar?.id ?? null;
-			userAdditionalInfo.bannerId = banner?.id ?? null;
-			userAdditionalInfo.avatarUrl = avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null;
-			userAdditionalInfo.bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
-			userAdditionalInfo.avatarBlurhash = avatar?.blurhash ?? null;
-			userAdditionalInfo.bannerBlurhash = banner?.blurhash ?? null;
-		} catch (err) {
-			this.logger.error('error occured while fetching user avatar/banner', { stack: err });
-		}
-		//#endregion
 
 		//#region カスタム絵文字取得
-		userAdditionalInfo.emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host)
+		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host)
 			.then(_emojis => _emojis.map(emoji => emoji.name))
 			.catch(err => {
 				this.logger.error(`error occured while fetching user emojis`, { stack: err });
@@ -322,7 +312,7 @@ export class ApPersonService implements OnModuleInit {
 					tags,
 					isBot,
 					isCat: (person as any).isCat === true,
-					...userAdditionalInfo,
+					emojis,
 				})) as RemoteUser;
 
 				await transactionalEntityManager.save(new UserProfile({
@@ -362,6 +352,19 @@ export class ApPersonService implements OnModuleInit {
 		// Register to the cache
 		this.cacheService.uriPersonCache.set(user.uri, user);
 
+		//#region アバターとヘッダー画像をフェッチ
+		try {
+			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image);
+			await this.usersRepository.update(user.id, updates);
+			user = { ...user, ...updates };
+
+			// Register to the cache
+			this.cacheService.uriPersonCache.set(user.uri, user);
+		} catch (err) {
+			this.logger.error('error occured while fetching user avatar/banner', { stack: err });
+		}
+		//#endregion
+
 		// Register host
 		this.federatedInstanceService.fetch(host).then(async i => {
 			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
@@ -412,12 +415,6 @@ export class ApPersonService implements OnModuleInit {
 
 		this.logger.info(`Updating the Person: ${person.id}`);
 
-		// アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
-			if (img == null) return null;
-			return this.apImageService.resolveImage(exist, img).catch(() => null);
-		}));
-
 		// カスタム絵文字取得
 		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], exist.host).catch(e => {
 			this.logger.info(`extractEmojis: ${e}`);
@@ -453,6 +450,7 @@ export class ApPersonService implements OnModuleInit {
 			movedToUri: person.movedTo ?? null,
 			alsoKnownAs: person.alsoKnownAs ?? null,
 			isExplorable: person.discoverable,
+			...(await this.resolveAvatarAndBanner(exist, person.icon, person.image).catch(() => ({}))),
 		} as Partial<RemoteUser> & Pick<RemoteUser, 'isBot' | 'isCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;
 
 		const moving = ((): boolean => {
@@ -475,18 +473,6 @@ export class ApPersonService implements OnModuleInit {
 
 		if (moving) updates.movedAt = new Date();
 
-		if (avatar) {
-			updates.avatarId = avatar.id;
-			updates.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar');
-			updates.avatarBlurhash = avatar.blurhash;
-		}
-
-		if (banner) {
-			updates.bannerId = banner.id;
-			updates.bannerUrl = this.driveFileEntityService.getPublicUrl(banner);
-			updates.bannerBlurhash = banner.blurhash;
-		}
-
 		// Update user
 		await this.usersRepository.update(exist.id, updates);
 

From 4e7a26e6d5faa9760077062752940ded9662f50d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:00:50 +0000
Subject: [PATCH 082/102] oops

---
 packages/backend/src/core/activitypub/models/ApPersonService.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 37177a83e2..8f2997ac84 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -43,8 +43,6 @@ import type { ApLoggerService } from '../ApLoggerService.js';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { ApImageService } from './ApImageService.js';
 import type { IActor, IObject } from '../type.js';
-import { ca } from 'date-fns/locale';
-import { users } from 'systeminformation';
 
 const nameLength = 128;
 const summaryLength = 2048;

From 4c83663597e424364e3592ad00f12f3141d79236 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:03:07 +0000
Subject: [PATCH 083/102] fix

---
 packages/backend/src/core/activitypub/models/ApPersonService.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 8f2997ac84..4f83983be1 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -291,6 +291,8 @@ export class ApPersonService implements OnModuleInit {
 			await this.db.transaction(async transactionalEntityManager => {
 				user = await transactionalEntityManager.save(new User({
 					id: this.idService.genId(),
+					avatarId: null,
+					bannerId: null,
 					createdAt: new Date(),
 					lastFetchedAt: new Date(),
 					name: truncate(person.name, nameLength),

From a2f6bf3d5c93d02d36c37bdae0235a4ade2620f5 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:03:30 +0000
Subject: [PATCH 084/102] fix

---
 .../core/activitypub/models/ApPersonService.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 4f83983be1..028b5148b5 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -352,6 +352,15 @@ export class ApPersonService implements OnModuleInit {
 		// Register to the cache
 		this.cacheService.uriPersonCache.set(user.uri, user);
 
+		// Register host
+		this.federatedInstanceService.fetch(host).then(async i => {
+			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
+			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+			if ((await this.metaService.fetch()).enableChartsForFederatedInstances) {
+				this.instanceChart.newUser(i.host);
+			}
+		});
+
 		//#region アバターとヘッダー画像をフェッチ
 		try {
 			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image);
@@ -365,15 +374,6 @@ export class ApPersonService implements OnModuleInit {
 		}
 		//#endregion
 
-		// Register host
-		this.federatedInstanceService.fetch(host).then(async i => {
-			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
-			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
-			if ((await this.metaService.fetch()).enableChartsForFederatedInstances) {
-				this.instanceChart.newUser(i.host);
-			}
-		});
-
 		this.usersChart.update(user, true);
 
 		// ハッシュタグ更新

From ee1e2aa200f1b0ebc8b7337048b1c3d538961ea8 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:05:02 +0000
Subject: [PATCH 085/102] fix

---
 .../src/core/activitypub/models/ApPersonService.ts     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 028b5148b5..8fc083719d 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -361,6 +361,11 @@ export class ApPersonService implements OnModuleInit {
 			}
 		});
 
+		this.usersChart.update(user, true);
+
+		// ハッシュタグ更新
+		this.hashtagService.updateUsertags(user, tags);
+
 		//#region アバターとヘッダー画像をフェッチ
 		try {
 			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image);
@@ -374,11 +379,6 @@ export class ApPersonService implements OnModuleInit {
 		}
 		//#endregion
 
-		this.usersChart.update(user, true);
-
-		// ハッシュタグ更新
-		this.hashtagService.updateUsertags(user, tags);
-
 		await this.updateFeatured(user.id, resolver).catch(err => this.logger.error(err));
 
 		return user;

From e6ee5704e8e35dfc966f445470e885ab41320f3f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:07:58 +0000
Subject: [PATCH 086/102] beta.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a62ef7c185..dc619b7606 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.14.0-beta.6",
+	"version": "13.14.0-beta.7",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 4e775a670f23179a06ddeaaa2c034e002c7fabb6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:08:15 +0000
Subject: [PATCH 087/102] Revert "beta.7"

This reverts commit e6ee5704e8e35dfc966f445470e885ab41320f3f.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc619b7606..a62ef7c185 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.14.0-beta.7",
+	"version": "13.14.0-beta.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 3cc22e5e1c3f3d351fbec4679d8701ba4c8d06c6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 19 Jul 2023 07:08:28 +0000
Subject: [PATCH 088/102] Revert "Merge branch 'use-uri-cache' into pag-back"

This reverts commit d0a119c2eab99216afd03d4664bff6bab02ce9c9, reversing
changes made to 5bfb98df006d4729c7bfe38507b8c82907906b0e.
---
 .../activitypub/models/ApPersonService.ts     | 99 +++++++++++--------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 8fc083719d..e89ee4632c 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -220,23 +220,6 @@ export class ApPersonService implements OnModuleInit {
 		return null;
 	}
 
-	private async resolveAvatarAndBanner(user: RemoteUser, icon: any, image: any): Promise<Pick<RemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash'>> {
-		const [avatar, banner] = await Promise.all([icon, image].map(img => {
-			if (img == null) return null;
-			if (user == null) throw new Error('failed to create user: user is null');
-			return this.apImageService.resolveImage(user, img).catch(() => null);
-		}));
-
-		return {
-			avatarId: avatar?.id ?? null,
-			bannerId: banner?.id ?? null,
-			avatarUrl: avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null,
-			bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null,
-			avatarBlurhash: avatar?.blurhash ?? null,
-			bannerBlurhash: banner?.blurhash ?? null,
-		};
-	}
-
 	/**
 	 * Personを作成します。
 	 */
@@ -276,16 +259,6 @@ export class ApPersonService implements OnModuleInit {
 
 		// Create user
 		let user: RemoteUser | null = null;
-
-		//#region カスタム絵文字取得
-		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host)
-			.then(_emojis => _emojis.map(emoji => emoji.name))
-			.catch(err => {
-				this.logger.error(`error occured while fetching user emojis`, { stack: err });
-				return [];
-			});
-		//#endregion
-
 		try {
 			// Start transaction
 			await this.db.transaction(async transactionalEntityManager => {
@@ -312,7 +285,6 @@ export class ApPersonService implements OnModuleInit {
 					tags,
 					isBot,
 					isCat: (person as any).isCat === true,
-					emojis,
 				})) as RemoteUser;
 
 				await transactionalEntityManager.save(new UserProfile({
@@ -349,9 +321,6 @@ export class ApPersonService implements OnModuleInit {
 
 		if (user == null) throw new Error('failed to create user: user is null');
 
-		// Register to the cache
-		this.cacheService.uriPersonCache.set(user.uri, user);
-
 		// Register host
 		this.federatedInstanceService.fetch(host).then(async i => {
 			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
@@ -367,16 +336,45 @@ export class ApPersonService implements OnModuleInit {
 		this.hashtagService.updateUsertags(user, tags);
 
 		//#region アバターとヘッダー画像をフェッチ
-		try {
-			const updates = await this.resolveAvatarAndBanner(user, person.icon, person.image);
-			await this.usersRepository.update(user.id, updates);
-			user = { ...user, ...updates };
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
+			if (img == null) return null;
+			if (user == null) throw new Error('failed to create user: user is null');
+			return this.apImageService.resolveImage(user, img).catch(() => null);
+		}));
 
-			// Register to the cache
-			this.cacheService.uriPersonCache.set(user.uri, user);
-		} catch (err) {
-			this.logger.error('error occured while fetching user avatar/banner', { stack: err });
-		}
+		const avatarId = avatar?.id ?? null;
+		const bannerId = banner?.id ?? null;
+		const avatarUrl = avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null;
+		const bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
+		const avatarBlurhash = avatar?.blurhash ?? null;
+		const bannerBlurhash = banner?.blurhash ?? null;
+
+		await this.usersRepository.update(user.id, {
+			avatarId,
+			bannerId,
+			avatarUrl,
+			bannerUrl,
+			avatarBlurhash,
+			bannerBlurhash,
+		});
+
+		user.avatarId = avatarId;
+		user.bannerId = bannerId;
+		user.avatarUrl = avatarUrl;
+		user.bannerUrl = bannerUrl;
+		user.avatarBlurhash = avatarBlurhash;
+		user.bannerBlurhash = bannerBlurhash;
+		//#endregion
+
+		//#region カスタム絵文字取得
+		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host).catch(err => {
+			this.logger.info(`extractEmojis: ${err}`);
+			return [];
+		});
+
+		const emojiNames = emojis.map(emoji => emoji.name);
+
+		await this.usersRepository.update(user.id, { emojis: emojiNames });
 		//#endregion
 
 		await this.updateFeatured(user.id, resolver).catch(err => this.logger.error(err));
@@ -402,7 +400,7 @@ export class ApPersonService implements OnModuleInit {
 		if (uri.startsWith(`${this.config.url}/`)) return;
 
 		//#region このサーバーに既に登録されているか
-		const exist = await this.fetchPerson(uri) as RemoteUser | null;
+		const exist = await this.usersRepository.findOneBy({ uri }) as RemoteUser | null;
 		if (exist === null) return;
 		//#endregion
 
@@ -415,6 +413,12 @@ export class ApPersonService implements OnModuleInit {
 
 		this.logger.info(`Updating the Person: ${person.id}`);
 
+		// アバターとヘッダー画像をフェッチ
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
+			if (img == null) return null;
+			return this.apImageService.resolveImage(exist, img).catch(() => null);
+		}));
+
 		// カスタム絵文字取得
 		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], exist.host).catch(e => {
 			this.logger.info(`extractEmojis: ${e}`);
@@ -450,7 +454,6 @@ export class ApPersonService implements OnModuleInit {
 			movedToUri: person.movedTo ?? null,
 			alsoKnownAs: person.alsoKnownAs ?? null,
 			isExplorable: person.discoverable,
-			...(await this.resolveAvatarAndBanner(exist, person.icon, person.image).catch(() => ({}))),
 		} as Partial<RemoteUser> & Pick<RemoteUser, 'isBot' | 'isCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;
 
 		const moving = ((): boolean => {
@@ -473,6 +476,18 @@ export class ApPersonService implements OnModuleInit {
 
 		if (moving) updates.movedAt = new Date();
 
+		if (avatar) {
+			updates.avatarId = avatar.id;
+			updates.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar');
+			updates.avatarBlurhash = avatar.blurhash;
+		}
+
+		if (banner) {
+			updates.bannerId = banner.id;
+			updates.bannerUrl = this.driveFileEntityService.getPublicUrl(banner);
+			updates.bannerBlurhash = banner.blurhash;
+		}
+
 		// Update user
 		await this.usersRepository.update(exist.id, updates);
 

From ef69eee155d4840d355d3b4d7e3913968f4dcf8e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 21 Jul 2023 11:04:58 +0000
Subject: [PATCH 089/102] =?UTF-8?q?active=E3=81=A7=E3=82=82executeQueue?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index df2b423f39..cae08c8f4b 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -433,7 +433,7 @@ onDeactivated(() => {
 	active.value = false;
 });
 
-watch(visibility, () => {
+watch([active, visibility], () => {
 	if (!backed && active.value && visibility.value === 'visible') {
 		executeQueue();
 	}

From d6e57059e42c28d855aecd71f6bbe47551874642 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 24 Jul 2023 07:19:22 +0000
Subject: [PATCH 090/102] =?UTF-8?q?backed=E3=81=8Cfalse=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=82=89=E9=80=9A=E7=9F=A5=E3=82=92=E6=97=A2?=
 =?UTF-8?q?=E8=AA=AD=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNotifications.vue | 10 ++++++++--
 packages/frontend/src/components/MkPagination.vue    |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index 9b1aa6230e..4498f0f113 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted, onMounted, computed, shallowRef } from 'vue';
+import { onUnmounted, onMounted, computed, shallowRef, watch } from 'vue';
 import MkPagination, { Paging } from '@/components/MkPagination.vue';
 import XNotification from '@/components/MkNotification.vue';
 import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
@@ -50,10 +50,16 @@ const onNotification = (notification) => {
 	}
 
 	if (!isMuted) {
-		pagingComponent.value.prepend(notification);
+		pagingComponent.value?.prepend(notification);
 	}
 };
 
+watch(() => pagingComponent.value?.backed, (backed) => {
+	if (backed === false) {
+		useStream().send('readNotification');
+	}
+});
+
 let connection;
 
 onMounted(() => {
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index cae08c8f4b..257f3c5b71 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -568,6 +568,7 @@ defineExpose({
 	more,
 	inited,
 	queueSize,
+	backed: $$(backed),
 	reload,
 	prepend,
 	append: appendItem,

From c2655690089f7018d69b81a9ade5360487c6923c Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 25 Jul 2023 03:40:42 +0000
Subject: [PATCH 091/102] =?UTF-8?q?adjustScroll=E3=82=92=E3=82=84=E3=81=A3?=
 =?UTF-8?q?=E3=81=B1=E3=82=8A=E5=BE=A9=E6=B4=BB=E3=81=95=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/MkPagination.vue  | 72 ++++++++++++++-----
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 257f3c5b71..38cdf96fc5 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -41,7 +41,7 @@
 import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue';
 import * as misskey from 'misskey-js';
 import * as os from '@/os';
-import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop, scrollBy } from '@/scripts/scroll';
+import { isBottomVisible, isTopVisible, getScrollContainer, scrollToBottom, scrollToTop, scrollBy, scroll, getBodyScrollHeight } from '@/scripts/scroll';
 import { useDocumentVisibility } from '@/scripts/use-document-visibility';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
@@ -242,6 +242,54 @@ watch([$$(weakBacked), $$(contentEl)], () => {
 	})();
 });
 
+function preventDefault(ev: Event) {
+	ev.preventDefault();
+}
+
+/**
+ * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
+ * @param fn DOM操作(unshiftItemsなど)
+ */
+async function adjustScroll(fn: () => void): Promise<void> {
+	if (isWebKit) {
+		// Safariでは描画が微妙になるので一定程度スクロールするだけ
+		scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
+		// backedを強制的にtrueにする
+		backed = true;
+		await nextTick();
+		fn();
+		return await nextTick();
+	}
+
+	await nextTick();
+	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
+	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
+	// スクロールをやめさせる
+	try {
+		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+		scrollableElementOrHtml.addEventListener('wheel', preventDefault, { passive: false });
+		scrollableElementOrHtml.addEventListener('touchmove', preventDefault, { passive: false });
+		// スクロールを強制的に停止
+		scroll(scrollableElement, { top: oldScroll, behavior: 'instant' });
+	} catch (err) {
+		console.error(err, { scrollableElementOrHtml });
+	}
+	fn();
+	return await nextTick(() => {
+		try {
+			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
+			scroll(scrollableElement, { top, behavior: 'instant' });
+			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+			scrollableElementOrHtml.removeEventListener('wheel', preventDefault);
+			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
+		} catch (err) {
+			console.error(err, { scrollableElementOrHtml });
+		}
+		return nextTick();
+	});
+}
+//#endregion
+
 /**
  * 初期化
  * scrollAfterInitなどの後処理もあるので、reload関数を使うべき
@@ -342,7 +390,7 @@ const fetchMore = async (): Promise<void> => {
 			if (i === 10) item._shouldInsertAd_ = true;
 		}
 
-		const reverseConcat = (_res) => concatMapWithArray(items.value, _res);
+		const reverseConcat = (_res) => adjustScroll(() => concatMapWithArray(items.value, _res));
 
 		if (res.length === 0) {
 			if (props.pagination.reversed) {
@@ -503,20 +551,12 @@ async function executeQueue() {
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
 	isPausingUpdateByExecutingQueue.value = true;
-	if (!backed) {
-		// スクロールが先頭の場合
-		// スクロールを進めることでChromeやFirefoxはいい感じにスクロールを調整してくれる
-		scrollBy(scrollableElement, { top: 24, behavior: 'instant' });
-		// 一応backedを強制的にtrueにする
-		backed = true;
-
-		await nextTick();
-	}
-	unshiftItems(
-		queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-		Infinity,
-	);
-	await nextTick();
+	await adjustScroll(() => {
+		unshiftItems(
+			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
+			Infinity,
+		);
+	});
 	items.value = new Map([...items.value].slice(0, displayLimit.value));
 	await nextTick();
 	isPausingUpdateByExecutingQueue.value = false;

From d6c3f34eea974aa1c0aac04d38d2d223d6e512bf Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 25 Jul 2023 04:01:26 +0000
Subject: [PATCH 092/102] :v:

---
 .../frontend/src/components/MkPagination.vue  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 38cdf96fc5..27cd9ebda2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -248,19 +248,10 @@ function preventDefault(ev: Event) {
 
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
+ * Safariでは使わない方がいいかも？
  * @param fn DOM操作(unshiftItemsなど)
  */
 async function adjustScroll(fn: () => void): Promise<void> {
-	if (isWebKit) {
-		// Safariでは描画が微妙になるので一定程度スクロールするだけ
-		scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
-		// backedを強制的にtrueにする
-		backed = true;
-		await nextTick();
-		fn();
-		return await nextTick();
-	}
-
 	await nextTick();
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
@@ -550,13 +541,21 @@ async function executeQueue() {
 	if (isPausingUpdateByExecutingQueue.value) return;
 	const queueArr = Array.from(queue.value.entries());
 	queue.value = new Map(queueArr.slice(props.pagination.limit));
+	const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
 	isPausingUpdateByExecutingQueue.value = true;
-	await adjustScroll(() => {
-		unshiftItems(
-			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-			Infinity,
-		);
-	});
+
+	if (isWebKit) {
+		// Safariでは描画が微妙になるので一定程度スクロールするだけ
+		scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
+		backed = true;
+		await nextTick();
+		unshiftItems(newItems, Infinity);
+		await nextTick();
+	} else {
+		await adjustScroll(() => unshiftItems(newItems, Infinity));
+		backed = true;
+	}
+
 	items.value = new Map([...items.value].slice(0, displayLimit.value));
 	await nextTick();
 	isPausingUpdateByExecutingQueue.value = false;

From 9f4df717e8431e35356388ed497ae8444fa9b0a5 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 25 Jul 2023 10:47:31 +0000
Subject: [PATCH 093/102] =?UTF-8?q?denyMoveTransition=E3=82=92=E5=BE=A9?=
 =?UTF-8?q?=E6=B4=BB=E3=81=95=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNotes.vue         |  3 ++-
 packages/frontend/src/components/MkNotifications.vue |  4 ++--
 packages/frontend/src/components/MkPagination.vue    | 10 ++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index b49c8fa8b7..9c2935d62b 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -7,7 +7,7 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notes }">
+	<template #default="{ items: notes, denyMoveTransition }">
 		<div :class="[$style.root, { [$style.noGap]: noGap }]">
 			<MkDateSeparatedList
 				ref="notes"
@@ -18,6 +18,7 @@
 				:noGap="noGap"
 				:ad="true"
 				:class="$style.notes"
+				:denyMoveTransition="denyMoveTransition"
 			>
 				<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/>
 			</MkDateSeparatedList>
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index 4498f0f113..019890801e 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -7,8 +7,8 @@
 		</div>
 	</template>
 
-	<template #default="{ items: notifications }">
-		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true">
+	<template #default="{ items: notifications, denyMoveTransition }">
+		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="true" :denyMoveTransition="denyMoveTransition">
 			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="`showNotificationAsNote:${notification.id}`" :note="notification.note"/>
 			<XNotification v-else :key="notification.id" :notification="notification" :withTime="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 27cd9ebda2..b726280c00 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -26,7 +26,7 @@
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
-		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching"></slot>
+		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
 		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
 			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
@@ -163,6 +163,7 @@ const scrollableElementOrHtml = $computed(() => scrollableElement ?? document.ge
 const visibility = useDocumentVisibility();
 
 const isPausingUpdateByExecutingQueue = ref(false);
+const denyMoveTransition = ref(false);
 
 //#region scrolling
 const checkFn = props.pagination.reversed ? isBottomVisible : isTopVisible;
@@ -265,6 +266,7 @@ async function adjustScroll(fn: () => void): Promise<void> {
 	} catch (err) {
 		console.error(err, { scrollableElementOrHtml });
 	}
+	denyMoveTransition.value = true;
 	fn();
 	return await nextTick(() => {
 		try {
@@ -276,7 +278,8 @@ async function adjustScroll(fn: () => void): Promise<void> {
 		} catch (err) {
 			console.error(err, { scrollableElementOrHtml });
 		}
-		return nextTick();
+	}).then(() => nextTick()).finally(() => {
+		denyMoveTransition.value = false;
 	});
 }
 //#endregion
@@ -548,17 +551,20 @@ async function executeQueue() {
 		// Safariでは描画が微妙になるので一定程度スクロールするだけ
 		scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
 		backed = true;
+		denyMoveTransition.value = true;
 		await nextTick();
 		unshiftItems(newItems, Infinity);
 		await nextTick();
 	} else {
 		await adjustScroll(() => unshiftItems(newItems, Infinity));
 		backed = true;
+		denyMoveTransition.value = true;
 	}
 
 	items.value = new Map([...items.value].slice(0, displayLimit.value));
 	await nextTick();
 	isPausingUpdateByExecutingQueue.value = false;
+	denyMoveTransition.value = false;
 }
 
 function prependQueue(newItem: MisskeyEntity) {

From 9f79e494f57befc243c7e250f79ed31a7b2355c7 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 26 Jul 2023 07:33:17 +0000
Subject: [PATCH 094/102] yameta

---
 .../frontend/src/components/MkPagination.vue  | 51 ++++++++-----------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index b726280c00..544b81ffea 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -268,16 +268,12 @@ async function adjustScroll(fn: () => void): Promise<void> {
 	}
 	denyMoveTransition.value = true;
 	fn();
-	return await nextTick(() => {
-		try {
-			const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
-			scroll(scrollableElement, { top, behavior: 'instant' });
-			// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
-			scrollableElementOrHtml.removeEventListener('wheel', preventDefault);
-			scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
-		} catch (err) {
-			console.error(err, { scrollableElementOrHtml });
-		}
+	return await nextTick().then(() => {
+		const top = oldScroll + ((scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight()) - oldHeight);
+		scroll(scrollableElement, { top, behavior: 'instant' });
+		// なぜかscrollableElementOrHtmlがundefinedであるというエラーが出る
+		scrollableElementOrHtml.removeEventListener('wheel', preventDefault);
+		scrollableElementOrHtml.removeEventListener('touchmove', preventDefault);
 	}).then(() => nextTick()).finally(() => {
 		denyMoveTransition.value = false;
 	});
@@ -523,7 +519,7 @@ const prepend = (item: MisskeyEntity): void => {
  */
 function unshiftItems(newItems: MisskeyEntity[], limit = displayLimit.value) {
 	const length = newItems.length + items.value.size;
-	items.value = new Map([...arrayToEntries(newItems), ...items.value].slice(0, limit));
+	items.value = new Map([...arrayToEntries(newItems), ...(newItems.length >= limit ? [] : items.value)].slice(0, limit));
 
 	if (length >= limit) more.value = true;
 }
@@ -542,29 +538,26 @@ function concatItems(oldItems: MisskeyEntity[]) {
 async function executeQueue() {
 	if (queue.value.size === 0) return;
 	if (isPausingUpdateByExecutingQueue.value) return;
-	const queueArr = Array.from(queue.value.entries());
-	queue.value = new Map(queueArr.slice(props.pagination.limit));
-	const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
-	isPausingUpdateByExecutingQueue.value = true;
-
 	if (isWebKit) {
-		// Safariでは描画が微妙になるので一定程度スクロールするだけ
-		scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
-		backed = true;
-		denyMoveTransition.value = true;
-		await nextTick();
-		unshiftItems(newItems, Infinity);
-		await nextTick();
+		// Safariは最新のアイテムにするだけ
+		const newItems = Array.from(queue.value.values()).slice(-1 * props.pagination.limit);
+		unshiftItems(newItems);
+		queue.value = new Map();
 	} else {
+		const queueArr = Array.from(queue.value.entries());
+		queue.value = new Map(queueArr.slice(props.pagination.limit));
+		const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
+		isPausingUpdateByExecutingQueue.value = true;
+
 		await adjustScroll(() => unshiftItems(newItems, Infinity));
 		backed = true;
-		denyMoveTransition.value = true;
-	}
 
-	items.value = new Map([...items.value].slice(0, displayLimit.value));
-	await nextTick();
-	isPausingUpdateByExecutingQueue.value = false;
-	denyMoveTransition.value = false;
+		denyMoveTransition.value = true;
+		items.value = new Map([...items.value].slice(0, displayLimit.value));
+		await nextTick();
+		isPausingUpdateByExecutingQueue.value = false;
+		denyMoveTransition.value = false;
+	}
 }
 
 function prependQueue(newItem: MisskeyEntity) {

From 4785b9bfdd0e8f32a01396465771fa0adc891db7 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 26 Jul 2023 12:22:26 +0000
Subject: [PATCH 095/102] timelineBackTopBehavior

---
 locales/index.d.ts                             |  5 +++++
 locales/ja-JP.yml                              |  5 +++++
 .../frontend/src/components/MkPagination.vue   | 11 +++++------
 .../frontend/src/pages/settings/general.vue    | 18 ++++++++++++++----
 .../src/pages/settings/preferences-backups.vue |  1 +
 packages/frontend/src/scripts/useragent.ts     |  3 +++
 packages/frontend/src/store.ts                 |  5 +++++
 7 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 packages/frontend/src/scripts/useragent.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 400fc7e584..e9911d0f49 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1097,6 +1097,7 @@ export interface Locale {
     "doYouAgree": string;
     "beSureToReadThisAsItIsImportant": string;
     "iHaveReadXCarefullyAndAgree": string;
+    "timelineBackTopBehavior": string;
     "_initialAccountSetting": {
         "accountCreated": string;
         "letsStartAccountSetup": string;
@@ -1637,6 +1638,10 @@ export interface Locale {
         "dialog": string;
         "quiet": string;
     };
+    "_timelineBackTopBehavior": {
+        "newest": string;
+        "next": string;
+    };
     "_channel": {
         "create": string;
         "edit": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e6b980a4d1..807f2d535a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1094,6 +1094,7 @@ expired: "期限切れ"
 doYouAgree: "同意しますか？"
 beSureToReadThisAsItIsImportant: "重要ですので必ずお読みください。"
 iHaveReadXCarefullyAndAgree: "「{x}」の内容をよく読み、同意します。"
+timelineBackTopBehavior: "タイムラインのスクロールが先頭に戻った時の挙動"
 
 _initialAccountSetting:
   accountCreated: "アカウントの作成が完了しました！"
@@ -1555,6 +1556,10 @@ _serverDisconnectedBehavior:
   dialog: "ダイアログで警告"
   quiet: "控えめに警告"
 
+_timelineBackTopBehavior:
+  newest: "最新の投稿を表示"
+  next: "次の投稿を遡る"
+
 _channel:
   create: "チャンネルを作成"
   edit: "チャンネルを編集"
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 544b81ffea..71b47473c1 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -47,7 +47,7 @@ import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store';
 import { MisskeyEntity } from '@/types/date-separated-list';
 import { i18n } from '@/i18n';
-import { UAParser } from 'ua-parser-js';
+import { isWebKit } from '@/scripts/useragent';
 
 const SECOND_FETCH_LIMIT = 30;
 const TOLERANCE = 6;
@@ -94,8 +94,7 @@ function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): M
 	return new Map([...map, ...arrayToEntries(entities)]);
 }
 
-const ua = new UAParser(navigator.userAgent);
-const isWebKit = ua.getEngine().name === 'WebKit';
+const timelineBackTopBehavior = computed(() => isWebKit() ? 'newest' : defaultStore.reactiveState.timelineBackTopBehavior.value);
 </script>
 <script lang="ts" setup>
 import { infoImageUrl } from '@/instance';
@@ -200,7 +199,7 @@ watch([$$(rootEl), $$(scrollObserver)], () => {
  * weakBackedがtrue→falseになったらexecuteQueue
  */
 watch($$(weakBacked), () => {
-	if (!isWebKit && !weakBacked) {
+	if (timelineBackTopBehavior.value === 'next' && !weakBacked) {
 		executeQueue();
 	}
 });
@@ -499,7 +498,7 @@ const prepend = (item: MisskeyEntity): void => {
 			// かなりスクロールの先頭にいる場合
 			if (items.value.has(item.id)) return; // 既にタイムラインにある場合は何もしない
 			unshiftItems([item]);
-		} else if (!isWebKit && !weakBacked) {
+		} else if (timelineBackTopBehavior.value === 'next' && !weakBacked) {
 			// ちょっと先頭にいる場合はスクロールを調整する
 			prependQueue(item);
 			executeQueue();
@@ -538,7 +537,7 @@ function concatItems(oldItems: MisskeyEntity[]) {
 async function executeQueue() {
 	if (queue.value.size === 0) return;
 	if (isPausingUpdateByExecutingQueue.value) return;
-	if (isWebKit) {
+	if (timelineBackTopBehavior === 'newest') {
 		// Safariは最新のアイテムにするだけ
 		const newItems = Array.from(queue.value.values()).slice(-1 * props.pagination.limit);
 		unshiftItems(newItems);
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 31a288745e..dd3ba63eab 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -21,10 +21,18 @@
 	</MkRadios>
 
 	<FormSection>
-		<div class="_gaps_s">
-			<MkSwitch v-model="showFixedPostForm">{{ i18n.ts.showFixedPostForm }}</MkSwitch>
-			<MkSwitch v-model="showFixedPostFormInChannel">{{ i18n.ts.showFixedPostFormInChannel }}</MkSwitch>
-			<MkSwitch v-model="showTimelineReplies">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></MkSwitch>
+		<div class="_gaps_m">
+			<div class="_gaps_s">
+				<MkSwitch v-model="showFixedPostForm">{{ i18n.ts.showFixedPostForm }}</MkSwitch>
+				<MkSwitch v-model="showFixedPostFormInChannel">{{ i18n.ts.showFixedPostFormInChannel }}</MkSwitch>
+				<MkSwitch v-model="showTimelineReplies">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></MkSwitch>
+			</div>
+
+			<MkSelect v-model="timelineBackTopBehavior" :disabled="isWebKit()">
+				<template #label>{{ i18n.ts.timelineBackTopBehavior }}</template>
+				<option value="newest">{{ i18n.ts._timelineBackTopBehavior.newest }}</option>
+				<option value="next">{{ i18n.ts._timelineBackTopBehavior.next }}</option>
+			</MkSelect>
 		</div>
 	</FormSection>
 
@@ -180,6 +188,7 @@ import { unisonReload } from '@/scripts/unison-reload';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { miLocalStorage } from '@/local-storage';
+import { isWebKit } from '@/scripts/useragent';
 
 const lang = ref(miLocalStorage.getItem('lang'));
 const fontSize = ref(miLocalStorage.getItem('fontSize'));
@@ -226,6 +235,7 @@ const mediaListWithOneImageAppearance = computed(defaultStore.makeGetterSetter('
 const notificationPosition = computed(defaultStore.makeGetterSetter('notificationPosition'));
 const notificationStackAxis = computed(defaultStore.makeGetterSetter('notificationStackAxis'));
 const showTimelineReplies = computed(defaultStore.makeGetterSetter('showTimelineReplies'));
+const timelineBackTopBehavior = computed(defaultStore.makeGetterSetter('timelineBackTopBehavior'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index 1aa1a5f81c..423331369f 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -87,6 +87,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'numberOfPageCache',
 	'aiChanMode',
 	'mediaListWithOneImageAppearance',
+	'timelineBackTopBehavior',
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	'lightTheme',
diff --git a/packages/frontend/src/scripts/useragent.ts b/packages/frontend/src/scripts/useragent.ts
new file mode 100644
index 0000000000..1a46637606
--- /dev/null
+++ b/packages/frontend/src/scripts/useragent.ts
@@ -0,0 +1,3 @@
+import { UAParser } from 'ua-parser-js';
+const ua = new UAParser(navigator.userAgent);
+export const isWebKit = () => ua.getEngine().name === 'WebKit';
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 6ba05c36ab..85588f0088 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -1,5 +1,6 @@
 import { markRaw, ref } from 'vue';
 import { Storage } from './pizzax';
+import { isWebKit } from './scripts/useragent';
 
 interface PostFormAction {
 	title: string,
@@ -342,6 +343,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: {} as Record<string, Record<string, string[]>>,
 	},
+	timelineBackTopBehavior: {
+		where: 'device',
+		default: (isWebKit() ? 'newest' : 'next') as 'newest' | 'next',
+	},
 }));
 
 // TODO: 他のタブと永続化されたstateを同期

From f7ddff7475111f7ac4f7cba45a645aa7ed4ef196 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 26 Jul 2023 12:48:34 +0000
Subject: [PATCH 096/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 71b47473c1..c04d43e1cb 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -537,7 +537,7 @@ function concatItems(oldItems: MisskeyEntity[]) {
 async function executeQueue() {
 	if (queue.value.size === 0) return;
 	if (isPausingUpdateByExecutingQueue.value) return;
-	if (timelineBackTopBehavior === 'newest') {
+	if (timelineBackTopBehavior.value === 'newest') {
 		// Safariは最新のアイテムにするだけ
 		const newItems = Array.from(queue.value.values()).slice(-1 * props.pagination.limit);
 		unshiftItems(newItems);

From ae949af6c3f39010bfc84fe40b0f95d87cd51455 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 26 Jul 2023 12:59:59 +0000
Subject: [PATCH 097/102] fix

---
 packages/frontend/src/pages/settings/general.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index dd3ba63eab..3de5375708 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -28,7 +28,7 @@
 				<MkSwitch v-model="showTimelineReplies">{{ i18n.ts.flagShowTimelineReplies }}<template #caption>{{ i18n.ts.flagShowTimelineRepliesDescription }} {{ i18n.ts.reflectMayTakeTime }}</template></MkSwitch>
 			</div>
 
-			<MkSelect v-model="timelineBackTopBehavior" :disabled="isWebKit()">
+			<MkSelect v-model="timelineBackTopBehavior" :disabled="isWebKit()" :readonly="isWebKit()">
 				<template #label>{{ i18n.ts.timelineBackTopBehavior }}</template>
 				<option value="newest">{{ i18n.ts._timelineBackTopBehavior.newest }}</option>
 				<option value="next">{{ i18n.ts._timelineBackTopBehavior.next }}</option>

From d92fe0803ce741a82e5c0e83d6788814f64586b4 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 28 Jul 2023 15:57:34 +0000
Subject: [PATCH 098/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index c04d43e1cb..7f3ea7bc72 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -535,7 +535,10 @@ function concatItems(oldItems: MisskeyEntity[]) {
 }
 
 async function executeQueue() {
-	if (queue.value.size === 0) return;
+	// キューが空の場合でも古いアイテムをタイムライン表示数を制限する必要がある
+	// ため続行する！
+	// if (queue.value.size === 0) return;
+
 	if (isPausingUpdateByExecutingQueue.value) return;
 	if (timelineBackTopBehavior.value === 'newest') {
 		// Safariは最新のアイテムにするだけ

From 7fc2309822588f597cb520f880ae52478bf45dd2 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 28 Jul 2023 15:58:00 +0000
Subject: [PATCH 099/102] fix comment

---
 packages/frontend/src/components/MkPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 7f3ea7bc72..d172d4c1e1 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -535,7 +535,7 @@ function concatItems(oldItems: MisskeyEntity[]) {
 }
 
 async function executeQueue() {
-	// キューが空の場合でも古いアイテムをタイムライン表示数を制限する必要がある
+	// キューが空の場合でもタイムライン表示数を制限する役割がある
 	// ため続行する！
 	// if (queue.value.size === 0) return;
 

From f3da1bcbbd5fe2eb896e5de789378ee489deb1ba Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 30 Jul 2023 13:56:11 +0000
Subject: [PATCH 100/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index d172d4c1e1..b90fe37cf2 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -546,13 +546,15 @@ async function executeQueue() {
 		unshiftItems(newItems);
 		queue.value = new Map();
 	} else {
-		const queueArr = Array.from(queue.value.entries());
-		queue.value = new Map(queueArr.slice(props.pagination.limit));
-		const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
-		isPausingUpdateByExecutingQueue.value = true;
+		if (queue.value.size > 0) {
+			const queueArr = Array.from(queue.value.entries());
+			queue.value = new Map(queueArr.slice(props.pagination.limit));
+			const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
+			isPausingUpdateByExecutingQueue.value = true;
 
-		await adjustScroll(() => unshiftItems(newItems, Infinity));
-		backed = true;
+			await adjustScroll(() => unshiftItems(newItems, Infinity));
+			backed = true;
+		}
 
 		denyMoveTransition.value = true;
 		items.value = new Map([...items.value].slice(0, displayLimit.value));

From 0449c1a7eaf2b4389e8751932f0cfbef37589476 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 31 Jul 2023 01:33:25 +0000
Subject: [PATCH 101/102] prividingItems

---
 packages/frontend/src/components/MkPagination.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index b90fe37cf2..5a4930f9b6 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -26,7 +26,7 @@
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
-		<slot :items="Array.from(items.values())" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
+		<slot :items="prividingItems" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
 		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
 			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
@@ -123,6 +123,7 @@ let scrollRemove = $ref<(() => void) | null>(null);
  * 最新が0番目
  */
 const items = ref<MisskeyEntityMap>(new Map());
+const prividingItems = computed(() => Array.from(items.value.values()));
 
 /**
  * タブが非アクティブなどの場合に更新を貯めておく

From f34bcf0c1d8bb34da0f747cecadc99bb2118e85a Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 24 Aug 2023 06:34:30 +0000
Subject: [PATCH 102/102] fix

---
 packages/frontend/src/components/MkPagination.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 6e116d382c..5340f70f00 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 >
 	<MkLoading v-if="fetching"/>
 
-	<MkError v-else-if="error" @retry="reload()"/>
+	<MkError v-else-if="empty && error" @retry="reload()"/>
 
 	<div v-else-if="empty" key="_empty_" class="empty">
 		<slot name="empty">
@@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkButton>
 			<MkLoading v-else class="loading"/>
 		</div>
-		<slot :items="prividingItems" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
+		<slot :items="providingItems" :fetching="fetching || moreFetching" :denyMoveTransition="denyMoveTransition"></slot>
 		<div v-show="!pagination.reversed && more" key="_more_" class="_margin">
 			<MkButton v-if="!moreFetching" v-appear="(enableInfiniteScroll && !props.disableAutoLoad) ? appearFetchMore : null" :class="$style.more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary rounded @click="fetchMore">
 				{{ i18n.ts.loadMore }}
@@ -128,7 +128,7 @@ let scrollRemove = $ref<(() => void) | null>(null);
  * 最新が0番目
  */
 const items = ref<MisskeyEntityMap>(new Map());
-const prividingItems = computed(() => Array.from(items.value.values()));
+const providingItems = computed(() => Array.from(items.value.values()));
 
 /**
  * タブが非アクティブなどの場合に更新を貯めておく