prevent null pointer issue with contexts

Postcord · Feb 9, 2022 · a773046 · a773046
1 parent 3d53ef7
commit a773046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/http_client.go b/http_client.go
@@ -2,6 +2,7 @@ package rest
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -22,6 +23,9 @@ type DefaultHTTPClient struct {
 }
 
 func (c *DefaultHTTPClient) Request(req *request) (*DiscordResponse, error) {
+	if req.ctx == nil {
+		req.ctx = context.Background()
+	}
 	l := zerolog.Ctx(req.ctx)
 	var reader io.Reader = nil
 	if req.body != nil {

diff --git a/http_client_test.go b/http_client_test.go
@@ -1,6 +1,7 @@
 package rest
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -41,6 +42,7 @@ func TestDefaultHTTPClient_Request(t *testing.T) {
 				method:      http.MethodGet,
 				body:        []byte(`test request body`),
 				contentType: JsonContentType,
+				ctx:         context.Background(),
 			},
 			wantResponse: &DiscordResponse{
 				StatusCode: 200,