Skip to content

Commit b723a36

Browse files
committed
Make ParseErrorResponse public
1 parent 79e2286 commit b723a36

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

client.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func (cli *Client) MakeFullRequest(params FullRequest) ([]byte, error) {
403403
return nil, err
404404
}
405405
if params.Handler == nil {
406-
params.Handler = cli.handleNormalResponse
406+
params.Handler = handleNormalResponse
407407
}
408408
req.Header.Set("User-Agent", cli.UserAgent)
409409
if len(cli.AccessToken) > 0 {
@@ -441,7 +441,7 @@ func (cli *Client) doRetry(req *http.Request, cause error, retries int, backoff
441441
return cli.executeCompiledRequest(req, retries-1, backoff*2, responseJSON, handler)
442442
}
443443

444-
func (cli *Client) readRequestBody(req *http.Request, res *http.Response) ([]byte, error) {
444+
func readRequestBody(req *http.Request, res *http.Response) ([]byte, error) {
445445
contents, err := io.ReadAll(res.Body)
446446
if err != nil {
447447
return nil, HTTPError{
@@ -468,7 +468,7 @@ func (cli *Client) streamResponse(req *http.Request, res *http.Response, respons
468468
file, err := os.CreateTemp("", "mautrix-response-")
469469
if err != nil {
470470
log.Warn().Err(err).Msg("Failed to create temporary file for streaming response")
471-
_, err = cli.handleNormalResponse(req, res, responseJSON)
471+
_, err = handleNormalResponse(req, res, responseJSON)
472472
return nil, err
473473
}
474474
defer closeTemp(log, file)
@@ -483,8 +483,8 @@ func (cli *Client) streamResponse(req *http.Request, res *http.Response, respons
483483
}
484484
}
485485

486-
func (cli *Client) handleNormalResponse(req *http.Request, res *http.Response, responseJSON interface{}) ([]byte, error) {
487-
if contents, err := cli.readRequestBody(req, res); err != nil {
486+
func handleNormalResponse(req *http.Request, res *http.Response, responseJSON interface{}) ([]byte, error) {
487+
if contents, err := readRequestBody(req, res); err != nil {
488488
return nil, err
489489
} else if responseJSON == nil {
490490
return contents, nil
@@ -502,8 +502,8 @@ func (cli *Client) handleNormalResponse(req *http.Request, res *http.Response, r
502502
}
503503
}
504504

505-
func (cli *Client) handleResponseError(req *http.Request, res *http.Response) ([]byte, error) {
506-
contents, err := cli.readRequestBody(req, res)
505+
func ParseErrorResponse(req *http.Request, res *http.Response) ([]byte, error) {
506+
contents, err := readRequestBody(req, res)
507507
if err != nil {
508508
return contents, err
509509
}
@@ -580,7 +580,7 @@ func (cli *Client) executeCompiledRequest(req *http.Request, retries int, backof
580580

581581
var body []byte
582582
if res.StatusCode < 200 || res.StatusCode >= 300 {
583-
body, err = cli.handleResponseError(req, res)
583+
body, err = ParseErrorResponse(req, res)
584584
cli.LogRequestDone(req, res, nil, len(body), duration)
585585
} else {
586586
body, err = handler(req, res, responseJSON)

0 commit comments

Comments
 (0)