From 0078532d78e8abfeb505906d9c3f5baeb1299683 Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Sat, 5 Jun 2021 21:51:33 +0200
Subject: [PATCH] cleanup errors

---
 pkg/fetch/fetch.go | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkg/fetch/fetch.go b/pkg/fetch/fetch.go
index 0971d37..9c9bab0 100644
--- a/pkg/fetch/fetch.go
+++ b/pkg/fetch/fetch.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"encoding/hex"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -132,17 +133,13 @@ func FeedItems(fetcher FetcherFunc, fetchURL, contentType string, body io.Reader
 
 			items = append(items, r)
 		}
-	} else if strings.HasPrefix(contentType, "application/json") { // json feed?
+	} else if strings.HasPrefix(contentType, "application/json") && strings.HasPrefix(contentType, "application/feed+json") { // json feed?
 		var feed jsonfeed.Feed
-		dec := json.NewDecoder(body)
-		err := dec.Decode(&feed)
+		err := json.NewDecoder(body).Decode(&feed)
 		if err != nil {
-			log.Printf("Error while parsing json feed: %s\n", err)
-			return items, err
+			return items, fmt.Errorf("could not parse as jsonfeed: %v", err)
 		}
 
-		log.Printf("%#v\n", feed)
-
 		author := &microsub.Card{}
 		author.Type = "card"
 		author.Name = feed.Author.Name
@@ -180,13 +177,11 @@ func FeedItems(fetcher FetcherFunc, fetchURL, contentType string, body io.Reader
 	} else if strings.HasPrefix(contentType, "text/xml") || strings.HasPrefix(contentType, "application/rss+xml") || strings.HasPrefix(contentType, "application/atom+xml") || strings.HasPrefix(contentType, "application/xml") {
 		body, err := ioutil.ReadAll(body)
 		if err != nil {
-			log.Printf("Error while parsing rss/atom feed: %s\n", err)
-			return items, err
+			return items, fmt.Errorf("could not read feed for rss/atom: %v", err)
 		}
 		feed, err := rss.Parse(body)
 		if err != nil {
-			log.Printf("Error while parsing rss/atom feed: %s\n", err)
-			return items, err
+			return items, fmt.Errorf("while parsing rss/atom feed: %v", err)
 		}
 
 		baseURL, _ := url.Parse(fetchURL)
@@ -222,7 +217,7 @@ func FeedItems(fetcher FetcherFunc, fetchURL, contentType string, body io.Reader
 			items = append(items, item)
 		}
 	} else {
-		log.Printf("Unknown Content-Type: %s\n", contentType)
+		return items, fmt.Errorf("unknown content-type %s for url %s", contentType, fetchURL)
 	}
 
 	for i, v := range items {