From b58bd4b9c9d772157e81644e0451d4ba22de67bf Mon Sep 17 00:00:00 2001 From: Emily Fox Date: Tue, 15 Jul 2025 17:48:24 -0500 Subject: [PATCH] prevent mastodon api error when not fetching reply or renote (resolves #1125) Use of inner joins for `reply.user` and `renote.user` meant fetching a base note would always fail when asked to query reply or renote information. --- .../backend/src/server/api/mastodon/MastodonDataService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/MastodonDataService.ts b/packages/backend/src/server/api/mastodon/MastodonDataService.ts index e080cb10bd..f76483a978 100644 --- a/packages/backend/src/server/api/mastodon/MastodonDataService.ts +++ b/packages/backend/src/server/api/mastodon/MastodonDataService.ts @@ -59,7 +59,7 @@ export class MastodonDataService { if (typeof(relations.reply) === 'object') { if (relations.reply.reply) query.leftJoinAndSelect('reply.reply', 'replyReply'); if (relations.reply.renote) query.leftJoinAndSelect('reply.renote', 'replyRenote'); - if (relations.reply.user) query.innerJoinAndSelect('reply.user', 'replyUser'); + if (relations.reply.user) query.leftJoinAndSelect('reply.user', 'replyUser'); if (relations.reply.channel) query.leftJoinAndSelect('reply.channel', 'replyChannel'); } } @@ -68,7 +68,7 @@ export class MastodonDataService { if (typeof(relations.renote) === 'object') { if (relations.renote.reply) query.leftJoinAndSelect('renote.reply', 'renoteReply'); if (relations.renote.renote) query.leftJoinAndSelect('renote.renote', 'renoteRenote'); - if (relations.renote.user) query.innerJoinAndSelect('renote.user', 'renoteUser'); + if (relations.renote.user) query.leftJoinAndSelect('renote.user', 'renoteUser'); if (relations.renote.channel) query.leftJoinAndSelect('renote.channel', 'renoteChannel'); } }