From 87776abfd3a22e091aead33fce61b7bd5071997a Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Thu, 20 May 2021 15:28:28 +0100 Subject: [PATCH] query limits on entries --- rss/handler/rss.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rss/handler/rss.go b/rss/handler/rss.go index 549655f..2b7dd6f 100644 --- a/rss/handler/rss.go +++ b/rss/handler/rss.go @@ -118,6 +118,13 @@ func (e *Rss) Feed(ctx context.Context, req *pb.FeedRequest, rsp *pb.FeedRespons feed := new(pb.Feed) id := tenantID + "/" + idFromName(req.Name) q := model.QueryEquals("ID", id) + + // get the feed + if err := e.feeds.Read(q, feed); err != nil { + return errors.InternalServerError("rss.feeds", "could not read feed") + } + + q = e.entriesURLIndex.ToQuery(feed.Url) q.Limit = int64(25) q.Order = model.Order{ Type: model.OrderTypeDesc, @@ -134,11 +141,6 @@ func (e *Rss) Feed(ctx context.Context, req *pb.FeedRequest, rsp *pb.FeedRespons q.Order.Type = model.OrderTypeAsc } - // get the feed - if err := e.feeds.Read(q, feed); err != nil { - return errors.InternalServerError("rss.feeds", "could not read feed") - } - // get the entries for each return e.entries.Read(e.entriesURLIndex.ToQuery(feed.Url), &rsp.Entries) }