Merge pull request witnessmenow#25 from rusboard/feature_sendImage

SendPhoto by URL, init version

Author: witnessmenow

.travis.yml

@@ -16,6 +16,7 @@ env:
     - 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
+    - SCRIPT=platformioSingle EXAMPLE_FOLDER=SendPhoto/ImageFromURL EXAMPLE_FILE=ImageFromURL BOARDTYPE=ESP8266 BOARD=d1_mini
 
     # This will run all the ESP8266 examples
     #- SCRIPT=platformioEsp8266 BOARD=d1_mini

examples/ESP8266/SendPhoto/ImageFromURL/ImageFromURL.ino

@@ -0,0 +1,88 @@
+/*******************************************************************
+ *  An example of how to use a custom reply keyboard markup.       *
+ *                                                                 *
+ *                                                                 *
+ *  written by Vadim Sinitski                                      *
+ *******************************************************************/
+#include <ESP8266WiFi.h>
+#include <WiFiClientSecure.h>
+#include <UniversalTelegramBot.h>
+
+// Initialize Wifi connection to the router
+char ssid[] = "XXXXXX";     // your network SSID (name)
+char password[] = "YYYYYY"; // your network key
+
+// Initialize Telegram BOT
+#define BOTtoken "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  // your Bot Token (Get from Botfather)
+
+WiFiClientSecure client;
+UniversalTelegramBot bot(BOTtoken, client);
+
+int Bot_mtbs = 1000; //mean time between scan messages
+long Bot_lasttime;   //last time messages' scan has been done
+
+String test_image_url = "https://www.arduino.cc/en/uploads/Trademark/ArduinoCommunityLogo.png";
+
+void handleNewMessages(int numNewMessages) {
+  Serial.println("handleNewMessages");
+  Serial.println(String(numNewMessages));
+
+  for (int i=0; i<numNewMessages; i++) {
+    String chat_id = String(bot.messages[i].chat_id);
+    String text = bot.messages[i].text;
+
+    String from_name = bot.messages[i].from_name;
+    if (from_name == "") from_name = "Guest";
+
+    if (text == "/get_test_image") {
+      bot.sendImageAsURL(chat_id, test_image_url, "Caption is optional, you may not use image caption");
+    }
+
+    if (text == "/start") {
+      String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
+      welcome += "This is Send Image From URL example.\n\n";
+      welcome += "/get_test_image : getting test image\n";
+      //welcome += "You will receive image from " + test_image_url + "\n";
+
+      bot.sendMessage(chat_id, welcome, "");
+    }
+  }
+}
+
+void setup() {
+  Serial.begin(115200);
+
+  // Set WiFi to station mode and disconnect from an AP if it was Previously connected
+  WiFi.mode(WIFI_STA);
+  WiFi.disconnect();
+  delay(100);
+
+  // attempt to connect to Wifi network:
+  Serial.print("Connecting Wifi: ");
+  Serial.println(ssid);
+  WiFi.begin(ssid, password);
+
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print(".");
+    delay(500);
+  }
+
+  Serial.println("");
+  Serial.println("WiFi connected");
+  Serial.print("IP address: ");
+  Serial.println(WiFi.localIP());
+}
+
+void loop() {
+  if (millis() > Bot_lasttime + Bot_mtbs)  {
+    int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
+
+    while(numNewMessages) {
+      Serial.println("got response");
+      handleNewMessages(numNewMessages);
+      numNewMessages = bot.getUpdates(bot.last_message_received + 1);
+    }
+
+    Bot_lasttime = millis();
+  }
+}

src/UniversalTelegramBot.cpp

@@ -431,6 +431,27 @@ bool UniversalTelegramBot::sendPostMessage(JsonObject& payload)  {
   return sent;
 }
 
+bool UniversalTelegramBot::sendPostPhoto(JsonObject& payload)  {
+
+  bool sent=false;
+  if (_debug) Serial.println("SEND Post Photo");
+  long sttime=millis();
+
+  if (payload.containsKey("photo")) {
+    while (millis() < sttime+8000) { // loop for a while to send the message
+      String command = "bot"+_token+"/sendPhoto";
+      String response = sendPostToTelegram(command, payload);
+      if (_debug) Serial.println(response);
+      sent = checkForOkResponse(response);
+      if (sent) {
+        break;
+      }
+    }
+  }
+
+  return sent;
+}
+
 bool UniversalTelegramBot::sendImage(String chat_id, String contentType, int fileSize,
     MoreDataAvailable moreDataAvailableCallback,
     GetNextByte getNextByteCallback) {
@@ -446,6 +467,36 @@ bool UniversalTelegramBot::sendImage(String chat_id, String contentType, int fil
   return checkForOkResponse(response);
 }
 
+bool UniversalTelegramBot::sendImageAsURL(String chat_id, String URL, String caption, bool disable_notification, int reply_to_message_id, String keyboard) {
+
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& payload = jsonBuffer.createObject();
+
+  payload["chat_id"] = chat_id;
+  payload["photo"] = URL;
+
+  if (caption) {
+    payload["caption"] = caption;
+  }
+
+  if (disable_notification) {
+    payload["disable_notification"] = disable_notification;
+  }
+
+  if (reply_to_message_id && reply_to_message_id != 0) {
+    payload["reply_to_message_id"] = reply_to_message_id;
+  }
+
+  if (keyboard) {
+    JsonObject& replyMarkup = payload.createNestedObject("reply_markup");
+
+    DynamicJsonBuffer keyboardBuffer;
+    replyMarkup["keyboard"] = keyboardBuffer.parseArray(keyboard);
+  }
+
+  return sendPostPhoto(payload);
+}
+
 bool UniversalTelegramBot::checkForOkResponse(String response) {
   int responseLength = response.length();
 

src/UniversalTelegramBot.h

@@ -27,8 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #include <ArduinoJson.h>
 #include <Client.h>
 
-#include <SD.h>
-
 #define HOST "api.telegram.org"
 #define SSL_PORT 443
 #define HANDLE_MESSAGES 1
@@ -58,17 +56,23 @@ class UniversalTelegramBot
         GetNextByte getNextByteCallback);
 
     bool getMe();
+
     bool sendSimpleMessage(String chat_id, String text, String parse_mode);
     bool sendMessage(String chat_id, String text, String parse_mode);
     bool sendMessageWithReplyKeyboard(String chat_id, String text,
         String parse_mode, String keyboard, bool resize = false,
         bool oneTime = false, bool selective = false);
     bool sendMessageWithInlineKeyboard(String chat_id, String text,
         String parse_mode, String keyboard);
+
     bool sendPostMessage(JsonObject& payload);
+    bool sendPostPhoto(JsonObject& payload);
     bool sendImage(String chat_id, String contentType, int fileSize,
         MoreDataAvailable moreDataAvailableCallback,
         GetNextByte getNextByteCallback);
+    bool sendImageAsURL(String chat_id, String URL, String caption,
+        bool disable_notification = false, int reply_to_message_id = 0, String keyboard = "");
+
     int getUpdates(long offset);
     telegramMessage messages[HANDLE_MESSAGES];
     long last_message_received;