Skip to content

Commit

Permalink
Refactor request/response variable names
Browse files Browse the repository at this point in the history
r *Request is more consistent with n *Notification
  • Loading branch information
moredure committed Apr 3, 2022
1 parent 45981da commit 76d2745
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,32 +162,32 @@ func (c *Client) PushWithContext(ctx Context, n *Notification) (*Response, error
}

url := c.Host + "/3/device/" + n.DeviceToken
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(payload))
request, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(payload))
if err != nil {
return nil, err
}

if c.Token != nil {
c.setTokenHeader(req)
c.setTokenHeader(request)
}

setHeaders(req, n)
setHeaders(request, n)

httpRes, err := c.HTTPClient.Do(req)
response, err := c.HTTPClient.Do(request)
if err != nil {
return nil, err
}
defer httpRes.Body.Close()
defer response.Body.Close()

response := &Response{}
response.StatusCode = httpRes.StatusCode
response.ApnsID = httpRes.Header.Get("apns-id")
r := &Response{}
r.StatusCode = response.StatusCode
r.ApnsID = response.Header.Get("apns-id")

decoder := json.NewDecoder(httpRes.Body)
if err := decoder.Decode(response); err != nil && err != io.EOF {
decoder := json.NewDecoder(response.Body)
if err := decoder.Decode(r); err != nil && err != io.EOF {
return &Response{}, err
}
return response, nil
return r, nil
}

// CloseIdleConnections closes any underlying connections which were previously
Expand Down

0 comments on commit 76d2745

Please sign in to comment.