Update the dependencies

Add the vendor directory to git

Gopkg.toml

@@ -43,7 +43,7 @@
 
 [[constraint]]
   name = "github.com/alexedwards/scs"
-  version = "0.1.0"
+  version = "1.1.0"
 
 [[constraint]]
   branch = "master"
@@ -113,6 +113,10 @@
   branch = "master"
   name = "golang.org/x/text"
 
+[[constraint]]
+  name = "github.com/golang/mock"
+  revision = "747e9e639"
+
 [[constraint]]
   name = "gopkg.in/gcfg.v1"
   version = "1.2.0"

api/api.go

@@ -358,7 +358,7 @@ func articlesRoutes(
 func opmlRoutes(service repo.Service, feedManager *readeef.FeedManager, log log.Log, gzip, access mw) routes {
 	return routes{path: "/opml", route: func(r chi.Router) {
 		r.Use(gzip, access)
-		r.With(timeout(10*time.Second)).Get("/", exportOPML(service, feedManager, log))
+		r.With(timeout(10*time.Second)).Get("/", exportOPML(service, log))
 		r.With(timeout(30*time.Second)).Post("/", importOPML(service.FeedRepo(), feedManager, log))
 	}}
 }

api/feed.go

@@ -87,6 +87,7 @@ func (e addFeedError) Error() string {
 type feedManager interface {
 	AddFeedByLink(link string) (content.Feed, error)
 	RemoveFeed(feed content.Feed)
+	DiscoverFeeds(link string) ([]content.Feed, error)
 }
 
 func addFeed(repo repo.Feed, feedManager feedManager) http.HandlerFunc {
@@ -175,11 +176,7 @@ func deleteFeed(repo repo.Feed, feedManager feedManager, log log.Log) http.Handl
 	}
 }
 
-type feedDiscoverer interface {
-	DiscoverFeeds(link string) ([]content.Feed, error)
-}
-
-func discoverFeeds(repo repo.Feed, discoverer feedDiscoverer, log log.Log) http.HandlerFunc {
+func discoverFeeds(repo repo.Feed, discoverer feedManager, log log.Log) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		query := r.URL.Query().Get("query")
 		if query == "" {
@@ -201,7 +198,7 @@ func discoverFeeds(repo repo.Feed, discoverer feedDiscoverer, log log.Log) http.
 	}
 }
 
-func discoverFeedsByQuery(query string, user content.User, repo repo.Feed, discoverer feedDiscoverer) ([]content.Feed, error) {
+func discoverFeedsByQuery(query string, user content.User, repo repo.Feed, discoverer feedManager) ([]content.Feed, error) {
 	userFeeds, err := repo.ForUser(user)
 	if err != nil {
 		return nil, errors.WithMessage(err, "getting feeds for user")

api/opml.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/urandom/readeef"
 	"github.com/urandom/readeef/content"
 	"github.com/urandom/readeef/content/repo"
 	"github.com/urandom/readeef/log"
@@ -14,10 +13,15 @@ import (
 
 func importOPML(
 	repo repo.Feed,
-	feedManager *readeef.FeedManager,
+	feedManager feedManager,
 	log log.Log,
 ) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		user, stop := userFromRequest(w, r)
+		if stop {
+			return
+		}
+
 		opmlData := r.Form.Get("opml")
 		_, dryRun := r.Form["dryRun"]
 
@@ -27,11 +31,6 @@ func importOPML(
 			return
 		}
 
-		user, stop := userFromRequest(w, r)
-		if stop {
-			return
-		}
-
 		feeds, err := repo.ForUser(user)
 		if err != nil {
 			fatal(w, log, "Error getting user feeds: %+v", err)
@@ -83,7 +82,6 @@ func importOPML(
 
 func exportOPML(
 	service repo.Service,
-	feedManager *readeef.FeedManager,
 	log log.Log,
 ) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {