Added function deleteMessage(), maxMessageLength and fixes for disable_web_page_preview and debug

Author: gemini1389

src/UniversalTelegramBot.cpp

@@ -38,9 +38,10 @@
 #define ZERO_COPY(STR)    ((char*)STR.c_str())
 #define BOT_CMD(STR)      buildCommand(F(STR))
 
-UniversalTelegramBot::UniversalTelegramBot(const String& token, Client &client) {
+UniversalTelegramBot::UniversalTelegramBot(const String& token, Client &client, int maxMessageLength) {
   updateToken(token);
   this->client = &client;
+  this->maxMessageLength = maxMessageLength;
 }
 
 void UniversalTelegramBot::updateToken(const String& token) {
@@ -328,15 +329,15 @@ bool UniversalTelegramBot::setMyCommands(const String& commandArray) {
   payload["commands"] = serialized(commandArray);
   bool sent = false;
   String response = "";
-  #if defined(_debug)
-  Serial.println(F("sendSetMyCommands: SEND Post /setMyCommands"));
-  #endif  // defined(_debug)
+  #ifdef TELEGRAM_DEBUG
+    Serial.println(F("sendSetMyCommands: SEND Post /setMyCommands"));
+  #endif
   unsigned long sttime = millis();
 
   while (millis() - sttime < 8000ul) { // loop for a while to send the message
     response = sendPostToTelegram(BOT_CMD("setMyCommands"), payload.as<JsonObject>());
-    #ifdef _debug  
-    Serial.println("setMyCommands response" + response);
+    #ifdef TELEGRAM_DEBUG
+      Serial.println("setMyCommands response" + response);
     #endif
     sent = checkForOkResponse(response);
     if (sent) break;
@@ -560,7 +561,7 @@ bool UniversalTelegramBot::sendSimpleMessage(const String& chat_id, const String
 }
 
 bool UniversalTelegramBot::sendMessage(const String& chat_id, const String& text,
-                                       const String& parse_mode, int message_id, bool disable_web_page_preview) { // added message_id
+                                       const String& parse_mode, int message_id, bool disable_web_page_preview) {
 
   DynamicJsonDocument payload(maxMessageLength);
   payload["chat_id"] = chat_id;
@@ -572,9 +573,47 @@ bool UniversalTelegramBot::sendMessage(const String& chat_id, const String& text
   if (parse_mode != "")
     payload["parse_mode"] = parse_mode;
 
+  if (disable_web_page_preview)
+    payload["disable_web_page_preview"] = disable_web_page_preview;
+
   return sendPostMessage(payload.as<JsonObject>(), message_id); // if message id == 0 then edit is false, else edit is true
 }
 
+/***********************************************************************
+ * DeleteMessage - function to delete message by message_id            *
+ * Function description and limitations:                               *
+ * https://core.telegram.org/bots/api#deletemessage                    *
+ ***********************************************************************/
+bool UniversalTelegramBot::deleteMessage(const String& chat_id, int message_id) {
+  if (message_id == 0)
+  {
+    #ifdef TELEGRAM_DEBUG
+	  Serial.println(F("deleteMessage: message_id not passed for deletion"));
+	#endif
+    return false;
+  }
+
+  DynamicJsonDocument payload(maxMessageLength);
+  payload["chat_id"] = chat_id;
+  payload["message_id"] = message_id;
+
+  #ifdef TELEGRAM_DEBUG
+    Serial.print(F("deleteMessage: SEND Post Message: "));
+    serializeJson(payload, Serial);
+    Serial.println();
+  #endif
+
+  String response = sendPostToTelegram(BOT_CMD("deleteMessage"), payload.as<JsonObject>());
+  #ifdef TELEGRAM_DEBUG
+     Serial.print(F("deleteMessage response:"));
+     Serial.println(response);
+  #endif
+
+  bool sent = checkForOkResponse(response);
+  closeClient();
+  return sent;
+}
+
 bool UniversalTelegramBot::sendMessageWithReplyKeyboard(
     const String& chat_id, const String& text, const String& parse_mode, const String& keyboard,
     bool resize, bool oneTime, bool selective) {
@@ -809,7 +848,7 @@ bool UniversalTelegramBot::answerCallbackQuery(const String &query_id, const Str
   if (url.length() > 0) payload["url"] = url;
 
   String response = sendPostToTelegram(BOT_CMD("answerCallbackQuery"), payload.as<JsonObject>());
-  #ifdef _debug  
+  #ifdef TELEGRAM_DEBUG
      Serial.print(F("answerCallbackQuery response:"));
      Serial.println(response);
   #endif

src/UniversalTelegramBot.h

@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #ifndef UniversalTelegramBot_h
 #define UniversalTelegramBot_h
 
+//unmark following line to enable debug mode
 //#define TELEGRAM_DEBUG 1
 #define ARDUINOJSON_DECODE_UNICODE 1
 #define ARDUINOJSON_USE_LONG_LONG 1
@@ -34,9 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #define TELEGRAM_SSL_PORT 443
 #define HANDLE_MESSAGES 1
 
-//unmark following line to enable debug mode
-//#define _debug
-
 typedef bool (*MoreDataAvailable)();
 typedef byte (*GetNextByte)();
 typedef byte* (*GetNextBuffer)();
@@ -67,7 +65,7 @@ struct telegramMessage {
 
 class UniversalTelegramBot {
 public:
-  UniversalTelegramBot(const String& token, Client &client);
+  UniversalTelegramBot(const String& token, Client &client, int maxMessageLength = 1500);
   void updateToken(const String& token);
   String getToken();
   String sendGetToTelegram(const String& command);
@@ -86,7 +84,8 @@ class UniversalTelegramBot {
 
   bool sendSimpleMessage(const String& chat_id, const String& text, const String& parse_mode);
   bool sendMessage(const String& chat_id, const String& text, const String& parse_mode = "", int message_id = 0,
-                  bool disable_web_page_preview = false);
+                   bool disable_web_page_preview = false);
+  bool deleteMessage(const String& chat_id, int message_id = 0);
   bool sendMessageWithReplyKeyboard(const String& chat_id, const String& text,
                                     const String& parse_mode, const String& keyboard,
                                     bool resize = false, bool oneTime = false,