HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

revert

Browse source
This commit is contained in:
ThatOneCalculator 2022-11-04 15:20:15 -07:00
parent 6571ac12c8
commit f369b0cf64
2 changed files with 146 additions and 152 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.7-rc.3", "version": "12.119.0-calc.7-rc.4",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

16
packages/client/src/pages/messaging/index.vue
View file

@ -6,13 +6,14 @@
<MkButton primary class="start" @click="start"><i class="fas fa-plus"></i> {{ i18n.ts.startMessaging }}</MkButton> <MkButton primary class="start" @click="start"><i class="fas fa-plus"></i> {{ i18n.ts.startMessaging }}</MkButton>
<div v-if="messages.length > 0" class="history"> <div v-if="messages.length > 0" class="history">
<!-- <MkPagination v-slot="{items}" ref="list" :pagination="pagination"> -->
<MkA <MkA
v-for="message in items" v-for="(message, i) in messages"
:key="message.id" :key="message.id"
v-anim="i"
class="message _block" class="message _block"
:class="{ isMe: isMe(message), isRead: message.groupId ? message.reads.includes($i?.id) : message.isRead }" :class="{ isMe: isMe(message), isRead: message.groupId ? message.reads.includes($i.id) : message.isRead }"
:to="message.groupId ? `/my/messaging/group/${message.groupId}` : `/my/messaging/${getAcct(isMe(message) ? message.recipient : message.user)}`" :to="message.groupId ? `/my/messaging/group/${message.groupId}` : `/my/messaging/${getAcct(isMe(message) ? message.recipient : message.user)}`"
:data-index="i"
> >
<div> <div>
<MkAvatar class="avatar" :user="message.groupId ? message.user : isMe(message) ? message.recipient : message.user" :show-indicator="true"/> <MkAvatar class="avatar" :user="message.groupId ? message.user : isMe(message) ? message.recipient : message.user" :show-indicator="true"/>
@ -21,9 +22,7 @@
<MkTime :time="message.createdAt" class="time"/> <MkTime :time="message.createdAt" class="time"/>
</header> </header>
<header v-else> <header v-else>
<span class="name"> <span class="name"><MkUserName :user="isMe(message) ? message.recipient : message.user"/></span>
<MkUserName :user="isMe(message) ? message.recipient : message.user"/>
</span>
<span class="username">@{{ acct(isMe(message) ? message.recipient : message.user) }}</span> <span class="username">@{{ acct(isMe(message) ? message.recipient : message.user) }}</span>
<MkTime :time="message.createdAt" class="time"/> <MkTime :time="message.createdAt" class="time"/>
</header> </header>
@ -36,7 +35,6 @@
</div> </div>
</div> </div>
</MkA> </MkA>
<!-- </MkPagination> -->
</div> </div>
<div v-if="!fetching && messages.length == 0" class="_fullinfo"> <div v-if="!fetching && messages.length == 0" class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/> <img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
@ -69,10 +67,6 @@ let connection = $ref(null);
const getAcct = Acct.toString; const getAcct = Acct.toString;
const props = defineProps<{
pagination: any;
}>();
function isMe(message) { function isMe(message) {
return message.userId === $i.id; return message.userId === $i.id;
} }