From b6062ffc60bc35a21bedc51412daa8af31a82f32 Mon Sep 17 00:00:00 2001
From: Kyle Sanderson <kyle.leet@gmail.com>
Date: Sun, 26 Mar 2023 14:10:59 -0700
Subject: [PATCH] fix(feeds): check settings before unmarshalling (#789)

---
 internal/database/feed.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/internal/database/feed.go b/internal/database/feed.go
index ee3551e..7a65424 100644
--- a/internal/database/feed.go
+++ b/internal/database/feed.go
@@ -68,12 +68,14 @@ func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
 	f.ApiKey = apiKey.String
 	f.Cookie = cookie.String
 
-	var settingsJson domain.FeedSettingsJSON
-	if err = json.Unmarshal([]byte(settings.String), &settingsJson); err != nil {
-		return nil, errors.Wrap(err, "error unmarshal settings")
-	}
+	if settings.Valid {
+		var settingsJson domain.FeedSettingsJSON
+		if err = json.Unmarshal([]byte(settings.String), &settingsJson); err != nil {
+			return nil, errors.Wrap(err, "error unmarshal settings")
+		}
 
-	f.Settings = &settingsJson
+		f.Settings = &settingsJson
+	}
 
 	return &f, nil
 }