diff options
Diffstat (limited to 'ui/entry_search.go')
-rw-r--r-- | ui/entry_search.go | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/ui/entry_search.go b/ui/entry_search.go index d083b35..252b306 100644 --- a/ui/entry_search.go +++ b/ui/entry_search.go @@ -17,9 +17,8 @@ import ( "miniflux.app/ui/view" ) -// ShowSearchEntry shows a single entry in "search" mode. -func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { - user, err := c.store.UserByID(request.UserID(r)) +func (h *handler) showSearchEntryPage(w http.ResponseWriter, r *http.Request) { + user, err := h.store.UserByID(request.UserID(r)) if err != nil { html.ServerError(w, r, err) return @@ -27,7 +26,7 @@ func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { entryID := request.RouteInt64Param(r, "entryID") searchQuery := request.QueryStringParam(r, "q", "") - builder := c.store.NewEntryQueryBuilder(user.ID) + builder := h.store.NewEntryQueryBuilder(user.ID) builder.WithSearchQuery(searchQuery) builder.WithEntryID(entryID) builder.WithoutStatus(model.EntryStatusRemoved) @@ -44,7 +43,7 @@ func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { } if entry.Status == model.EntryStatusUnread { - err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) + err = h.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { logger.Error("[Controller:ShowSearchEntry] %v", err) html.ServerError(w, r, err) @@ -54,7 +53,7 @@ func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { entry.Status = model.EntryStatusRead } - entryPaginationBuilder := storage.NewEntryPaginationBuilder(c.store, user.ID, entry.ID, user.EntryDirection) + entryPaginationBuilder := storage.NewEntryPaginationBuilder(h.store, user.ID, entry.ID, user.EntryDirection) entryPaginationBuilder.WithSearchQuery(searchQuery) prevEntry, nextEntry, err := entryPaginationBuilder.Entries() if err != nil { @@ -64,16 +63,16 @@ func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { nextEntryRoute := "" if nextEntry != nil { - nextEntryRoute = route.Path(c.router, "searchEntry", "entryID", nextEntry.ID) + nextEntryRoute = route.Path(h.router, "searchEntry", "entryID", nextEntry.ID) } prevEntryRoute := "" if prevEntry != nil { - prevEntryRoute = route.Path(c.router, "searchEntry", "entryID", prevEntry.ID) + prevEntryRoute = route.Path(h.router, "searchEntry", "entryID", prevEntry.ID) } - sess := session.New(c.store, request.SessionID(r)) - view := view.New(c.tpl, r, sess) + sess := session.New(h.store, request.SessionID(r)) + view := view.New(h.tpl, r, sess) view.Set("searchQuery", searchQuery) view.Set("entry", entry) view.Set("prevEntry", prevEntry) @@ -82,9 +81,9 @@ func (c *Controller) ShowSearchEntry(w http.ResponseWriter, r *http.Request) { view.Set("prevEntryRoute", prevEntryRoute) view.Set("menu", "search") view.Set("user", user) - view.Set("countUnread", c.store.CountUnreadEntries(user.ID)) - view.Set("countErrorFeeds", c.store.CountErrorFeeds(user.ID)) - view.Set("hasSaveEntry", c.store.HasSaveEntry(user.ID)) + view.Set("countUnread", h.store.CountUnreadEntries(user.ID)) + view.Set("countErrorFeeds", h.store.CountErrorFeeds(user.ID)) + view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID)) html.OK(w, r, view.Render("entry")) } |