From 5a2990a2fa7418f3d6797de6aaaaed5f976ffa63 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 18:28:07 +0100
Subject: [PATCH] wip

---
 .../client/src/components/MkPagination.vue    |  5 +++++
 packages/client/src/pages/messaging/index.vue | 20 +++----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index c262ee931..d98fc7252 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -90,6 +90,7 @@ const backed = ref(false); // 遡り中か否か
 const isBackTop = ref(false);
 const empty = computed(() => items.value.length === 0);
 const error = ref(false);
+const alreadyInitedOnce = ref(false);
 
 const init = async (): Promise<void> => {
 	queue.value = [];
@@ -344,10 +345,14 @@ init();
 
 onActivated(() => {
 	isBackTop.value = false;
+	if(alreadyInitedOnce.value) {
+		reload();
+	}
 });
 
 onDeactivated(() => {
 	isBackTop.value = window.scrollY === 0;
+	alreadyInitedOnce.value = true;
 });
 
 defineExpose({
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index a614085f6..3866db1c7 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -13,7 +13,7 @@
 							<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{
 								i18n.ts.startMessaging
 							}}</MkButton>
-							<MkPagination v-slot="{ items }" ref="paginationComponentUser" :pagination="dmsPagination">
+							<MkPagination v-slot="{ items }" :pagination="dmsPagination">
 								<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
 									:message="message" />
 							</MkPagination>
@@ -28,7 +28,7 @@
 									i18n.ts.startMessaging
 								}}</MkButton>
 							</div>
-							<MkPagination v-slot="{ items }" ref="paginationComponentGroup" :pagination="groupsPagination">
+							<MkPagination v-slot="{ items }" :pagination="groupsPagination">
 								<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
 									:message="message" />
 							</MkPagination>
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, watch, computed, onActivated, onDeactivated } from 'vue';
+import { markRaw, onMounted, onUnmounted, watch, computed } from 'vue';
 import * as Acct from 'calckey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -212,20 +212,6 @@ onMounted(() => {
 onUnmounted(() => {
 	if (connection) connection.dispose();
 });
-
-// temporary hot fix of the temporary hot fix
-let alreadyInit = $ref(false);
-
-onActivated(() => {
-	if (alreadyInit.value) {
-		paginationComponentUser.reload();
-		paginationComponentGroup.reload();
-	}
-});
-
-onDeactivated(() => {
-	alreadyInit.value = true;
-});
 </script>
 
 <style lang="scss" scoped>