Refactor HTTP Client and LocalizedError packages

miniflux · Oct 22, 2023 · 687a759 · 687a759
1 parent 5e6c054
commit 687a759
Show file tree

Hide file tree

Showing 101 changed files with 1,203 additions and 10,633 deletions.
diff --git a/.github/codeql/config.yml b/.github/codeql/config.yml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -31,9 +31,6 @@ jobs:
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/config.yml
 
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2

diff --git a/internal/api/feed.go b/internal/api/feed.go
@@ -41,9 +41,9 @@ func (h *handler) createFeed(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	feed, err := feedHandler.CreateFeed(h.store, userID, &feedCreationRequest)
-	if err != nil {
-		json.ServerError(w, r, err)
+	feed, localizedError := feedHandler.CreateFeed(h.store, userID, &feedCreationRequest)
+	if localizedError != nil {
+		json.ServerError(w, r, localizedError.Error())
 		return
 	}
 
@@ -59,9 +59,9 @@ func (h *handler) refreshFeed(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := feedHandler.RefreshFeed(h.store, userID, feedID, false)
-	if err != nil {
-		json.ServerError(w, r, err)
+	localizedError := feedHandler.RefreshFeed(h.store, userID, feedID, false)
+	if localizedError != nil {
+		json.ServerError(w, r, localizedError.Error())
 		return
 	}
 

diff --git a/internal/api/subscription.go b/internal/api/subscription.go
@@ -25,7 +25,7 @@ func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	subscriptions, finderErr := subscription.FindSubscriptions(
+	subscriptions, localizedError := subscription.FindSubscriptions(
 		subscriptionDiscoveryRequest.URL,
 		subscriptionDiscoveryRequest.UserAgent,
 		subscriptionDiscoveryRequest.Cookie,
@@ -34,12 +34,13 @@ func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request)
 		subscriptionDiscoveryRequest.FetchViaProxy,
 		subscriptionDiscoveryRequest.AllowSelfSignedCertificates,
 	)
-	if finderErr != nil {
-		json.ServerError(w, r, finderErr)
+
+	if localizedError != nil {
+		json.ServerError(w, r, localizedError.Error())
 		return
 	}
 
-	if subscriptions == nil {
+	if len(subscriptions) == 0 {
 		json.NotFound(w, r)
 		return
 	}

diff --git a/internal/errors/errors.go b/internal/errors/errors.go
diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go
@@ -673,9 +673,9 @@ func (h *handler) quickAddHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	subscriptions, s_err := mfs.FindSubscriptions(url, "", "", "", "", false, false)
-	if s_err != nil {
-		json.ServerError(w, r, s_err)
+	subscriptions, localizedError := mfs.FindSubscriptions(url, "", "", "", "", false, false)
+	if localizedError != nil {
+		json.ServerError(w, r, localizedError.Error())
 		return
 	}
 
@@ -746,9 +746,9 @@ func subscribe(newFeed Stream, category Stream, title string, store *storage.Sto
 		return nil, verr.Error()
 	}
 
-	created, err := mff.CreateFeed(store, userID, &feedRequest)
+	created, localizedError := mff.CreateFeed(store, userID, &feedRequest)
 	if err != nil {
-		return nil, err
+		return nil, localizedError.Error()
 	}
 
 	if title != "" {