From 60a6e08c0b59857d297ac90fa0782759a8d3030f Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 25 Nov 2023 01:50:49 +0100 Subject: [PATCH] [mastodon-client] Add note.user joins to all timeline queries --- .../backend/src/server/api/mastodon/helpers/timeline.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/helpers/timeline.ts b/packages/backend/src/server/api/mastodon/helpers/timeline.ts index e869aecab..6e034d2b8 100644 --- a/packages/backend/src/server/api/mastodon/helpers/timeline.ts +++ b/packages/backend/src/server/api/mastodon/helpers/timeline.ts @@ -81,7 +81,9 @@ export class TimelineHelpers { if (local) query.andWhere("note.userHost IS NULL"); if (!local) query.andWhere("note.channelId IS NULL"); - query.leftJoinAndSelect("note.renote", "renote"); + query + .leftJoinAndSelect("note.user", "user") + .leftJoinAndSelect("note.renote", "renote"); generateRepliesQuery(query, true, user); if (user) { @@ -113,6 +115,7 @@ export class TimelineHelpers { ) .andWhere(`note.userId IN (${listQuery.getQuery()})`) .andWhere("note.visibility != 'specified'") + .leftJoinAndSelect("note.user", "user") .leftJoinAndSelect("note.renote", "renote") .setParameters({ listId: list.id }); @@ -148,7 +151,9 @@ export class TimelineHelpers { if (local) query.andWhere("note.userHost IS NULL"); if (!local) query.andWhere("note.channelId IS NULL"); - query.leftJoinAndSelect("note.renote", "renote"); + query + .leftJoinAndSelect("note.user", "user") + .leftJoinAndSelect("note.renote", "renote"); generateRepliesQuery(query, true, user); if (user) {