fix(feeds): check settings before unmarshalling (#789)

This commit is contained in:
Kyle Sanderson 2023-03-26 14:10:59 -07:00 committed by GitHub
parent fe2950f630
commit b6062ffc60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -68,12 +68,14 @@ func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
f.ApiKey = apiKey.String f.ApiKey = apiKey.String
f.Cookie = cookie.String f.Cookie = cookie.String
var settingsJson domain.FeedSettingsJSON if settings.Valid {
if err = json.Unmarshal([]byte(settings.String), &settingsJson); err != nil { var settingsJson domain.FeedSettingsJSON
return nil, errors.Wrap(err, "error unmarshal settings") 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 return &f, nil
} }