From c8fc470e4eaeb1f9e939a7568097e36669933a35 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 19 Jan 2023 16:33:14 -0800
Subject: [PATCH] Revert "hopefully this fixed chat updates"

This reverts commit bbbfbc1061fbced2c8ccf4879597305ab0d89157.
---
 packages/backend/src/misc/reaction-lib.ts     |   2 +-
 .../client/src/components/MkPagination.vue    | 622 +++++++++---------
 packages/client/src/pages/messaging/index.vue |  11 +-
 3 files changed, 311 insertions(+), 324 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 5fe404b880..c0a5e8e2fb 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -68,7 +68,7 @@ export async function toDbReaction(
 	const match = emojiRegex.exec(reaction);
 	if (match) {
 		const unicode = match[0];
-		return unicode.match('\u200d') ? unicode : unicode.replace(/\ufe0f/g, '');
+		return unicode.match("\u200d") ? unicode : unicode.replace(/\ufe0f/g, "");
 	}
 
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index 67634b8ec8..5b71598c0b 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -1,13 +1,13 @@
 <template>
 	<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-		<MkLoading v-if="fetching" />
+		<MkLoading v-if="fetching"/>
 
-		<MkError v-else-if="error" @retry="init()" />
+		<MkError v-else-if="error" @retry="init()"/>
 
 		<div v-else-if="empty" key="_empty_" class="empty">
 			<slot name="empty">
 				<div class="_fullinfo">
-					<img src="/static-assets/badges/info.png" class="_ghost" alt="Error" />
+					<img src="/static-assets/badges/info.png" class="_ghost" alt="Error"/>
 					<div>{{ i18n.ts.nothing }}</div>
 				</div>
 			</slot>
@@ -15,349 +15,343 @@
 
 		<div v-else ref="rootEl">
 			<div v-show="pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
-				<MkButton v-if="!moreFetching" class="button" :disabled="moreFetching"
-					:style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
+				<MkButton v-if="!moreFetching" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
 					{{ i18n.ts.loadMore }}
 				</MkButton>
-				<MkLoading v-else class="loading" />
+				<MkLoading v-else class="loading"/>
 			</div>
 			<slot :items="items"></slot>
 			<div v-show="!pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
-				<MkButton v-if="!moreFetching"
-					v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button"
-					:disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
+				<MkButton v-if="!moreFetching" v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
 					{{ i18n.ts.loadMore }}
 				</MkButton>
-				<MkLoading v-else class="loading" />
+				<MkLoading v-else class="loading"/>
 			</div>
 		</div>
 	</transition>
-</template>
+	</template>
 
-<script lang="ts" setup>
-import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref, ref, watch } from 'vue';
-import * as calckey from 'calckey-js';
-import * as os from '@/os';
-import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
-import MkButton from '@/components/MkButton.vue';
-import { i18n } from '@/i18n';
+	<script lang="ts" setup>
+	import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref, ref, watch } from 'vue';
+	import * as misskey from 'calckey-js';
+	import * as os from '@/os';
+	import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
+	import MkButton from '@/components/MkButton.vue';
+	import { i18n } from '@/i18n';
 
-export type Paging<E extends keyof calckey.Endpoints = keyof calckey.Endpoints> = {
-	endpoint: E;
-	limit: number;
-	params?: calckey.Endpoints[E]['req'] | ComputedRef<calckey.Endpoints[E]['req']>;
+	export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = {
+		endpoint: E;
+		limit: number;
+		params?: misskey.Endpoints[E]['req'] | ComputedRef<misskey.Endpoints[E]['req']>;
 
-	/**
-	 * When using non-pageable endpoints, such as the search API
-	 * (though it is somewhat inconsistent to use such an API with this function)
-	 */
-	noPaging?: boolean;
+		/**
+		 * 検索APIのような、ページング不可なエンドポイントを利用する場合
+		 * (そのようなAPIをこの関数で使うのは若干矛盾してるけど)
+		 */
+		noPaging?: boolean;
 
-	/**
-	 * array items in reverse order (newest first)
-	 */
-	reversed?: boolean;
+		/**
+		 * items 配列の中身を逆順にする(新しい方が最後)
+		 */
+		reversed?: boolean;
 
-	offsetMode?: boolean;
-};
+		offsetMode?: boolean;
+	};
 
-const SECOND_FETCH_LIMIT = 30;
+	const SECOND_FETCH_LIMIT = 30;
 
