Skip to content

Commit a09d4b5

Browse files
authored
Refactor request/response variable names (#205)
r *Request is more consistent with n *Notification
1 parent 45981da commit a09d4b5

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

client.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,32 +162,32 @@ func (c *Client) PushWithContext(ctx Context, n *Notification) (*Response, error
162162
}
163163

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

170170
if c.Token != nil {
171-
c.setTokenHeader(req)
171+
c.setTokenHeader(request)
172172
}
173173

174-
setHeaders(req, n)
174+
setHeaders(request, n)
175175

176-
httpRes, err := c.HTTPClient.Do(req)
176+
response, err := c.HTTPClient.Do(request)
177177
if err != nil {
178178
return nil, err
179179
}
180-
defer httpRes.Body.Close()
180+
defer response.Body.Close()
181181

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

186-
decoder := json.NewDecoder(httpRes.Body)
187-
if err := decoder.Decode(response); err != nil && err != io.EOF {
186+
decoder := json.NewDecoder(response.Body)
187+
if err := decoder.Decode(r); err != nil && err != io.EOF {
188188
return &Response{}, err
189189
}
190-
return response, nil
190+
return r, nil
191191
}
192192

193193
// CloseIdleConnections closes any underlying connections which were previously

0 commit comments

Comments
 (0)