astra
/
telegram-bot-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error handling for uploadFile calls

bot-api-6.1
Denis Orlikhin 2018-12-08 21:17:07 +03:00
parent 5d997a78c8
commit cb3a14a3b5
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bot.go
View File

@ -208,30 +208,33 @@ func (bot *BotAPI) UploadFile(endpoint string, params Params, fieldname string,
ms.SetupRequest(req) ms.SetupRequest(req)
res, err := bot.Client.Do(req) resp, err := bot.Client.Do(req)
if err != nil { if err != nil {
return APIResponse{}, err return APIResponse{}, err
} }
defer res.Body.Close() defer resp.Body.Close()
bytes, err := ioutil.ReadAll(res.Body) var apiResp APIResponse
bytes, err := bot.decodeAPIResponse(resp.Body, &apiResp)
if err != nil { if err != nil {
return APIResponse{}, err return apiResp, err
} }
if bot.Debug { if bot.Debug {
log.Printf("Endpoint: %s, response: %s\n", endpoint, string(bytes)) log.Printf("Endpoint: %s, response: %s\n", endpoint, string(bytes))
} }
var apiResp APIResponse if !apiResp.Ok {
var parameters ResponseParameters
err = json.Unmarshal(bytes, &apiResp) if apiResp.Parameters != nil {
if err != nil { parameters = *apiResp.Parameters
return APIResponse{}, err
} }
if !apiResp.Ok { return apiResp, Error{
return APIResponse{}, errors.New(apiResp.Description) Message: apiResp.Description,
ResponseParameters: parameters,
}
} }
return apiResp, nil return apiResp, nil