From a1da2135ebfce1cb5be2d23fbf403454052f2eba Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 26 Jun 2025 13:22:21 +0900 Subject: [PATCH] Update ApRendererService.ts --- .../src/core/activitypub/ApRendererService.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 9a84d77e0b..0bf6627491 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -504,15 +504,9 @@ export class ApRendererService { @bindThis public async renderChatMessage(message: MiChatMessage, dive = true): Promise { - const getPromisedFiles = async (ids: string[]): Promise => { - if (ids.length === 0) return []; - const items = await this.driveFilesRepository.findBy({ id: In(ids) }); - return ids.map(id => items.find(item => item.id === id)).filter(x => x != null); - }; - const attributedTo = this.userEntityService.genLocalUserUri(message.fromUserId); - const files = await getPromisedFiles([message.fileId]); + const file = message.fileId ? await this.driveFilesRepository.findOneBy({ id: message.fileId }) : null; const emojis = await this.getEmojis(message.emojis); const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji)); @@ -526,9 +520,9 @@ export class ApRendererService { type: 'Misskey:ChatMessage', attributedTo, text: message.text, - published: this.idService.parse(note.id).date.toISOString(), + published: this.idService.parse(message.id).date.toISOString(), to: message.toUserId, - attachment: files.map(x => this.renderDocument(x)), + attachment: file ? [this.renderDocument(file)] : [], tag, }; }