Creating a sendPhoto method and making a sendMultipart data method for potential re-use with other binary files

Author: witnessmenow

.travis.yml

@@ -15,6 +15,7 @@ env:
     - SCRIPT=platformioSingle EXAMPLE_FOLDER=FlashledBot EXAMPLE_FILE=FlashledBot BOARDTYPE=ESP8266 BOARD=d1_mini
     - SCRIPT=platformioSingle EXAMPLE_FOLDER=UsingWiFiManager EXAMPLE_FILE=UsingWiFiManager BOARDTYPE=ESP8266 BOARD=d1_mini
     - SCRIPT=platformioSingle EXAMPLE_FOLDER=BulkMessages EXAMPLE_FILE=BulkMessages BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_FOLDER=SendPhoto/ImageFromSD EXAMPLE_FILE=ImageFromSD BOARDTYPE=ESP8266 BOARD=d1_mini
 
     # This will run all the ESP8266 examples
     #- SCRIPT=platformioEsp8266 BOARD=d1_mini

examples/ESP8266/ImageFromSD/ImageFromSD.ino renamed to examples/ESP8266/SendPhoto/ImageFromSD/ImageFromSD.ino

@@ -83,16 +83,24 @@ void loop() {
     while(numNewMessages) {
       Serial.println("got response");
 
-      DynamicJsonBuffer jsonBuffer;
-      JsonObject& payload = jsonBuffer.createObject();
-      payload["chat_id"] = bot.messages[0].chat_id;
+
+      String chat_id = bot.messages[0].chat_id;
 
       myFile = SD.open("box.jpg");
       if (myFile) {
         Serial.println("box.jpg:");
 
-        bot.sendImageFromFileToTelegram(bot.messages[0].chat_id, myFile.size(), isMoreDataAvailable, getNextByte);
-        // close the file:
+        //Content type for PNG image/png
+        bool sent = bot.sendImage(chat_id, "image/jpeg", myFile.size(),
+            isMoreDataAvailable,
+            getNextByte);
+
+        if(sent){
+          Serial.println("Succesfully sent image");
+        } else {
+          Serial.println("Error sending image");
+        }
+
         myFile.close();
         } else {
           // if the file didn't open, print an error:

src/UniversalTelegramBot.cpp

@@ -119,17 +119,19 @@ String UniversalTelegramBot::sendPostToTelegram(String command, JsonObject& payl
   return response;
 }
 
-String UniversalTelegramBot::sendImageFromFileToTelegram(String chat_id, int fileSize, MoreDataAvailable moreDataAvailableCallback, GetNextByte getNextByteCallback){
+String UniversalTelegramBot::sendMultipartFormDataToTelegram(String command, String binaryProperyName,
+    String fileName, String contentType,
+    String chat_id, int fileSize,
+    MoreDataAvailable moreDataAvailableCallback,
+    GetNextByte getNextByteCallback) {
 
-  Serial.println("sendImageFromFileToTelegram");
   String response = "";
 	long now;
 	bool responseRecieved;
   String boundry = "------------------------b8f610217e83e29b";
 	// Connect with api.telegram.org
   if (client->connect(HOST, SSL_PORT)) {
-    Serial.println("connected");
-    // POST URI
+
     String start_request = "";
     String end_request = "";
 
@@ -139,30 +141,30 @@ String UniversalTelegramBot::sendImageFromFileToTelegram(String chat_id, int fil
     start_request = start_request + chat_id + "\r\n";
 
     start_request = start_request + "--" + boundry + "\r\n";
-    start_request = start_request + "content-disposition: form-data; name=\"photo\"; filename=\"img.jpg\"" + "\r\n";
-    start_request = start_request + "Content-Type: image/jpeg" + "\r\n";
+    start_request = start_request + "content-disposition: form-data; name=\"" + binaryProperyName + "\"; filename=\"" + fileName + "\"" + "\r\n";
+    start_request = start_request + "Content-Type: " + contentType + "\r\n";
     start_request = start_request + "\r\n";
 
 
     end_request = end_request + "\r\n";
     end_request = end_request + "--" + boundry + "--" + "\r\n";
 
-    client->print("POST /bot"+_token+"/sendPhoto"); client->println(" HTTP/1.1");
+    client->print("POST /bot"+_token+"/" + command); client->println(" HTTP/1.1");
     // Host header
     client->print("Host: "); client->println(HOST);
     client->println("User-Agent: arduino/1.0");
     client->println("Accept: */*");
 
     int contentLength = fileSize + start_request.length() + end_request.length();
-    Serial.println("Content-Length: " + String(contentLength));
+    if (_debug) Serial.println("Content-Length: " + String(contentLength));
     client->print("Content-Length: "); client->println(String(contentLength));
     client->println("Content-Type: multipart/form-data; boundary=" + boundry);
     client->println("");
 
     client->print(start_request);
-    Serial.print(start_request);
 
-    Serial.println("Sending....");
+    if (_debug) Serial.print(start_request);
+
     byte buffer[512];
     int count = 0;
     char ch;
@@ -173,22 +175,24 @@ String UniversalTelegramBot::sendImageFromFileToTelegram(String chat_id, int fil
       count++;
       if(count == 512){
         //yield();
-        Serial.println("Sending full buffer");
+        if (_debug) {
+          Serial.println("Sending full buffer");
+        }
         client->write((const uint8_t *)buffer, 512);
         count = 0;
       }
     }
 
     if(count > 0) {
-      Serial.println("Sending remaining buffer");
+      if (_debug) {
+        Serial.println("Sending remaining buffer");
+      }
       client->write((const uint8_t *)buffer, count);
     }
 
     client->print(end_request);
-    Serial.print(end_request);
+    if (_debug) Serial.print(end_request);
 
-
-    Serial.println("Done");
     count = 0;
     int ch_count=0;
     char c;
@@ -205,9 +209,11 @@ String UniversalTelegramBot::sendImageFromFileToTelegram(String chat_id, int fil
 				responseRecieved=true;
 			}
 			if (responseRecieved) {
-				Serial.println();
-				Serial.println(response);
-				Serial.println();
+        if (_debug) {
+  				Serial.println();
+  				Serial.println(response);
+  				Serial.println();
+        }
 				break;
 			}
 		}
@@ -425,6 +431,21 @@ bool UniversalTelegramBot::sendPostMessage(JsonObject& payload)  {
   return sent;
 }
 
+bool UniversalTelegramBot::sendImage(String chat_id, String contentType, int fileSize,
+    MoreDataAvailable moreDataAvailableCallback,
+    GetNextByte getNextByteCallback) {
+
+  if (_debug) Serial.println("SEND Photo");
+
+  String response = sendMultipartFormDataToTelegram("sendPhoto", "photo", "img.jpg",
+    contentType, chat_id, fileSize,
+    moreDataAvailableCallback, getNextByteCallback);
+
+  if (_debug) Serial.println(response);
+
+  return checkForOkResponse(response);
+}
+
 bool UniversalTelegramBot::checkForOkResponse(String response) {
   int responseLength = response.length();
 

src/UniversalTelegramBot.h

@@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #include <SD.h>
 
 #define HOST "api.telegram.org"
-#define HOST2 "posttestserver.com"
 #define SSL_PORT 443
 #define HANDLE_MESSAGES 1
 
@@ -52,7 +51,12 @@ class UniversalTelegramBot
     UniversalTelegramBot (String token, Client &client);
     String sendGetToTelegram(String command);
     String sendPostToTelegram(String command, JsonObject& payload);
-    String sendImageFromFileToTelegram(String chat_id, int fileSize, MoreDataAvailable moreDataAvailableCallback, GetNextByte getNextByteCallback);
+    String sendMultipartFormDataToTelegram(String command, String binaryProperyName,
+        String fileName, String contentType,
+        String chat_id, int fileSize,
+        MoreDataAvailable moreDataAvailableCallback,
+        GetNextByte getNextByteCallback);
+
     bool getMe();
     bool sendSimpleMessage(String chat_id, String text, String parse_mode);
     bool sendMessage(String chat_id, String text, String parse_mode);
@@ -62,6 +66,9 @@ class UniversalTelegramBot
     bool sendMessageWithInlineKeyboard(String chat_id, String text,
         String parse_mode, String keyboard);
     bool sendPostMessage(JsonObject& payload);
+    bool sendImage(String chat_id, String contentType, int fileSize,
+        MoreDataAvailable moreDataAvailableCallback,
+        GetNextByte getNextByteCallback);
     int getUpdates(long offset);
     telegramMessage messages[HANDLE_MESSAGES];
     long last_message_received;