From 5d28cf05d07dfba60252d55fdaff5b31f0552895 Mon Sep 17 00:00:00 2001 From: Sergey Juriev Date: Wed, 18 Jan 2017 12:05:01 +0300 Subject: [PATCH] Fix returning APIResponse from SetWebHook --- bot.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bot.go b/bot.go index 60519cd..93f3100 100644 --- a/bot.go +++ b/bot.go @@ -184,7 +184,11 @@ func (bot *BotAPI) UploadFile(endpoint string, params map[string]string, fieldna } var apiResp APIResponse - json.Unmarshal(bytes, &apiResp) + + err = json.Unmarshal(bytes, &apiResp) + if err != nil { + return APIResponse{}, err + } if !apiResp.Ok { return APIResponse{}, errors.New(apiResp.Description) @@ -431,14 +435,7 @@ func (bot *BotAPI) SetWebhook(config WebhookConfig) (APIResponse, error) { return APIResponse{}, err } - var apiResp APIResponse - json.Unmarshal(resp.Result, &apiResp) - - if bot.Debug { - log.Printf("setWebhook resp: %+v\n", apiResp) - } - - return apiResp, nil + return resp, nil } // GetWebhookInfo allows you to fetch information about a webhook and if