diff options
| author |  fred <f@miniflux.net>
| 2023-06-19 14:00:10 -0700 |
|---|---|---|
| committer | Frédéric Guillot <f@miniflux.net>
| 2023-06-19 14:13:19 -0700 |
| commit | 28775f5e10b1b00e717abd06f369c45eae2bdea1 (patch) | |
| tree | feb777b58c1f30899aed0f3eaab2951d0ea3593a /googlereader/handler.go | |
| parent | 095bec072c944ceafc1e09221c5c37ebe17eccb5 (diff) | |
| download | v2-28775f5e10b1b00e717abd06f369c45eae2bdea1.tar.gz v2-28775f5e10b1b00e717abd06f369c45eae2bdea1.tar.zst v2-28775f5e10b1b00e717abd06f369c45eae2bdea1.zip | |
Refactor entry/feed query builder sorting to match SQL semantic
Diffstat (limited to 'googlereader/handler.go')
| -rw-r--r-- | googlereader/handler.go | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/googlereader/handler.go b/googlereader/handler.go index 4e5272ac..f52b38bf 100644 --- a/googlereader/handler.go +++ b/googlereader/handler.go @@ -790,8 +790,7 @@ func (h *handler) streamItemContents(w http.ResponseWriter, r *http.Request) { builder := h.store.NewEntryQueryBuilder(userID) builder.WithoutStatus(model.EntryStatusRemoved) builder.WithEntryIDs(itemIDs) - builder.WithOrder(model.DefaultSortingOrder) - builder.WithDirection(requestModifiers.SortDirection) + builder.WithSorting(model.DefaultSortingOrder, requestModifiers.SortDirection) entries, err := builder.GetEntries() if err != nil { @@ -1144,8 +1143,7 @@ func (h *handler) handleReadingListStream(w http.ResponseWriter, r *http.Request builder.WithoutStatus(model.EntryStatusRemoved) builder.WithLimit(rm.Count) builder.WithOffset(rm.Offset) - builder.WithOrder(model.DefaultSortingOrder) - builder.WithDirection(rm.SortDirection) + builder.WithSorting(model.DefaultSortingOrder, rm.SortDirection) if rm.StartTime > 0 { builder.AfterDate(time.Unix(rm.StartTime, 0)) } @@ -1187,8 +1185,7 @@ func (h *handler) handleStarredStream(w http.ResponseWriter, r *http.Request, rm builder.WithStarred(true) builder.WithLimit(rm.Count) builder.WithOffset(rm.Offset) - builder.WithOrder(model.DefaultSortingOrder) - builder.WithDirection(rm.SortDirection) + builder.WithSorting(model.DefaultSortingOrder, rm.SortDirection) if rm.StartTime > 0 { builder.AfterDate(time.Unix(rm.StartTime, 0)) } @@ -1230,8 +1227,7 @@ func (h *handler) handleReadStream(w http.ResponseWriter, r *http.Request, rm Re builder.WithStatus(model.EntryStatusRead) builder.WithLimit(rm.Count) builder.WithOffset(rm.Offset) - builder.WithOrder(model.DefaultSortingOrder) - builder.WithDirection(rm.SortDirection) + builder.WithSorting(model.DefaultSortingOrder, rm.SortDirection) if rm.StartTime > 0 { builder.AfterDate(time.Unix(rm.StartTime, 0)) } @@ -1279,8 +1275,7 @@ func (h *handler) handleFeedStream(w http.ResponseWriter, r *http.Request, rm Re builder.WithFeedID(feedID) builder.WithLimit(rm.Count) builder.WithOffset(rm.Offset) - builder.WithOrder(model.DefaultSortingOrder) - builder.WithDirection(rm.SortDirection) + builder.WithSorting(model.DefaultSortingOrder, rm.SortDirection) if rm.StartTime > 0 { builder.AfterDate(time.Unix(rm.StartTime, 0)) } |