taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Fix HackerNews Widget (#1063)

Browse Source 
After commit 49109c77f719cedc5c7f15bcf255f952d2c3b90d the HackerNews widget did not work as expected. It failed with a error message "http: read on closed response body". This commit fixes the underlying reader issue by reading the whole request body within the apiRequest function and returning the []bytes of the response instead of *http.Response. If we want to continue to return *http.Response this would lead to the problem that the caller (GetStory() and GetStories()) always need to close the Request Body. The ways before this MR is a bit problematic because the defer gets executed when the function is "done", so it closes the Body already before the utils.ParseJSON can read it.

Signed-off-by: Lukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
This commit is contained in:
Lukas Kämmerling 2021-03-20 05:43:54 +01:00 committed by GitHub
parent 0035e479c8
commit 9446886b37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/hackernews/client.go
View File

@ -1,7 +1,9 @@
package hackernews package hackernews
import ( import (
"bytes"
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"strconv" "strconv"
"strings" "strings"
@ -19,7 +21,7 @@ func GetStories(storyType string) ([]int, error) {
return storyIds, err return storyIds, err
} }
err = utils.ParseJSON(&storyIds, resp.Body) err = utils.ParseJSON(&storyIds, bytes.NewReader(resp))
if err != nil { if err != nil {
return storyIds, err return storyIds, err
} }
@ -36,7 +38,7 @@ func GetStory(id int) (Story, error) {
return story, err return story, err
} }
err = utils.ParseJSON(&story, resp.Body) err = utils.ParseJSON(&story, bytes.NewReader(resp))
if err != nil { if err != nil {
return story, err return story, err
} }
@ -50,7 +52,7 @@ var (
apiEndpoint = "https://hacker-news.firebaseio.com/v0/" apiEndpoint = "https://hacker-news.firebaseio.com/v0/"
) )
func apiRequest(path string) (*http.Response, error) { func apiRequest(path string) ([]byte, error) {
req, err := http.NewRequest("GET", apiEndpoint+path+".json", nil) req, err := http.NewRequest("GET", apiEndpoint+path+".json", nil)
if err != nil { if err != nil {
return nil, err return nil, err
@ -61,11 +63,16 @@ func apiRequest(path string) (*http.Response, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func() { _ = resp.Body.Close() }() defer func() { _ = resp.Body.Close() }()
if resp.StatusCode < 200 || resp.StatusCode > 299 { if resp.StatusCode < 200 || resp.StatusCode > 299 {
return nil, fmt.Errorf(resp.Status) return nil, fmt.Errorf(resp.Status)
} }
return resp, nil body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
return body, nil
} }