-const props = withDefaults(defineProps<{
-	pagination: Paging;
-	disableAutoLoad?: boolean;
-	displayLimit?: number;
-	externalItemArray?: Ref<Array<any>>;
-}>(), {
-	displayLimit: 30,
-});
+	const props = withDefaults(defineProps<{
+		pagination: Paging;
+		disableAutoLoad?: boolean;
+		displayLimit?: number;
+	}>(), {
+		displayLimit: 30,
+	});
 
-const emit = defineEmits<{
-	(ev: 'queue', count: number): void;
-}>();
+	const emit = defineEmits<{
+		(ev: 'queue', count: number): void;
+	}>();
 
-type Item = { id: string;[another: string]: unknown; };
+	type Item = { id: string; [another: string]: unknown; };
 
-const rootEl = ref<HTMLElement>();
-const items = ref<Item[]>([]);
-const queue = ref<Item[]>([]);
-const offset = ref(0);
-const fetching = ref(true);
-const moreFetching = ref(false);
-const more = ref(false);
-const backed = ref(false); // 遡り中か否か
-const isBackTop = ref(false);
-const empty = computed(() => items.value.length === 0);
-const error = ref(false);
+	const rootEl = ref<HTMLElement>();
+	const items = ref<Item[]>([]);
+	const queue = ref<Item[]>([]);
+	const offset = ref(0);
+	const fetching = ref(true);
+	const moreFetching = ref(false);
+	const more = ref(false);
+	const backed = ref(false); // 遡り中か否か
+	const isBackTop = ref(false);
+	const empty = computed(() => items.value.length === 0);
+	const error = ref(false);
 
-const init = async (): Promise<void> => {
-	queue.value = [];
-	fetching.value = true;
-	const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-	await os.api(props.pagination.endpoint, {
-		...(params as object),
-		limit: props.pagination.noPaging ? (props.pagination.limit || 10) : (props.pagination.limit || 10) + 1,
-	}).then(res => {
-		for (let i = 0; i < res.length; i++) {
-			const item = res[i];
-			if (props.pagination.reversed) {
-				if (i === res.length - 2) item._shouldInsertAd_ = true;
-			} else {
-				if (i === 3) item._shouldInsertAd_ = true;
+	const init = async (): Promise<void> => {
+		queue.value = [];
+		fetching.value = true;
+		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
+		await os.api(props.pagination.endpoint, {
+			...params,
+			limit: props.pagination.noPaging ? (props.pagination.limit || 10) : (props.pagination.limit || 10) + 1,
+		}).then(res => {
+			for (let i = 0; i < res.length; i++) {
+				const item = res[i];
+				if (props.pagination.reversed) {
+					if (i === res.length - 2) item._shouldInsertAd_ = true;
+				} else {
+					if (i === 3) item._shouldInsertAd_ = true;
+				}
 			}
-		}
-		if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
-			res.pop();
-			items.value = props.pagination.reversed ? [...res].reverse() : res;
-			more.value = true;
-		} else {
-			items.value = props.pagination.reversed ? [...res].reverse() : res;
-			more.value = false;
-		}
-		offset.value = res.length;
-		error.value = false;
-		fetching.value = false;
-	}, err => {
-		error.value = true;
-		fetching.value = false;
-	});
-};
-
-const reload = (): void => {
-	items.value = [];
-	init();
-};
-
-const refresh = async (): Promise<void> => {
-	const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-	await os.api(props.pagination.endpoint, {
-		...(params as object),
-		limit: items.value.length + 1,
-		offset: 0,
-	}).then(res => {
-		let ids = items.value.reduce((a, b) => {
-			a[b.id] = true;
-			return a;
-		}, {} as { [id: string]: boolean; });
-
-		for (let i = 0; i < res.length; i++) {
-			const item = res[i];
-			if (!updateItem(item.id, old => item)) {
-				append(item);
-			}
-			delete ids[item.id];
-		}
-
-		for (const id in ids) {
-			removeItem(i => i.id === id);
-		}
-	}, err => {
-		error.value = true;
-		fetching.value = false;
-	});
-};
-
-const fetchMore = async (): Promise<void> => {
-	if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
-	moreFetching.value = true;
-	backed.value = true;
-	const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-	await os.api(props.pagination.endpoint, {
-		...(params as object),
-		limit: SECOND_FETCH_LIMIT + 1,
-		...(props.pagination.offsetMode ? {
-			offset: offset.value,
-		} : props.pagination.reversed ? {
-			sinceId: items.value[0].id,
-		} : {
-			untilId: items.value[items.value.length - 1].id,
-		}),
-	}).then(res => {
-		for (let i = 0; i < res.length; i++) {
-			const item = res[i];
-			if (props.pagination.reversed) {
-				if (i === res.length - 9) item._shouldInsertAd_ = true;
+			if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
+				res.pop();
+				items.value = props.pagination.reversed ? [...res].reverse() : res;
+				more.value = true;
 			} else {
-				if (i === 10) item._shouldInsertAd_ = true;
+				items.value = props.pagination.reversed ? [...res].reverse() : res;
+				more.value = false;
 			}
-		}
-		if (res.length > SECOND_FETCH_LIMIT) {
-			res.pop();
-			items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-			more.value = true;
-		} else {
-			items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-			more.value = false;
-		}
-		offset.value += res.length;
-		moreFetching.value = false;
-	}, err => {
-		moreFetching.value = false;
-	});
-};
+			offset.value = res.length;
+			error.value = false;
+			fetching.value = false;
+		}, err => {
+			error.value = true;
+			fetching.value = false;
+		});
+	};
 
