From 41654bf49d4fb9aeec508d52f3c2aac8bab7f0f5 Mon Sep 17 00:00:00 2001 From: Pascal Precht <445106+0x-r4bbit@users.noreply.github.com> Date: Tue, 7 Feb 2023 12:29:22 +0100 Subject: [PATCH] fix(api): ensure getRecentGifs doesn't error when response is empty Because the BLOB retrieved from the database can be empty, umarshalling the data into JSON causes an error. The API should simply return an empty list of there are no recent gifs. --- services/gif/gif.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/gif/gif.go b/services/gif/gif.go index 7fde3d99a..793293bc5 100644 --- a/services/gif/gif.go +++ b/services/gif/gif.go @@ -131,12 +131,15 @@ func (api *API) GetRecentGifs() (recentGifs []Gif, err error) { if err != nil { return nil, err } + recentGifs = make([]Gif, 0) savedRecentGifs := []Gif{} - err = json.Unmarshal(gifs, &savedRecentGifs) - if err != nil { - return nil, err + if len(gifs) > 0 { + err = json.Unmarshal(gifs, &savedRecentGifs) + if err != nil { + return nil, err + } + recentGifs = savedRecentGifs } - recentGifs = savedRecentGifs return recentGifs, nil }