natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
ThatOneCalculator 2022-11-06 13:08:43 -08:00
parent b1eb1c4855
commit ec2040a840
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "calckey", "name": "calckey",
"version": "12.119.0-calc.8-rc.1", "version": "12.119.0-calc.8-rc.2",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

8
packages/client/src/components/MkChatPreview.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<MkA <MkA
tabindex="-1"
class="rivslvers" class="rivslvers"
tabindex="-1"
:class="{ :class="{
isMe: isMe(message), isMe: isMe(message),
isRead: message.groupId ? message.reads.includes($i.id) : message.isRead, isRead: message.groupId ? message.reads.includes($i.id) : message.isRead,
@ -14,7 +14,7 @@
)}` )}`
" "
> >
<div> <div class="message">
<MkAvatar <MkAvatar
class="avatar" class="avatar"
:user=" :user="
@ -38,9 +38,7 @@
<div class="body"> <div class="body">
<p class="text"> <p class="text">
<span v-if="isMe(message)" class="me">{{ i18n.ts.you }}: </span> <span v-if="isMe(message)" class="me">{{ i18n.ts.you }}: </span>
<span v-if="message.text != null && message.text.length > 0">{{ <Mfm v-if="message.text != null && message.text.length > 0" :text="message.text"/>
message.text
}}</span>
<span v-else> 📎</span> <span v-else> 📎</span>
</p> </p>
</div> </div>

6
packages/client/src/pages/messaging/index.vue
View File

@ -98,14 +98,14 @@ let connection = $ref(null);
const dmsPagination = { const dmsPagination = {
endpoint: 'messaging/history' as const, endpoint: 'messaging/history' as const,
limit: 20, limit: 15,
params: { params: {
group: false, group: false,
}, },
}; };
const groupsPagination = { const groupsPagination = {
endpoint: 'messaging/history' as const, endpoint: 'messaging/history' as const,
limit: 10, limit: 5,
params: { params: {
group: true, group: true,
}, },
@ -206,7 +206,7 @@ onMounted(() => {
connection.on('message', onMessage); connection.on('message', onMessage);
connection.on('read', onRead); 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 => { os.api('messaging/history', { group: true, limit: 5 }).then(groupMessages => {
const _messages = userMessages.concat(groupMessages); const _messages = userMessages.concat(groupMessages);
_messages.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); _messages.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());