Merge pull request #1 from mrcarrera24/MV1.1.0

Mv1.1.0
mrcarrera24 · Mar 20, 2023 · d5a2afd · d5a2afd
2 parents a74f874 + ed4623b
commit d5a2afd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/UniversalTelegramBot.cpp b/src/UniversalTelegramBot.cpp
@@ -444,6 +444,7 @@ bool UniversalTelegramBot::processResult(JsonObject result, int messageIndex) {
     messages[messageIndex].text = F("");
     messages[messageIndex].from_id = F("");
     messages[messageIndex].from_name = F("");
+    messages[messageIndex].username= F("");
     messages[messageIndex].longitude = 0;
     messages[messageIndex].latitude = 0;
     messages[messageIndex].reply_to_message_id = 0;
@@ -455,6 +456,7 @@ bool UniversalTelegramBot::processResult(JsonObject result, int messageIndex) {
       messages[messageIndex].type = F("message");
       messages[messageIndex].from_id = message["from"]["id"].as<String>();
       messages[messageIndex].from_name = message["from"]["first_name"].as<String>();
+      messages[messageIndex].username= message["from"]["username"].as<String>();
       messages[messageIndex].date = message["date"].as<String>();
       messages[messageIndex].chat_id = message["chat"]["id"].as<String>();
       messages[messageIndex].chat_title = message["chat"]["title"].as<String>();
@@ -495,6 +497,7 @@ bool UniversalTelegramBot::processResult(JsonObject result, int messageIndex) {
       messages[messageIndex].type = F("callback_query");
       messages[messageIndex].from_id = message["from"]["id"].as<String>();
       messages[messageIndex].from_name = message["from"]["first_name"].as<String>();
+      messages[messageIndex].username= message["from"]["username"].as<String>();
       messages[messageIndex].text = message["data"].as<String>();
       messages[messageIndex].date = message["date"].as<String>();
       messages[messageIndex].chat_id = message["message"]["chat"]["id"].as<String>();
@@ -508,6 +511,7 @@ bool UniversalTelegramBot::processResult(JsonObject result, int messageIndex) {
       messages[messageIndex].type = F("edited_message");
       messages[messageIndex].from_id = message["from"]["id"].as<String>();
       messages[messageIndex].from_name = message["from"]["first_name"].as<String>();
+      messages[messageIndex].username= message["from"]["username"].as<String>();
       messages[messageIndex].date = message["date"].as<String>();
       messages[messageIndex].chat_id = message["chat"]["id"].as<String>();
       messages[messageIndex].chat_title = message["chat"]["title"].as<String>();

diff --git a/src/UniversalTelegramBot.h b/src/UniversalTelegramBot.h
@@ -48,6 +48,7 @@ struct telegramMessage {
   String chat_title;
   String from_id;
   String from_name;
+  String username;
   String date;
   String type;
   String file_caption;