From 50ec9b9071677200e4211ebb506c11cc6b69b9c5 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 17 Mar 2025 18:19:48 +0900 Subject: [PATCH] wip --- .../backend/src/core/entities/ChatMessageEntityService.ts | 6 +++--- packages/frontend/src/pages/chat/home.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/core/entities/ChatMessageEntityService.ts b/packages/backend/src/core/entities/ChatMessageEntityService.ts index 1e3d1bcc94..6d3baa9159 100644 --- a/packages/backend/src/core/entities/ChatMessageEntityService.ts +++ b/packages/backend/src/core/entities/ChatMessageEntityService.ts @@ -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, toUserId: message.toUserId, toUser: (message.toUserId && message.toUserId !== me.id) ? (packedUsers?.get(message.toUserId) ?? await this.userEntityService.pack(message.toUser ?? message.toUserId, me)) : undefined, - //toGroupId: message.toGroupId, - //toGroup: message.toGroupId && opts.populateGroup ? await this.userGroupEntityService.pack(message.toGroup ?? message.toGroupId) : undefined, + //toRoomId: message.toRoomId, + //toRoom: message.toRoomId && opts.populateRoom ? await this.userRoomEntityService.pack(message.toRoom ?? message.toRoomId) : undefined, fileId: message.fileId, file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null, }; @@ -105,7 +105,7 @@ export class ChatMessageEntityService { text: message.text, fromUserId: message.fromUserId, toUserId: message.toUserId, - //toGroupId: message.toGroupId, + //toRoomId: message.toRoomId, fileId: message.fileId, file: message.file ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file)) : null, }; diff --git a/packages/frontend/src/pages/chat/home.vue b/packages/frontend/src/pages/chat/home.vue index 5424057501..6b627613bc 100644 --- a/packages/frontend/src/pages/chat/home.vue +++ b/packages/frontend/src/pages/chat/home.vue @@ -16,12 +16,12 @@ SPDX-License-Identifier: AGPL-3.0-only :key="message.id" :class="[$style.message, { [$style.isMe]: message.isMe, [$style.isRead]: message.isRead }]" class="_panel" - :to="message.groupId ? `/chat/group/${message.groupId}` : `/chat/user/${message.otherId}`" + :to="message.roomId ? `/chat/room/${message.roomId}` : `/chat/user/${message.otherId}`" >