From 641feb04e319de9bc98e8f2451edf7ebed0c4ef2 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:07:01 +0100
Subject: [PATCH 1/8] does it fix speed?

---
 packages/client/src/pages/messaging/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 8faca318e1..ed9a33069e 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -13,8 +13,8 @@
 							<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{
 								i18n.ts.startMessaging
 							}}</MkButton>
-							<MkPagination v-slot="{ items }" :externalItemArray="messages" :pagination="dmsPagination">
-								<MkChatPreview v-for="message in messages" :key="message.id" class="yweeujhr message _block"
+							<MkPagination v-slot="{ items }" :pagination="dmsPagination">
+								<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
 									:message="message" />
 							</MkPagination>
 						</div>
@@ -28,8 +28,8 @@
 									i18n.ts.startMessaging
 								}}</MkButton>
 							</div>
-							<MkPagination v-slot="{ items }" :externalItemArray="groupMessages" :pagination="groupsPagination">
-								<MkChatPreview v-for="message in groupMessages" :key="message.id" class="yweeujhr message _block"
+							<MkPagination v-slot="{ items }" :pagination="groupsPagination">
+								<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
 									:message="message" />
 							</MkPagination>
 						</div>

From 269bc3fdff28bccf27ec219b50e06a1b53a15f83 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:35:16 +0100
Subject: [PATCH 2/8] reloading chat to hotfix caching issue

---
 packages/client/src/pages/messaging/index.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index ed9a33069e..252dce76e9 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 }" :pagination="dmsPagination">
+							<MkPagination v-slot="{ items }" ref="paginationComponentUser" :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 }" :pagination="groupsPagination">
+							<MkPagination v-slot="{ items }" ref="paginationComponentGroup" :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 } from 'vue';
+import { markRaw, onMounted, onUnmounted, watch, computed, onActivated } from 'vue';
 import * as Acct from 'calckey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -65,6 +65,9 @@ let messages = $ref([]);
 let groupMessages = $ref([]);
 let connection = $ref(null);
 
+let paginationComponentUser = $ref<InstanceType<typeof MkPagination>>();
+let paginationComponentGroup = $ref<InstanceType<typeof MkPagination>>();
+
 const tabs = ['dms', 'groups'];
 let tab = $ref(tabs[0]);
 watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
@@ -210,6 +213,11 @@ onMounted(() => {
 onUnmounted(() => {
 	if (connection) connection.dispose();
 });
+
+onActivated(() => {
+	paginationComponentUser.reload();
+	paginationComponentGroup.reload();
+});
 </script>
 
 <style lang="scss" scoped>

From 976f06f4e38dab3ad0f86a7e963d529b396b0cd5 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:37:44 +0100
Subject: [PATCH 3/8] fix: Chats did nt update in realtime

---
 packages/client/src/pages/messaging/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 252dce76e9..5b0758d407 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -64,7 +64,6 @@ const router = useRouter();
 let messages = $ref([]);
 let groupMessages = $ref([]);
 let connection = $ref(null);
-
 let paginationComponentUser = $ref<InstanceType<typeof MkPagination>>();
 let paginationComponentGroup = $ref<InstanceType<typeof MkPagination>>();
 

From 69f6955cf52103806e7aca90c5950b91d2c6479f Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:45:26 +0100
Subject: [PATCH 4/8] ah a lil fix before anybody pulls

---
 packages/client/src/pages/messaging/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 5b0758d407..3bca23e233 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -213,10 +213,11 @@ onUnmounted(() => {
 	if (connection) connection.dispose();
 });
 
+/*
 onActivated(() => {
 	paginationComponentUser.reload();
 	paginationComponentGroup.reload();
-});
+});*/
 </script>
 
 <style lang="scss" scoped>

From d961c3d61dce9a27c1c205a8c376609ee43701f5 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:50:15 +0100
Subject: [PATCH 5/8] mew?

---
 packages/client/src/pages/messaging/index.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 3bca23e233..6e020f4e7a 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -213,11 +213,16 @@ onUnmounted(() => {
 	if (connection) connection.dispose();
 });
 
-/*
+// temporary hot fix of the temporary hot fix
+let alreadyInit = $ref(false);
+
 onActivated(() => {
-	paginationComponentUser.reload();
-	paginationComponentGroup.reload();
-});*/
+	if (!alreadyInit.value) alreadyInit.value = true;
+	else {
+		paginationComponentUser.reload();
+		paginationComponentGroup.reload();
+	}
+});
 </script>
 
 <style lang="scss" scoped>

From 03234acb8faf16a2c9e794f86bfc4a2e20670d43 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 17:58:53 +0100
Subject: [PATCH 6/8] meow

---
 packages/client/src/pages/messaging/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 6e020f4e7a..43f3c118a0 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="ts" setup>
-import { markRaw, onMounted, onUnmounted, watch, computed, onActivated } from 'vue';
+import { markRaw, onMounted, onUnmounted, watch, computed, onActivated, onDeactivated } from 'vue';
 import * as Acct from 'calckey-js/built/acct';
 import { Virtual } from 'swiper';
 import { Swiper, SwiperSlide } from 'swiper/vue';
@@ -217,12 +217,15 @@ onUnmounted(() => {
 let alreadyInit = $ref(false);
 
 onActivated(() => {
-	if (!alreadyInit.value) alreadyInit.value = true;
-	else {
+	if (alreadyInit.value) {
 		paginationComponentUser.reload();
 		paginationComponentGroup.reload();
 	}
 });
+
+onDeactivated(() => {
+	alreadyInit.value = true;
+});
 </script>
 
 <style lang="scss" scoped>

From 66448b5e5201b8dec38dc0716ea34195a224a341 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 19 Jan 2023 18:16:09 +0100
Subject: [PATCH 7/8] wip

---
 packages/client/src/pages/messaging/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 43f3c118a0..a614085f64 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -62,7 +62,6 @@ import 'swiper/scss/virtual';
 const router = useRouter();
 
 let messages = $ref([]);
-let groupMessages = $ref([]);
 let connection = $ref(null);
 let paginationComponentUser = $ref<InstanceType<typeof MkPagination>>();
 let paginationComponentGroup = $ref<InstanceType<typeof MkPagination>>();
@@ -118,9 +117,10 @@ function onMessage(message): void {
 
 		messages.unshift(message);
 	} else if (message.groupId) {
-		groupMessages = groupMessages.filter(m => m.groupId !== message.groupId);
-		groupMessages.unshift(message);
+		messages = messages.filter(m => m.groupId !== message.groupId);
+		messages.unshift(message);
 	}
+	forceRerender();
 }
 
 function onRead(ids): void {

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 8/8] 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 c262ee931c..d98fc7252e 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 a614085f64..3866db1c77 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>