diff --git a/packages/backend/src/server/api/mastodon/helpers/pagination.ts b/packages/backend/src/server/api/mastodon/helpers/pagination.ts index b76e7cc4b..a220374d0 100644 --- a/packages/backend/src/server/api/mastodon/helpers/pagination.ts +++ b/packages/backend/src/server/api/mastodon/helpers/pagination.ts @@ -8,11 +8,9 @@ export class PaginationHelpers { sinceId?: string, maxId?: string, minId?: string, - idField: string = "id", - autoPrefix: boolean = true + idField: string = `${q.alias}.id`, ) { if (sinceId && minId) throw new Error("Can't user both sinceId and minId params"); - if (autoPrefix) idField = `${q.alias}.${idField}`; if (sinceId && maxId) { q.andWhere(`${idField} > :sinceId`, {sinceId: sinceId}); diff --git a/packages/backend/src/server/api/mastodon/helpers/timeline.ts b/packages/backend/src/server/api/mastodon/helpers/timeline.ts index 47de37c9a..d9e0fe1aa 100644 --- a/packages/backend/src/server/api/mastodon/helpers/timeline.ts +++ b/packages/backend/src/server/api/mastodon/helpers/timeline.ts @@ -167,7 +167,6 @@ export class TimelineHelpers { maxId, minId, "COALESCE(note.threadId, note.id)", - false ) .distinctOn(["COALESCE(note.threadId, note.id)"]) .orderBy({"COALESCE(note.threadId, note.id)": minId ? "ASC" : "DESC", "note.id": "DESC"})