From 7f9e4494e761a325f84ac9b2e441243992f8a968 Mon Sep 17 00:00:00 2001 From: kit Date: Mon, 2 May 2016 12:21:41 +0600 Subject: [PATCH 1/3] Add Contact getters --- .../telegrambots/api/objects/Contact.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/telegram/telegrambots/api/objects/Contact.java b/src/main/java/org/telegram/telegrambots/api/objects/Contact.java index cc679e8b..2a6e4897 100644 --- a/src/main/java/org/telegram/telegrambots/api/objects/Contact.java +++ b/src/main/java/org/telegram/telegrambots/api/objects/Contact.java @@ -47,6 +47,22 @@ public class Contact implements IBotApiObject { } } + public String getPhoneNumber() { + return phoneNumber; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public Integer getUserID() { + return userID; + } + @Override public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException { gen.writeStartObject(); From 4f427ba5d8946de83cd5025cd7a4f069afedd7b9 Mon Sep 17 00:00:00 2001 From: kit Date: Mon, 2 May 2016 12:32:01 +0600 Subject: [PATCH 2/3] Fix response processing on methods: sendDocument sendPhoto sendVideo sendSticker sendVoice --- .../java/org/telegram/telegrambots/bots/AbsSender.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/telegram/telegrambots/bots/AbsSender.java b/src/main/java/org/telegram/telegrambots/bots/AbsSender.java index 4373745e..ae987e06 100644 --- a/src/main/java/org/telegram/telegrambots/bots/AbsSender.java +++ b/src/main/java/org/telegram/telegrambots/bots/AbsSender.java @@ -435,7 +435,7 @@ public abstract class AbsSender { throw new TelegramApiException("Error at sendDocument", jsonObject.getString("description")); } - return new Message(jsonObject); + return new Message(jsonObject.getJSONObject(Constants.RESPONSEFIELDRESULT)); } public Message sendPhoto(SendPhoto sendPhoto) throws TelegramApiException { @@ -494,7 +494,7 @@ public abstract class AbsSender { throw new TelegramApiException("Error at sendPhoto", jsonObject.getString("description")); } - return new Message(jsonObject); + return new Message(jsonObject.getJSONObject(Constants.RESPONSEFIELDRESULT)); } public Message sendVideo(SendVideo sendVideo) throws TelegramApiException { @@ -571,7 +571,7 @@ public abstract class AbsSender { throw new TelegramApiException("Error at sendVideo", jsonObject.getString("description")); } - return new Message(jsonObject); + return new Message(jsonObject.getJSONObject(Constants.RESPONSEFIELDRESULT)); } public Message sendSticker(SendSticker sendSticker) throws TelegramApiException { @@ -625,7 +625,7 @@ public abstract class AbsSender { throw new TelegramApiException("Error at sendSticker", jsonObject.getString("description")); } - return new Message(jsonObject); + return new Message(jsonObject.getJSONObject(Constants.RESPONSEFIELDRESULT)); } /** @@ -775,7 +775,7 @@ public abstract class AbsSender { throw new TelegramApiException("Error at sendVoice", jsonObject.getString("description")); } - return new Message(jsonObject); + return new Message(jsonObject.getJSONObject(Constants.RESPONSEFIELDRESULT)); } // Simplified methods From 160a2fa3ba322d7ee482dda4d880d7676af8c330 Mon Sep 17 00:00:00 2001 From: Rubenlagus Date: Thu, 5 May 2016 21:50:55 +0200 Subject: [PATCH 3/3] Upgrade version to 2.3 --- README.md | 2 +- pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b419723..df73c56f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ You can see code for those bots at [TelegramBotsExample](https://github.com/rube This library use [Telegram bot API](https://core.telegram.org/bots), you can find more information following the link. ## Questions or Suggestions -Feel free to create issues [here](https://github.com/rubenlagus/TelegramBots/issues) as you need +Feel free to create issues [here](https://github.com/rubenlagus/TelegramBots/issues) as you need or join the [chat](https://telegram.me/JavaBotsApi) ## License diff --git a/pom.xml b/pom.xml index a230c3c2..fd5c6387 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,10 @@ jar org.telegram telegrambots - 2.2 + 2.3 Telegram Bots + https://telegram.me/JavaBotsApi Easy to use library to create Telegram Bots