M bot.go → bot.go

@@ -208,30 +208,33 @@ }
 
 	ms.SetupRequest(req)
 
-	res, err := bot.Client.Do(req)
+	resp, err := bot.Client.Do(req)
 	if err != nil {
 		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 {
-		return APIResponse{}, err
+		return apiResp, err
 	}
 
 	if bot.Debug {
 		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 err != nil {
-		return APIResponse{}, err
-	}
+		if apiResp.Parameters != nil {
+			parameters = *apiResp.Parameters
+		}
 
-	if !apiResp.Ok {
-		return APIResponse{}, errors.New(apiResp.Description)
+		return apiResp, Error{
+			Message:            apiResp.Description,
+			ResponseParameters: parameters,
+		}
 	}
 
 	return apiResp, nil