diff --git a/src/main/java/org/telegram/telegrambots/api/objects/Message.java b/src/main/java/org/telegram/telegrambots/api/objects/Message.java index aa76ef94..8fa6f5d8 100644 --- a/src/main/java/org/telegram/telegrambots/api/objects/Message.java +++ b/src/main/java/org/telegram/telegrambots/api/objects/Message.java @@ -138,9 +138,6 @@ public class Message implements IBotApiObject { if (jsonObject.has(VIDEO_FIELD)) { this.video = new Video(jsonObject.getJSONObject(VIDEO_FIELD)); } - if(jsonObject.has(AUDIO_FIELD)){ - this.audio = new Audio(jsonObject.getJSONObject(AUDIO_FIELD)); - } if (jsonObject.has(CONTACT_FIELD)) { this.contact = new Contact(jsonObject.getJSONObject(CONTACT_FIELD)); } diff --git a/src/main/java/org/telegram/telegrambots/bots/AbsSender.java b/src/main/java/org/telegram/telegrambots/bots/AbsSender.java index 44500d18..7f14d7c4 100644 --- a/src/main/java/org/telegram/telegrambots/bots/AbsSender.java +++ b/src/main/java/org/telegram/telegrambots/bots/AbsSender.java @@ -520,16 +520,16 @@ public abstract class AbsSender { JSONObject jsonObject = new JSONObject(responseContent); - //if we got an ok, then we can expect a "reseult" section. and out of this can a new Message object be built - if(jsonObject.has("ok") && jsonObject.getBoolean("ok")){ - return new Message(jsonObject.getJSONObject("result")); + /* if we got not an "ok" with false, we have a response like that + * + * {"description":"[Error]: Bad Request: chat not found","error_code":400,"ok":false} + */ + if(!jsonObject.getBoolean("ok")){ + throw new TelegramApiException("Error at sendAudio", jsonObject.getString("description")); } - //and if not, there should be a field in our jsonObject that represents a boolean "false" with a key of "ok" - //{"description":"[Error]: Bad Request: chat not found","error_code":400,"ok":false} - // for example. and can throw an exception, cause there was an error... - throw new TelegramApiException("Error at sendAudio", jsonObject.getString("description")); - + // and if not, we can expect a "result" section. and out of this can a new Message object be built + return new Message(jsonObject.getJSONObject("result")); } /**