diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-04-03 15:28:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-03 15:28:10 +0900 |
| commit | e07bb1dcbce6eaa2bfe157a6c9f1361dbf9aa280 (patch) | |
| tree | 1d9f9e6d6450caa717e83ca8fc0eadf09b413129 /packages/backend/src/core | |
| parent | perf(frontend): avoid main thread scroll repaint (diff) | |
| download | sharkey-e07bb1dcbce6eaa2bfe157a6c9f1361dbf9aa280.tar.gz sharkey-e07bb1dcbce6eaa2bfe157a6c9f1361dbf9aa280.tar.bz2 sharkey-e07bb1dcbce6eaa2bfe157a6c9f1361dbf9aa280.zip | |
fix: チャット周りの修正 (#15741)
* fix(misskey-js): チャットのChannel型定義を追加
* fix(backend); canChatで塞いでいない書き込み系のAPIを塞ぐ
* fix(frontend): チャット周りのフロントエンド型修正
* lint fix
* fix broken lockfile
* fix
* refactor
* wip
* wip
* wip
* clean up
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/core')
| -rw-r--r-- | packages/backend/src/core/ChatService.ts | 4 | ||||
| -rw-r--r-- | packages/backend/src/core/entities/ChatEntityService.ts | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/core/ChatService.ts b/packages/backend/src/core/ChatService.ts index 6194f624b1..3984cefc80 100644 --- a/packages/backend/src/core/ChatService.ts +++ b/packages/backend/src/core/ChatService.ts @@ -99,7 +99,7 @@ export class ChatService { text?: string | null; file?: MiDriveFile | null; uri?: string | null; - }): Promise<Packed<'ChatMessageLite'>> { + }): Promise<Packed<'ChatMessageLiteFor1on1'>> { if (fromUser.id === toUser.id) { throw new Error('yourself'); } @@ -210,7 +210,7 @@ export class ChatService { text?: string | null; file?: MiDriveFile | null; uri?: string | null; - }): Promise<Packed<'ChatMessageLite'>> { + }): Promise<Packed<'ChatMessageLiteForRoom'>> { const memberships = (await this.chatRoomMembershipsRepository.findBy({ roomId: toRoom.id })).map(m => ({ userId: m.userId, isMuted: m.isMuted, diff --git a/packages/backend/src/core/entities/ChatEntityService.ts b/packages/backend/src/core/entities/ChatEntityService.ts index 099a9e3ad2..da112d5444 100644 --- a/packages/backend/src/core/entities/ChatEntityService.ts +++ b/packages/backend/src/core/entities/ChatEntityService.ts @@ -128,7 +128,7 @@ export class ChatEntityService { packedFiles: Map<MiChatMessage['fileId'], Packed<'DriveFile'> | null>; }; }, - ): Promise<Packed<'ChatMessageLite'>> { + ): Promise<Packed<'ChatMessageLiteFor1on1'>> { const packedFiles = options?._hint_?.packedFiles; const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src }); @@ -147,7 +147,7 @@ export class ChatEntityService { createdAt: this.idService.parse(message.id).date.toISOString(), text: message.text, fromUserId: message.fromUserId, - toUserId: message.toUserId, + toUserId: message.toUserId!, fileId: message.fileId, file: message.fileId ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file ?? message.fileId)) : null, reactions, @@ -177,7 +177,7 @@ export class ChatEntityService { packedUsers: Map<MiUser['id'], Packed<'UserLite'>>; }; }, - ): Promise<Packed<'ChatMessageLite'>> { + ): Promise<Packed<'ChatMessageLiteForRoom'>> { const packedFiles = options?._hint_?.packedFiles; const packedUsers = options?._hint_?.packedUsers; @@ -199,7 +199,7 @@ export class ChatEntityService { text: message.text, fromUserId: message.fromUserId, fromUser: packedUsers?.get(message.fromUserId) ?? await this.userEntityService.pack(message.fromUser ?? message.fromUserId), - toRoomId: message.toRoomId, + toRoomId: message.toRoomId!, fileId: message.fileId, file: message.fileId ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file ?? message.fileId)) : null, reactions, |