From 240f8017557c356f3048d00c45c2664372d26fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sat, 30 Jun 2018 17:35:06 -0700 Subject: [PATCH] Always mark the entry as read after fetching the pagination in unread mode --- ui/entry_unread.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/entry_unread.go b/ui/entry_unread.go index 0b6c0018..05e506d1 100644 --- a/ui/entry_unread.go +++ b/ui/entry_unread.go @@ -77,14 +77,12 @@ func (c *Controller) ShowUnreadEntry(w http.ResponseWriter, r *http.Request) { prevEntryRoute = route.Path(c.router, "unreadEntry", "entryID", prevEntry.ID) } - // We change the status here, otherwise we cannot get the pagination for unread items. - if entry.Status == model.EntryStatusUnread { - err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) - if err != nil { - logger.Error("[Controller:ShowUnreadEntry] %v", err) - html.ServerError(w, nil) - return - } + // Always mark the entry as read after fetching the pagination. + err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) + if err != nil { + logger.Error("[Controller:ShowUnreadEntry] %v", err) + html.ServerError(w, nil) + return } sess := session.New(c.store, ctx)