ltlapy/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[mastodon-client] Improve pagination helper function

Browse source
This commit is contained in:
Laura Hausmann 2023-10-04 23:07:37 +02:00
parent 557dd37fe8
commit bbc0f0278a
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/server/api/mastodon/helpers/pagination.ts
View file

@ -8,11 +8,9 @@ export class PaginationHelpers {
sinceId?: string, sinceId?: string,
maxId?: string, maxId?: string,
minId?: string, minId?: string,
idField: string = "id", idField: string = `${q.alias}.id`,
autoPrefix: boolean = true
) { ) {
if (sinceId && minId) throw new Error("Can't user both sinceId and minId params"); if (sinceId && minId) throw new Error("Can't user both sinceId and minId params");
if (autoPrefix) idField = `${q.alias}.${idField}`;
if (sinceId && maxId) { if (sinceId && maxId) {
q.andWhere(`${idField} > :sinceId`, {sinceId: sinceId}); q.andWhere(`${idField} > :sinceId`, {sinceId: sinceId});

1
packages/backend/src/server/api/mastodon/helpers/timeline.ts
View file

@ -167,7 +167,6 @@ export class TimelineHelpers {
maxId, maxId,
minId, minId,
"COALESCE(note.threadId, note.id)", "COALESCE(note.threadId, note.id)",
false
) )
.distinctOn(["COALESCE(note.threadId, note.id)"]) .distinctOn(["COALESCE(note.threadId, note.id)"])
.orderBy({"COALESCE(note.threadId, note.id)": minId ? "ASC" : "DESC", "note.id": "DESC"}) .orderBy({"COALESCE(note.threadId, note.id)": minId ? "ASC" : "DESC", "note.id": "DESC"})