usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2025-03-17 18:19:48 +09:00
parent 06bd615334
commit 50ec9b9071
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/core/entities/ChatMessageEntityService.ts
View File

@ -50,8 +50,8 @@ export class ChatMessageEntityService {
fromUser: message.fromUserId !== me.id ? (packedUsers?.get(message.fromUserId) ?? await this.userEntityService.pack(message.fromUser ?? message.fromUserId, me)) : undefined, fromUser: message.fromUserId !== me.id ? (packedUsers?.get(message.fromUserId) ?? await this.userEntityService.pack(message.fromUser ?? message.fromUserId, me)) : undefined,
toUserId: message.toUserId, toUserId: message.toUserId,
toUser: (message.toUserId && message.toUserId !== me.id) ? (packedUsers?.get(message.toUserId) ?? await this.userEntityService.pack(message.toUser ?? message.toUserId, me)) : undefined, toUser: (message.toUserId && message.toUserId !== me.id) ? (packedUsers?.get(message.toUserId) ?? await this.userEntityService.pack(message.toUser ?? message.toUserId, me)) : undefined,
//toGroupId: message.toGroupId, //toRoomId: message.toRoomId,
//toGroup: message.toGroupId && opts.populateGroup ? await this.userGroupEntityService.pack(message.toGroup ?? message.toGroupId) : undefined, //toRoom: message.toRoomId && opts.populateRoom ? await this.userRoomEntityService.pack(message.toRoom ?? message.toRoomId) : undefined,
fileId: message.fileId, fileId: message.fileId,
file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null, file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null,
}; };
@ -105,7 +105,7 @@ export class ChatMessageEntityService {
text: message.text, text: message.text,
fromUserId: message.fromUserId, fromUserId: message.fromUserId,
toUserId: message.toUserId, toUserId: message.toUserId,
//toGroupId: message.toGroupId, //toRoomId: message.toRoomId,
fileId: message.fileId, fileId: message.fileId,
file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null, file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null,
}; };

6
packages/frontend/src/pages/chat/home.vue
View File

@ -16,12 +16,12 @@ SPDX-License-Identifier: AGPL-3.0-only
:key="message.id" :key="message.id"
:class="[$style.message, { [$style.isMe]: message.isMe, [$style.isRead]: message.isRead }]" :class="[$style.message, { [$style.isMe]: message.isMe, [$style.isRead]: message.isRead }]"
class="_panel" class="_panel"
:to="message.groupId ? `/chat/group/${message.groupId}` : `/chat/user/${message.otherId}`" :to="message.roomId ? `/chat/room/${message.roomId}` : `/chat/user/${message.otherId}`"
> >
<div> <div>
<MkAvatar :class="$style.avatar" :user="message.user" indicator link preview/> <MkAvatar :class="$style.avatar" :user="message.user" indicator link preview/>
<header v-if="message.groupId"> <header v-if="message.roomId">
<span class="name">{{ message.group.name }}</span> <span class="name">{{ message.room.name }}</span>
<MkTime :time="message.createdAt" class="time"/> <MkTime :time="message.createdAt" class="time"/>
</header> </header>
<header v-else> <header v-else>