-const fetchMoreAhead = async (): Promise<void> => {
-	if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
-	moreFetching.value = true;
-	const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
-	await os.api(props.pagination.endpoint, {
-		...(params as object),
-		limit: SECOND_FETCH_LIMIT + 1,
-		...(props.pagination.offsetMode ? {
-			offset: offset.value,
-		} : props.pagination.reversed ? {
-			untilId: items.value[0].id,
-		} : {
-			sinceId: items.value[items.value.length - 1].id,
-		}),
-	}).then(res => {
-		if (res.length > SECOND_FETCH_LIMIT) {
-			res.pop();
-			items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-			more.value = true;
-		} else {
-			items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
-			more.value = false;
-		}
-		offset.value += res.length;
-		moreFetching.value = false;
-	}, err => {
-		moreFetching.value = false;
-	});
-};
+	const reload = (): void => {
+		items.value = [];
+		init();
+	};
 
-const prepend = (item: Item): void => {
-	if (props.pagination.reversed) {
-		if (rootEl.value) {
-			const container = getScrollContainer(rootEl.value);
-			if (container == null) {
-				// TODO?
+	const refresh = async (): void => {
+		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
+		await os.api(props.pagination.endpoint, {
+			...params,
+			limit: items.value.length + 1,
+			offset: 0,
+		}).then(res => {
+			let ids = items.value.reduce((a, b) => {
+				a[b.id] = true;
+				return a;
+			}, {} as { [id: string]: boolean; });
+
+			for (let i = 0; i < res.length; i++) {
+				const item = res[i];
+				if (!updateItem(item.id, old => item)) {
+					append(item);
+				}
+				delete ids[item.id];
+			}
+
+			for (const id in ids) {
+				removeItem(i => i.id === id);
+			}
+		}, err => {
+			error.value = true;
+			fetching.value = false;
+		});
+	};
+
+	const fetchMore = async (): Promise<void> => {
+		if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
+		moreFetching.value = true;
+		backed.value = true;
+		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
+		await os.api(props.pagination.endpoint, {
+			...params,
+			limit: SECOND_FETCH_LIMIT + 1,
+			...(props.pagination.offsetMode ? {
+				offset: offset.value,
+			} : props.pagination.reversed ? {
+				sinceId: items.value[0].id,
+			} : {
+				untilId: items.value[items.value.length - 1].id,
+			}),
+		}).then(res => {
+			for (let i = 0; i < res.length; i++) {
+				const item = res[i];
+				if (props.pagination.reversed) {
+					if (i === res.length - 9) item._shouldInsertAd_ = true;
+				} else {
+					if (i === 10) item._shouldInsertAd_ = true;
+				}
+			}
+			if (res.length > SECOND_FETCH_LIMIT) {
+				res.pop();
+				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
+				more.value = true;
 			} else {
-				const pos = getScrollPosition(rootEl.value);
-				const viewHeight = container.clientHeight;
-				const height = container.scrollHeight;
-				const isBottom = (pos + viewHeight > height - 32);
-				if (isBottom) {
-					// オーバーフローしたら古いアイテムは捨てる
-					if (items.value.length >= props.displayLimit) {
-						// このやり方だとVue 3.2以降アニメーションが動かなくなる
-						//items.value = items.value.slice(-props.displayLimit);
-						while (items.value.length >= props.displayLimit) {
-							items.value.shift();
+				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
+				more.value = false;
+			}
+			offset.value += res.length;
+			moreFetching.value = false;
+		}, err => {
+			moreFetching.value = false;
+		});
+	};
+
+	const fetchMoreAhead = async (): Promise<void> => {
+		if (!more.value || fetching.value || moreFetching.value || items.value.length === 0) return;
+		moreFetching.value = true;
+		const params = props.pagination.params ? isRef(props.pagination.params) ? props.pagination.params.value : props.pagination.params : {};
+		await os.api(props.pagination.endpoint, {
+			...params,
+			limit: SECOND_FETCH_LIMIT + 1,
+			...(props.pagination.offsetMode ? {
+				offset: offset.value,
+			} : props.pagination.reversed ? {
+				untilId: items.value[0].id,
+			} : {
+				sinceId: items.value[items.value.length - 1].id,
+			}),
+		}).then(res => {
+			if (res.length > SECOND_FETCH_LIMIT) {
+				res.pop();
+				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
+				more.value = true;
+			} else {
+				items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
+				more.value = false;
+			}
+			offset.value += res.length;
+			moreFetching.value = false;
+		}, err => {
+			moreFetching.value = false;
+		});
+	};
+
+	const prepend = (item: Item): void => {
+		if (props.pagination.reversed) {
+			if (rootEl.value) {
+				const container = getScrollContainer(rootEl.value);
+				if (container == null) {
+					// TODO?
+				} else {
+					const pos = getScrollPosition(rootEl.value);
+					const viewHeight = container.clientHeight;
+					const height = container.scrollHeight;
+					const isBottom = (pos + viewHeight > height - 32);
+					if (isBottom) {
+						// オーバーフローしたら古いアイテムは捨てる
+						if (items.value.length >= props.displayLimit) {
+							// このやり方だとVue 3.2以降アニメーションが動かなくなる
+							//items.value = items.value.slice(-props.displayLimit);
+							while (items.value.length >= props.displayLimit) {
+								items.value.shift();
+							}
+							more.value = true;
 						}
-						more.value = true;
 					}
 				}
 			}
-		}
-		items.value.push(item);
-		// TODO
-	} else {
-		// 初回表示時はunshiftだけでOK
-		if (!rootEl.value) {
-			items.value.unshift(item);
-			return;
-		}
-
-		const isTop = isBackTop.value || (document.body.contains(rootEl.value) && isTopVisible(rootEl.value));
-
-		if (isTop) {
-			// Prepend the item
-			items.value.unshift(item);
-
-			// オーバーフローしたら古いアイテムは捨てる
-			if (items.value.length >= props.displayLimit) {
-				// このやり方だとVue 3.2以降アニメーションが動かなくなる
-				//this.items = items.value.slice(0, props.displayLimit);
-				while (items.value.length >= props.displayLimit) {
-					items.value.pop();
-				}
-				more.value = true;
-			}
+			items.value.push(item);
+			// TODO
 		} else {
-			queue.value.push(item);
-			onScrollTop(rootEl.value, () => {
-				for (const queueItem of queue.value) {
-					prepend(queueItem);
+			// 初回表示時はunshiftだけでOK
+			if (!rootEl.value) {
+				items.value.unshift(item);
+				return;
+			}
+
+			const isTop = isBackTop.value || (document.body.contains(rootEl.value) && isTopVisible(rootEl.value));
+
+			if (isTop) {
+				// Prepend the item
+				items.value.unshift(item);
+
+				// オーバーフローしたら古いアイテムは捨てる
+				if (items.value.length >= props.displayLimit) {
+					// このやり方だとVue 3.2以降アニメーションが動かなくなる
+					//this.items = items.value.slice(0, props.displayLimit);
+					while (items.value.length >= props.displayLimit) {
+						items.value.pop();
+					}
+					more.value = true;
 				}
-				queue.value = [];
-			});
+			} else {
+				queue.value.push(item);
+				onScrollTop(rootEl.value, () => {
+					for (const queueItem of queue.value) {
+						prepend(queueItem);
+					}
+					queue.value = [];
+				});
+			}
+		}
+	};
+
+	const append = (item: Item): void => {
+		items.value.push(item);
+	};
+
+	const removeItem = (finder: (item: Item) => boolean): boolean => {
+		const i = items.value.findIndex(finder);
+		if (i === -1) {
+			return false;
+		}
+
+		items.value.splice(i, 1);
+		return true;
+	};
+
+	const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
+		const i = items.value.findIndex(item => item.id === id);
+		if (i === -1) {
+			return false;
+		}
+
+		items.value[i] = replacer(items.value[i]);
+		return true;
+	};
+
+	if (props.pagination.params && isRef(props.pagination.params)) {
+		watch(props.pagination.params, init, { deep: true });
+	}
+
+	watch(queue, (a, b) => {
+		if (a.length === 0 && b.length === 0) return;
+		emit('queue', queue.value.length);
+	}, { deep: true });
+
+	init();
+
+	onActivated(() => {
+		isBackTop.value = false;
+	});
+
+	onDeactivated(() => {
+		isBackTop.value = window.scrollY === 0;
+	});
+
+	defineExpose({
+		items,
+		queue,
+		backed,
+		reload,
+		refresh,
+		prepend,
+		append,
+		removeItem,
+		updateItem,
+	});
+	</script>
+
+	<style lang="scss" scoped>
+	.fade-enter-active,
+	.fade-leave-active {
+		transition: opacity 0.125s ease;
+	}
+	.fade-enter-from,
+	.fade-leave-to {
+		opacity: 0;
+	}
+
+	.cxiknjgy {
+		> .button {
+			margin-left: auto;
+			margin-right: auto;
 		}
 	}
-};
-
-const append = (item: Item): void => {
-	items.value.push(item);
-};
-
-const removeItem = (finder: (item: Item) => boolean): boolean => {
-	const i = items.value.findIndex(finder);
-	const j = props.externalItemArray?.findIndex(finder);
-		return false;
-	}
-
-	items.value.splice(i, 1);
-	return true;
-};
-
-const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
-	const i = items.value.findIndex(item => item.id === id);
-	const j = props.externalItemArray?.findIndex(item => item.id === id);
-	if (i === -1 && j === -1) {
-		return false;
-	}
-
-	items.value[i] = replacer(items.value[i]);
-	return true;
-};
-
-if (props.pagination.params && isRef(props.pagination.params)) {
-	watch(props.pagination.params, init, { deep: true });
-}
-
-watch(queue, (a, b) => {
-	if (a.length === 0 && b.length === 0) return;
-	emit('queue', queue.value.length);
-}, { deep: true });
-
-init();
-
-onActivated(() => {
-	isBackTop.value = false;
-});
-
-onDeactivated(() => {
-	isBackTop.value = window.scrollY === 0;
-});
-
-defineExpose({
-	items,
-	queue,
-	backed,
-	reload,
-	refresh,
-	prepend,
-	append,
-	removeItem,
-	updateItem,
-});
-</script>
-
-<style lang="scss" scoped>
-.fade-enter-active,
-.fade-leave-active {
-	transition: opacity 0.15s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-	opacity: 0;
-}
-
-.cxiknjgy {
-	>.button {
-		margin-left: auto;
-		margin-right: auto;
-	}
-}
-</style>
+	</style>
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 3798ec6f87..af2baf8525 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, watch, ref } from 'vue';
+import { markRaw, onMounted, onUnmounted, watch } from 'vue';
 import * as Acct from 'calckey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -59,16 +59,11 @@ const router = useRouter();
 
 let messages = $ref([]);
 let connection = $ref(null);
-const reloadingKey = ref(0);
 
 const tabs = ['dms', 'groups'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
-const forceRerender = () => {
-  reloadingKey.value += 1;
-};
-
 const headerActions = $computed(() => [{
 	asFullButton: true,
 	icon: 'ph-plus-bold ph-lg',
@@ -117,7 +112,6 @@ function onMessage(message): void {
 		messages = messages.filter(m => m.groupId !== message.groupId);
 		messages.unshift(message);
 	}
-	forceRerender();
 }
 
 function onRead(ids): void {
@@ -189,12 +183,11 @@ function syncSlide(index) {
 }
 
 onMounted(() => {
-	syncSlide(tabs.indexOf(swiperRef?.activeIndex));
+	syncSlide(tabs.indexOf(swiperRef.activeIndex));
 
 	connection = markRaw(stream.useChannel('messagingIndex'));
 
 	connection.on('message', onMessage);
-	connection.on('messagingMessage', onMessage);
 	connection.on('read', onRead);
 
 	os.api('messaging/history', { group: false, limit: 5 }).then(userMessages => {