aboutsummaryrefslogtreecommitdiff
path: root/internal/ui
diff options
context:
space:
mode:
Diffstat (limited to 'internal/ui')
-rw-r--r--internal/ui/category_refresh.go44
-rw-r--r--internal/ui/feed_refresh.go52
-rw-r--r--internal/ui/middleware.go2
-rw-r--r--internal/ui/session/session.go16
4 files changed, 73 insertions, 41 deletions
diff --git a/internal/ui/category_refresh.go b/internal/ui/category_refresh.go
index f852a64b..adbf015a 100644
--- a/internal/ui/category_refresh.go
+++ b/internal/ui/category_refresh.go
@@ -6,10 +6,13 @@ package ui // import "miniflux.app/v2/internal/ui"
import (
"log/slog"
"net/http"
+ "time"
"miniflux.app/v2/internal/http/request"
"miniflux.app/v2/internal/http/response/html"
"miniflux.app/v2/internal/http/route"
+ "miniflux.app/v2/internal/locale"
+ "miniflux.app/v2/internal/ui/session"
)
func (h *handler) refreshCategoryEntriesPage(w http.ResponseWriter, r *http.Request) {
@@ -25,21 +28,38 @@ func (h *handler) refreshCategoryFeedsPage(w http.ResponseWriter, r *http.Reques
func (h *handler) refreshCategory(w http.ResponseWriter, r *http.Request) int64 {
userID := request.UserID(r)
categoryID := request.RouteInt64Param(r, "categoryID")
+ printer := locale.NewPrinter(request.UserLanguage(r))
+ sess := session.New(h.store, request.SessionID(r))
- jobs, err := h.store.NewCategoryBatch(userID, categoryID, h.store.CountFeeds(userID))
- if err != nil {
- html.ServerError(w, r, err)
- return 0
- }
+ // Avoid accidental and excessive refreshes.
+ if time.Now().UTC().Unix()-request.LastForceRefresh(r) < 1800 {
+ sess.NewFlashErrorMessage(printer.Printf("alert.too_many_feeds_refresh"))
+ } else {
+ // We allow the end-user to force refresh all its feeds in this category
+ // without taking into consideration the number of errors.
+ batchBuilder := h.store.NewBatchBuilder()
+ batchBuilder.WithoutDisabledFeeds()
+ batchBuilder.WithUserID(userID)
+ batchBuilder.WithCategoryID(categoryID)
+
+ jobs, err := batchBuilder.FetchJobs()
+ if err != nil {
+ html.ServerError(w, r, err)
+ return 0
+ }
- slog.Info(
- "Triggered a manual refresh of all feeds for a given category from the web ui",
- slog.Int64("user_id", userID),
- slog.Int64("category_id", categoryID),
- slog.Int("nb_jobs", len(jobs)),
- )
+ slog.Info(
+ "Triggered a manual refresh of all feeds for a given category from the web ui",
+ slog.Int64("user_id", userID),
+ slog.Int64("category_id", categoryID),
+ slog.Int("nb_jobs", len(jobs)),
+ )
- go h.pool.Push(jobs)
+ go h.pool.Push(jobs)
+
+ sess.SetLastForceRefresh()
+ sess.NewFlashMessage(printer.Printf("alert.background_feed_refresh"))
+ }
return categoryID
}
diff --git a/internal/ui/feed_refresh.go b/internal/ui/feed_refresh.go
index 57ad3ac4..c07e082a 100644
--- a/internal/ui/feed_refresh.go
+++ b/internal/ui/feed_refresh.go
@@ -6,13 +6,14 @@ package ui // import "miniflux.app/v2/internal/ui"
import (
"log/slog"
"net/http"
+ "time"
"miniflux.app/v2/internal/http/request"
"miniflux.app/v2/internal/http/response/html"
"miniflux.app/v2/internal/http/route"
+ "miniflux.app/v2/internal/locale"
feedHandler "miniflux.app/v2/internal/reader/handler"
"miniflux.app/v2/internal/ui/session"
- "miniflux.app/v2/internal/ui/view"
)
func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
@@ -32,33 +33,36 @@ func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
func (h *handler) refreshAllFeeds(w http.ResponseWriter, r *http.Request) {
userID := request.UserID(r)
+ printer := locale.NewPrinter(request.UserLanguage(r))
+ sess := session.New(h.store, request.SessionID(r))
- user, err := h.store.UserByID(userID)
- if err != nil {
- html.ServerError(w, r, err)
- return
- }
+ // Avoid accidental and excessive refreshes.
+ if time.Now().UTC().Unix()-request.LastForceRefresh(r) < 1800 {
+ sess.NewFlashErrorMessage(printer.Printf("alert.too_many_feeds_refresh"))
+ } else {
+ // We allow the end-user to force refresh all its feeds
+ // without taking into consideration the number of errors.
+ batchBuilder := h.store.NewBatchBuilder()
+ batchBuilder.WithoutDisabledFeeds()
+ batchBuilder.WithUserID(userID)
- jobs, err := h.store.NewUserBatch(userID, h.store.CountFeeds(userID))
- if err != nil {
- html.ServerError(w, r, err)
- return
- }
+ jobs, err := batchBuilder.FetchJobs()
+ if err != nil {
+ html.ServerError(w, r, err)
+ return
+ }
- slog.Info(
- "Triggered a manual refresh of all feeds from the web ui",
- slog.Int64("user_id", userID),
- slog.Int("nb_jobs", len(jobs)),
- )
+ slog.Info(
+ "Triggered a manual refresh of all feeds from the web ui",
+ slog.Int64("user_id", userID),
+ slog.Int("nb_jobs", len(jobs)),
+ )
- go h.pool.Push(jobs)
+ go h.pool.Push(jobs)
- sess := session.New(h.store, request.SessionID(r))
- view := view.New(h.tpl, r, sess)
- view.Set("menu", "feeds")
- view.Set("user", user)
- view.Set("countUnread", h.store.CountUnreadEntries(user.ID))
- view.Set("countErrorFeeds", h.store.CountUserFeedsWithErrors(user.ID))
+ sess.SetLastForceRefresh()
+ sess.NewFlashMessage(printer.Printf("alert.background_feed_refresh"))
+ }
- html.OK(w, r, view.Render("feed_background_refresh"))
+ html.Redirect(w, r, route.Path(h.router, "feeds"))
}
diff --git a/internal/ui/middleware.go b/internal/ui/middleware.go
index 7df1c6af..7cfa5b34 100644
--- a/internal/ui/middleware.go
+++ b/internal/ui/middleware.go
@@ -119,6 +119,8 @@ func (m *middleware) handleAppSession(next http.Handler) http.Handler {
ctx = context.WithValue(ctx, request.UserLanguageContextKey, session.Data.Language)
ctx = context.WithValue(ctx, request.UserThemeContextKey, session.Data.Theme)
ctx = context.WithValue(ctx, request.PocketRequestTokenContextKey, session.Data.PocketRequestToken)
+ ctx = context.WithValue(ctx, request.LastForceRefreshContextKey, session.Data.LastForceRefresh)
+
next.ServeHTTP(w, r.WithContext(ctx))
})
}
diff --git a/internal/ui/session/session.go b/internal/ui/session/session.go
index 619c383a..c47a1828 100644
--- a/internal/ui/session/session.go
+++ b/internal/ui/session/session.go
@@ -4,6 +4,8 @@
package session // import "miniflux.app/v2/internal/ui/session"
import (
+ "time"
+
"miniflux.app/v2/internal/storage"
)
@@ -13,6 +15,15 @@ type Session struct {
sessionID string
}
+// New returns a new session handler.
+func New(store *storage.Storage, sessionID string) *Session {
+ return &Session{store, sessionID}
+}
+
+func (s *Session) SetLastForceRefresh() {
+ s.store.UpdateAppSessionField(s.sessionID, "last_force_refresh", time.Now().UTC().Unix())
+}
+
func (s *Session) SetOAuth2State(state string) {
s.store.UpdateAppSessionField(s.sessionID, "oauth2_state", state)
}
@@ -61,8 +72,3 @@ func (s *Session) SetTheme(theme string) {
func (s *Session) SetPocketRequestToken(requestToken string) {
s.store.UpdateAppSessionField(s.sessionID, "pocket_request_token", requestToken)
}
-
-// New returns a new session handler.
-func New(store *storage.Storage, sessionID string) *Session {
- return &Session{store, sessionID}
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-06 16:47:25 +0000