andreacavalli/TelegramBots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'antonu17-fix-message-caption' into dev

Browse Source
This commit is contained in:
Rubenlagus 2016-05-19 20:39:32 +02:00
commit 37eac08554
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/telegram/telegrambots/api/objects/Message.java
View File

@ -46,6 +46,7 @@ public class Message implements IBotApiObject {
private static final String GROUPCHATCREATED_FIELD = "group_chat_created"; private static final String GROUPCHATCREATED_FIELD = "group_chat_created";
private static final String REPLYTOMESSAGE_FIELD = "reply_to_message"; private static final String REPLYTOMESSAGE_FIELD = "reply_to_message";
private static final String VOICE_FIELD = "voice"; private static final String VOICE_FIELD = "voice";
private static final String CAPTION_FIELD = "caption";
private static final String SUPERGROUPCREATED_FIELD = "supergroup_chat_created"; private static final String SUPERGROUPCREATED_FIELD = "supergroup_chat_created";
private static final String CHANNELCHATCREATED_FIELD = "channel_chat_created"; private static final String CHANNELCHATCREATED_FIELD = "channel_chat_created";
private static final String MIGRATETOCHAT_FIELD = "migrate_to_chat_id"; private static final String MIGRATETOCHAT_FIELD = "migrate_to_chat_id";
@ -106,6 +107,8 @@ public class Message implements IBotApiObject {
private Message replyToMessage; private Message replyToMessage;
@JsonProperty(VOICE_FIELD) @JsonProperty(VOICE_FIELD)
private Voice voice; ///< Optional. Message is a voice message, information about the file private Voice voice; ///< Optional. Message is a voice message, information about the file
@JsonProperty(CAPTION_FIELD)
private String caption; ///< Optional. Caption for the document, photo or video, 0-200 characters
@JsonProperty(SUPERGROUPCREATED_FIELD) @JsonProperty(SUPERGROUPCREATED_FIELD)
private Boolean superGroupCreated; ///< Optional. Informs that the supergroup has been created private Boolean superGroupCreated; ///< Optional. Informs that the supergroup has been created
@JsonProperty(CHANNELCHATCREATED_FIELD) @JsonProperty(CHANNELCHATCREATED_FIELD)
@ -182,6 +185,9 @@ public class Message implements IBotApiObject {
if (jsonObject.has(VOICE_FIELD)) { if (jsonObject.has(VOICE_FIELD)) {
this.voice = new Voice(jsonObject.getJSONObject(VOICE_FIELD)); this.voice = new Voice(jsonObject.getJSONObject(VOICE_FIELD));
} }
if (jsonObject.has(CAPTION_FIELD)) {
this.caption = jsonObject.getString(CAPTION_FIELD);
}
if (jsonObject.has(NEWCHATMEMBER_FIELD)) { if (jsonObject.has(NEWCHATMEMBER_FIELD)) {
this.newChatMember = new User(jsonObject.getJSONObject(NEWCHATMEMBER_FIELD)); this.newChatMember = new User(jsonObject.getJSONObject(NEWCHATMEMBER_FIELD));
} }
@ -325,6 +331,10 @@ public class Message implements IBotApiObject {
return voice; return voice;
} }
public String getCaption() {
return caption;
}
public Boolean getSuperGroupCreated() { public Boolean getSuperGroupCreated() {
return superGroupCreated; return superGroupCreated;
} }
@ -435,6 +445,9 @@ public class Message implements IBotApiObject {
if (voice != null) { if (voice != null) {
gen.writeObjectField(VOICE_FIELD, voice); gen.writeObjectField(VOICE_FIELD, voice);
} }
if (caption != null) {
gen.writeObjectField(CAPTION_FIELD, caption);
}
if (newChatMember != null) { if (newChatMember != null) {
gen.writeObjectField(NEWCHATMEMBER_FIELD, newChatMember); gen.writeObjectField(NEWCHATMEMBER_FIELD, newChatMember);
} }
@ -508,6 +521,7 @@ public class Message implements IBotApiObject {
", groupchatCreated=" + groupchatCreated + ", groupchatCreated=" + groupchatCreated +
", replyToMessage=" + replyToMessage + ", replyToMessage=" + replyToMessage +
", voice=" + voice + ", voice=" + voice +
", caption=" + caption +
", superGroupCreated=" + superGroupCreated + ", superGroupCreated=" + superGroupCreated +
", channelChatCreated=" + channelChatCreated + ", channelChatCreated=" + channelChatCreated +
", migrateToChatId=" + migrateToChatId + ", migrateToChatId=" + migrateToChatId +