Refactor feed creation to allow setting most fields via API

Allow API clients to create disabled feeds or define field like "ignore_http_cache".

ui/feed_refresh.go

@@ -11,11 +11,12 @@ import (
 	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/logger"
+	feedHandler "miniflux.app/reader/handler"
 )
 
 func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
 	feedID := request.RouteInt64Param(r, "feedID")
-	if err := h.feedHandler.RefreshFeed(request.UserID(r), feedID); err != nil {
+	if err := feedHandler.RefreshFeed(h.store, request.UserID(r), feedID); err != nil {
 		logger.Error("[UI:RefreshFeed] %v", err)
 	}
 

ui/handler.go

@@ -5,7 +5,6 @@
 package ui // import "miniflux.app/ui"
 
 import (
-	"miniflux.app/reader/feed"
 	"miniflux.app/storage"
 	"miniflux.app/template"
 	"miniflux.app/worker"
@@ -14,9 +13,8 @@ import (
 )
 
 type handler struct {
-	router      *mux.Router
-	store       *storage.Storage
-	tpl         *template.Engine
-	pool        *worker.Pool
-	feedHandler *feed.Handler
+	router *mux.Router
+	store  *storage.Storage
+	tpl    *template.Engine
+	pool   *worker.Pool
 }

ui/subscription_choose.go

@@ -11,6 +11,7 @@ import (
 	"miniflux.app/http/request"
 	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
+	feedHandler "miniflux.app/reader/handler"
 	"miniflux.app/ui/form"
 	"miniflux.app/ui/session"
 	"miniflux.app/ui/view"
@@ -47,20 +48,20 @@ func (h *handler) showChooseSubscriptionPage(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	feed, err := h.feedHandler.CreateFeed(
-		user.ID,
-		subscriptionForm.CategoryID,
-		subscriptionForm.URL,
-		subscriptionForm.Crawler,
-		subscriptionForm.UserAgent,
-		subscriptionForm.Username,
-		subscriptionForm.Password,
-		subscriptionForm.ScraperRules,
-		subscriptionForm.RewriteRules,
-		subscriptionForm.BlocklistRules,
-		subscriptionForm.KeeplistRules,
-		subscriptionForm.FetchViaProxy,
-	)
+	feed, err := feedHandler.CreateFeed(h.store, &feedHandler.FeedCreationArgs{
+		UserID:         user.ID,
+		CategoryID:     subscriptionForm.CategoryID,
+		FeedURL:        subscriptionForm.URL,
+		Crawler:        subscriptionForm.Crawler,
+		UserAgent:      subscriptionForm.UserAgent,
+		Username:       subscriptionForm.Username,
+		Password:       subscriptionForm.Password,
+		ScraperRules:   subscriptionForm.ScraperRules,
+		RewriteRules:   subscriptionForm.RewriteRules,
+		BlocklistRules: subscriptionForm.BlocklistRules,
+		KeeplistRules:  subscriptionForm.KeeplistRules,
+		FetchViaProxy:  subscriptionForm.FetchViaProxy,
+	})
 	if err != nil {
 		view.Set("form", subscriptionForm)
 		view.Set("errorMessage", err)

ui/subscription_submit.go

@@ -12,6 +12,7 @@ import (
 	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/logger"
+	feedHandler "miniflux.app/reader/handler"
 	"miniflux.app/reader/subscription"
 	"miniflux.app/ui/form"
 	"miniflux.app/ui/session"
@@ -74,20 +75,20 @@ func (h *handler) submitSubscription(w http.ResponseWriter, r *http.Request) {
 		v.Set("errorMessage", "error.subscription_not_found")
 		html.OK(w, r, v.Render("add_subscription"))
 	case n == 1:
-		feed, err := h.feedHandler.CreateFeed(
-			user.ID,
-			subscriptionForm.CategoryID,
-			subscriptions[0].URL,
-			subscriptionForm.Crawler,
-			subscriptionForm.UserAgent,
-			subscriptionForm.Username,
-			subscriptionForm.Password,
-			subscriptionForm.ScraperRules,
-			subscriptionForm.RewriteRules,
-			subscriptionForm.BlocklistRules,
-			subscriptionForm.KeeplistRules,
-			subscriptionForm.FetchViaProxy,
-		)
+		feed, err := feedHandler.CreateFeed(h.store, &feedHandler.FeedCreationArgs{
+			UserID:         user.ID,
+			CategoryID:     subscriptionForm.CategoryID,
+			FeedURL:        subscriptions[0].URL,
+			Crawler:        subscriptionForm.Crawler,
+			UserAgent:      subscriptionForm.UserAgent,
+			Username:       subscriptionForm.Username,
+			Password:       subscriptionForm.Password,
+			ScraperRules:   subscriptionForm.ScraperRules,
+			RewriteRules:   subscriptionForm.RewriteRules,
+			BlocklistRules: subscriptionForm.BlocklistRules,
+			KeeplistRules:  subscriptionForm.KeeplistRules,
+			FetchViaProxy:  subscriptionForm.FetchViaProxy,
+		})
 		if err != nil {
 			v.Set("form", subscriptionForm)
 			v.Set("errorMessage", err)

ui/ui.go

@@ -8,19 +8,18 @@ import (
 	"net/http"
 
 	"miniflux.app/config"
-	"miniflux.app/reader/feed"
 	"miniflux.app/storage"
 	"miniflux.app/template"
 	"miniflux.app/worker"
 
 	"github.com/gorilla/mux"
-	"github.com/mitchellh/go-server-timing"
+	servertiming "github.com/mitchellh/go-server-timing"
 )
 
 // Serve declares all routes for the user interface.
-func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool, feedHandler *feed.Handler) {
+func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) {
 	middleware := newMiddleware(router, store)
-	handler := &handler{router, store, template.NewEngine(router), pool, feedHandler}
+	handler := &handler{router, store, template.NewEngine(router), pool}
 
 	uiRouter := router.NewRoute().Subrouter()
 	uiRouter.Use(middleware.handleUserSession)