Add link to mark everything as read

miniflux · Jan 5, 2018 · c57cafb · c57cafb
1 parent efac11e
commit c57cafb
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/daemon/routes.go b/daemon/routes.go
@@ -86,6 +86,8 @@ func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handle
 	router.Handle("/subscribe", uiHandler.Use(uiController.SubmitSubscription)).Name("submitSubscription").Methods("POST")
 	router.Handle("/subscriptions", uiHandler.Use(uiController.ChooseSubscription)).Name("chooseSubscription").Methods("POST")
 
+	router.Handle("/mark-all-as-read", uiHandler.Use(uiController.MarkAllAsRead)).Name("markAllAsRead").Methods("GET")
+
 	router.Handle("/unread", uiHandler.Use(uiController.ShowUnreadPage)).Name("unread").Methods("GET")
 	router.Handle("/history", uiHandler.Use(uiController.ShowHistoryPage)).Name("history").Methods("GET")
 	router.Handle("/starred", uiHandler.Use(uiController.ShowStarredPage)).Name("starred").Methods("GET")

diff --git a/locale/translations.go b/locale/translations.go
diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json
@@ -195,5 +195,6 @@
     "Close modal dialog": "Fermer la boite de dialogue",
     "Save article": "Sauvegarder l'article",
     "There is already someone associated with this provider!": "Il y a déjà quelqu'un d'associé avec ce provider !",
-    "There is already someone else with the same Fever username!": "Il y a déjà quelqu'un d'autre avec le même nom d'utilisateur Fever !"
+    "There is already someone else with the same Fever username!": "Il y a déjà quelqu'un d'autre avec le même nom d'utilisateur Fever !",
+    "Mark all as read": "Tout marquer comme lu"
 }
diff --git a/storage/entry.go b/storage/entry.go
@@ -213,3 +213,16 @@ func (s *Storage) FlushHistory(userID int64) error {
 
 	return nil
 }
+
+// MarkAllAsRead set all entries with the status "unread" to "read".
+func (s *Storage) MarkAllAsRead(userID int64) error {
+	defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:MarkAllAsRead] userID=%d", userID))
+
+	query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND status=$3`
+	_, err := s.db.Exec(query, model.EntryStatusRead, userID, model.EntryStatusUnread)
+	if err != nil {
+		return fmt.Errorf("unable to mark all entries as read: %v", err)
+	}
+
+	return nil
+}
diff --git a/template/html/unread.html b/template/html/unread.html
@@ -8,6 +8,9 @@ <h1>{{ t "Unread" }} (<span class="unread-counter">{{ .countUnread }}</span>)</h
         <li>
             <a href="#" data-on-click="markPageAsRead">{{ t "Mark this page as read" }}</a>
         </li>
+        <li>
+            <a href="{{ route "markAllAsRead" }}">{{ t "Mark all as read" }}</a>
+        </li>
     </ul>
     {{ end }}
 </section>

diff --git a/template/views.go b/template/views.go
diff --git a/ui/unread.go b/ui/unread.go
@@ -6,6 +6,7 @@ package ui
 
 import (
 	"github.com/miniflux/miniflux/http/handler"
+	"github.com/miniflux/miniflux/logger"
 	"github.com/miniflux/miniflux/model"
 )
 
@@ -47,3 +48,12 @@ func (c *Controller) ShowUnreadPage(ctx *handler.Context, request *handler.Reque
 		"csrf":        ctx.CSRF(),
 	})
 }
+
+// MarkAllAsRead marks all unread entries as read.
+func (c *Controller) MarkAllAsRead(ctx *handler.Context, request *handler.Request, response *handler.Response) {
+	if err := c.store.MarkAllAsRead(ctx.UserID()); err != nil {
+		logger.Error("[MarkAllAsRead] %v", err)
+	}
+
+	response.Redirect(ctx.Route("unread"))
+}