Merge pull request witnessmenow#29 from rusboard/master

Changes for sendImageFileByID

Author: witnessmenow

examples/ESP8266/SendPhoto/PhotoFromFileID/PhotoFromFileID.ino

@@ -7,6 +7,7 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecure.h>
 #include <UniversalTelegramBot.h>
+#include <ArduinoJson.h>
 
 // Initialize Wifi connection to the router
 char ssid[] = "XXXXXX";     // your network SSID (name)
@@ -35,8 +36,30 @@ void handleNewMessages(int numNewMessages) {
     if (from_name == "") from_name = "Guest";
 
     if (text == "/get_test_photo") {
-      String file_id = bot.sendPhoto(chat_id, test_photo_url, "This photo was sent using URL");
-      bot.sendPhoto(chat_id, file_id, "This photo was sent using File ID");
+      String response = bot.sendPhoto(chat_id, test_photo_url, "This photo was sent using URL");
+
+      if (bot.checkForOkResponse(response)) {
+        DynamicJsonBuffer jsonBuffer;
+        JsonObject& images = jsonBuffer.parseObject(response);
+
+        // There are 3 image sizes after Telegram has process photo
+        // You may choose what you want, in example was choosed bigger size
+        int photosArrayLength = images["result"]["photo"].size();
+
+        if (photosArrayLength > 0) {
+          String file_id = images["result"]["photo"][photosArrayLength-1]["file_id"];
+
+          if (file_id) {
+            String send_photo_by_file_id_response = bot.sendPhoto(chat_id, file_id, "This photo was sent using File ID");
+
+            if (bot.checkForOkResponse(send_photo_by_file_id_response)) {
+              // do something
+            } else {
+              // or not to do
+            }
+          }
+        }
+      }
     }
 
     if (text == "/start") {

examples/ESP8266/SendPhoto/PhotoFromSD/PhotoFromSD.ino

@@ -78,7 +78,7 @@ void loop() {
         Serial.print("....");
 
         //Content type for PNG image/png
-        bool sent = bot.sendPhotoByBinary(chat_id, "image/jpeg", myFile.size(),
+        String sent = bot.sendPhotoByBinary(chat_id, "image/jpeg", myFile.size(),
             isMoreDataAvailable,
             getNextByte);
 

src/UniversalTelegramBot.cpp

@@ -491,12 +491,7 @@ String UniversalTelegramBot::sendPostPhoto(JsonObject& payload)  {
     }
   }
 
-  if(sent)
-  {
-    return extractFileIdFromResponse(response);
-  }
-
-  return "";
+  return response;
 }
 
 String UniversalTelegramBot::sendPhotoByBinary(String chat_id, String contentType, int fileSize,
@@ -511,12 +506,7 @@ String UniversalTelegramBot::sendPhotoByBinary(String chat_id, String contentTyp
 
   if (_debug) Serial.println(response);
 
-  if(checkForOkResponse(response))
-  {
-    return extractFileIdFromResponse(response);
-  }
-
-  return "";
+  return response;
 }
 
 String UniversalTelegramBot::sendPhoto(String chat_id, String photo, String caption, bool disable_notification, int reply_to_message_id, String keyboard) {
@@ -549,16 +539,6 @@ String UniversalTelegramBot::sendPhoto(String chat_id, String photo, String capt
   return sendPostPhoto(payload);
 }
 
-String UniversalTelegramBot::extractFileIdFromResponse(String response) {
-  int indexOfFileId = response.lastIndexOf("\"file_id\":\"");
-  if(indexOfFileId > -1){
-    // 11 is the length of "file_id":""
-    // 55 is the length of the file_id
-    return response.substring(indexOfFileId + 11, indexOfFileId + 11 + 55);
-  }
-  return "";
-}
-
 bool UniversalTelegramBot::checkForOkResponse(String response) {
   int responseLength = response.length();
 

src/UniversalTelegramBot.h

@@ -70,10 +70,11 @@ class UniversalTelegramBot
     String sendPhotoByBinary(String chat_id, String contentType, int fileSize,
         MoreDataAvailable moreDataAvailableCallback,
         GetNextByte getNextByteCallback);
-    String sendPhoto(String chat_id, String photo, String caption,
+    String sendPhoto(String chat_id, String photo, String caption = "",
         bool disable_notification = false, int reply_to_message_id = 0, String keyboard = "");
 
     int getUpdates(long offset);
+    bool checkForOkResponse(String response);
     telegramMessage messages[HANDLE_MESSAGES];
     long last_message_received;
     String name;
@@ -84,8 +85,6 @@ class UniversalTelegramBot
     String _token;
     Client *client;
     const int maxMessageLength = 1300;
-    bool checkForOkResponse(String response);
-    String extractFileIdFromResponse(String response);
     bool _debug = false;
 };