@@ -403,7 +403,7 @@ func (cli *Client) MakeFullRequest(params FullRequest) ([]byte, error) {
403
403
return nil , err
404
404
}
405
405
if params .Handler == nil {
406
- params .Handler = cli . handleNormalResponse
406
+ params .Handler = handleNormalResponse
407
407
}
408
408
req .Header .Set ("User-Agent" , cli .UserAgent )
409
409
if len (cli .AccessToken ) > 0 {
@@ -441,7 +441,7 @@ func (cli *Client) doRetry(req *http.Request, cause error, retries int, backoff
441
441
return cli .executeCompiledRequest (req , retries - 1 , backoff * 2 , responseJSON , handler )
442
442
}
443
443
444
- func ( cli * Client ) readRequestBody (req * http.Request , res * http.Response ) ([]byte , error ) {
444
+ func readRequestBody (req * http.Request , res * http.Response ) ([]byte , error ) {
445
445
contents , err := io .ReadAll (res .Body )
446
446
if err != nil {
447
447
return nil , HTTPError {
@@ -468,7 +468,7 @@ func (cli *Client) streamResponse(req *http.Request, res *http.Response, respons
468
468
file , err := os .CreateTemp ("" , "mautrix-response-" )
469
469
if err != nil {
470
470
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 )
472
472
return nil , err
473
473
}
474
474
defer closeTemp (log , file )
@@ -483,8 +483,8 @@ func (cli *Client) streamResponse(req *http.Request, res *http.Response, respons
483
483
}
484
484
}
485
485
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 {
488
488
return nil , err
489
489
} else if responseJSON == nil {
490
490
return contents , nil
@@ -502,8 +502,8 @@ func (cli *Client) handleNormalResponse(req *http.Request, res *http.Response, r
502
502
}
503
503
}
504
504
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 )
507
507
if err != nil {
508
508
return contents , err
509
509
}
@@ -580,7 +580,7 @@ func (cli *Client) executeCompiledRequest(req *http.Request, retries int, backof
580
580
581
581
var body []byte
582
582
if res .StatusCode < 200 || res .StatusCode >= 300 {
583
- body , err = cli . handleResponseError (req , res )
583
+ body , err = ParseErrorResponse (req , res )
584
584
cli .LogRequestDone (req , res , nil , len (body ), duration )
585
585
} else {
586
586
body , err = handler (req , res , responseJSON )
0 commit comments