From ec2040a84050a12015f83d93c95f2bb01d716b75 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 6 Nov 2022 13:08:43 -0800
Subject: [PATCH] fix

---
 package.json                                     | 2 +-
 packages/client/src/components/MkChatPreview.vue | 8 +++-----
 packages/client/src/pages/messaging/index.vue    | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 512e2cf325..026de4170b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.8-rc.1",
+	"version": "12.119.0-calc.8-rc.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue
index e994d0ab31..209f8ef1cc 100644
--- a/packages/client/src/components/MkChatPreview.vue
+++ b/packages/client/src/components/MkChatPreview.vue
@@ -1,7 +1,7 @@
 <template>
 <MkA
-	tabindex="-1"
 	class="rivslvers"
+	tabindex="-1"
 	:class="{
 		isMe: isMe(message),
 		isRead: message.groupId ? message.reads.includes($i.id) : message.isRead,
@@ -14,7 +14,7 @@
 			)}`
 	"
 >
-	<div>
+	<div class="message">
 		<MkAvatar
 			class="avatar"
 			:user="
@@ -38,9 +38,7 @@
 		<div class="body">
 			<p class="text">
 				<span v-if="isMe(message)" class="me">{{ i18n.ts.you }}: </span>
-				<span v-if="message.text != null && message.text.length > 0">{{
-					message.text
-				}}</span>
+				<Mfm v-if="message.text != null && message.text.length > 0" :text="message.text"/>
 				<span v-else> 📎</span>
 			</p>
 		</div>
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 8119f34b11..124146a07d 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -98,14 +98,14 @@ let connection = $ref(null);
 
 const dmsPagination = {
 	endpoint: 'messaging/history' as const,
-	limit: 20,
+	limit: 15,
 	params: {
 		group: false,
 	},
 };
 const groupsPagination = {
 	endpoint: 'messaging/history' as const,
-	limit: 10,
+	limit: 5,
 	params: {
 		group: true,
 	},
@@ -206,7 +206,7 @@ onMounted(() => {
 	connection.on('message', onMessage);
 	connection.on('read', onRead);
 
-	os.api('messaging/history', { group: false, limit: 30 }).then(userMessages => {
+	os.api('messaging/history', { group: false, limit: 5 }).then(userMessages => {
 		os.api('messaging/history', { group: true, limit: 5 }).then(groupMessages => {
 			const _messages = userMessages.concat(groupMessages);
 			_messages.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());