From 778346b0b04bc52c89529668b37c1086bebe1674 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Sun, 14 Oct 2018 21:43:48 -0700
Subject: Simplify feed fetcher

- Add browser package to handle HTTP errors
- Reduce code duplication
---
 storage/icon.go |  6 +++---
 storage/user.go | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'storage')

diff --git a/storage/icon.go b/storage/icon.go
index 3a3686d..aa9f99e 100644
--- a/storage/icon.go
+++ b/storage/icon.go
@@ -100,8 +100,8 @@ func (s *Storage) CreateIcon(icon *model.Icon) error {
 }
 
 // CreateFeedIcon creates an icon and associate the icon to the given feed.
-func (s *Storage) CreateFeedIcon(feed *model.Feed, icon *model.Icon) error {
-	defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateFeedIcon] feedID=%d", feed.ID))
+func (s *Storage) CreateFeedIcon(feedID int64, icon *model.Icon) error {
+	defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateFeedIcon] feedID=%d", feedID))
 
 	err := s.IconByHash(icon)
 	if err != nil {
@@ -115,7 +115,7 @@ func (s *Storage) CreateFeedIcon(feed *model.Feed, icon *model.Icon) error {
 		}
 	}
 
-	_, err = s.db.Exec(`INSERT INTO feed_icons (feed_id, icon_id) VALUES ($1, $2)`, feed.ID, icon.ID)
+	_, err = s.db.Exec(`INSERT INTO feed_icons (feed_id, icon_id) VALUES ($1, $2)`, feedID, icon.ID)
 	if err != nil {
 		return fmt.Errorf("unable to create feed icon: %v", err)
 	}
diff --git a/storage/user.go b/storage/user.go
index 9d584d5..e91e3b8 100644
--- a/storage/user.go
+++ b/storage/user.go
@@ -175,15 +175,14 @@ func (s *Storage) UpdateUser(user *model.User) error {
 }
 
 // UserLanguage returns the language of the given user.
-func (s *Storage) UserLanguage(userID int64) (language string, err error) {
+func (s *Storage) UserLanguage(userID int64) (language string) {
 	defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserLanguage] userID=%d", userID))
-	err = s.db.QueryRow(`SELECT language FROM users WHERE id = $1`, userID).Scan(&language)
-	if err == sql.ErrNoRows {
-		return "en_US", nil
-	} else if err != nil {
-		return "", fmt.Errorf("unable to fetch user language: %v", err)
+	err := s.db.QueryRow(`SELECT language FROM users WHERE id = $1`, userID).Scan(&language)
+	if err != nil {
+		return "en_US"
 	}
-	return language, nil
+
+	return language
 }
 
 // UserByID finds a user by the ID.
-- 
cgit v1.2.3