Merge branch 'limit-fix' into 'main'

db/events: fix `limit` not being applied correctly

See merge request soapbox-pub/ditto!69
This commit is contained in:
Alex Gleason 2023-12-06 00:32:33 +00:00
commit 709675754c

View file

@ -139,8 +139,8 @@ function getFilterQuery(filter: DittoFilter) {
/** Combine filter queries into a single union query. */ /** Combine filter queries into a single union query. */
function getFiltersQuery(filters: DittoFilter[]) { function getFiltersQuery(filters: DittoFilter[]) {
return filters return filters
.map(getFilterQuery) .map((filter) => db.selectFrom(() => getFilterQuery(filter).as('events')).selectAll())
.reduce((result, query) => result.union(query)); .reduce((result, query) => result.unionAll(query));
} }
/** Get events for filters from the database. */ /** Get events for filters from the database. */