Merge pull request witnessmenow#24 from rusboard/master

Created simple version of inline keyboard message and many changes and improves of exists code.

Author: witnessmenow

.travis.yml

@@ -9,11 +9,12 @@ cache:
         - "~/.platformio"
 
 env:
-    - SCRIPT=platformioSingle EXAMPLE=EchoBot BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE=CustomKeyboard BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE=FlashledBot BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE=UsingWiFiManager BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE=BulkMessages BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_FOLDER=EchoBot EXAMPLE_FILE=EchoBot BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_FOLDER=CustomKeyboard/ReplyKeyboardMarkup EXAMPLE_FILE=ReplyKeyboardMarkup BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_FOLDER=CustomKeyboard/InlineKeyboardMarkup EXAMPLE_FILE=InlineKeyboardMarkup BOARDTYPE=ESP8266 BOARD=d1_mini
+    - 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
 
     # This will run all the ESP8266 examples
     #- SCRIPT=platformioEsp8266 BOARD=d1_mini

examples/ESP8266/BulkMessages/BulkMessages.ino

@@ -11,8 +11,8 @@
 #include <ArduinoJson.h>
 
 // Initialize Wifi connection to the router
-char ssid[] = "xxxxxxx";      // your network SSID (name)
-char password[] = "yyyyyyyy"; // your network key
+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)
@@ -43,7 +43,13 @@ void handleNewMessages(int numNewMessages) {
 
     if (text == "/start") {
       if (addSubscribedUser(chat_id, from_name)) {
-        bot.sendMessage(chat_id, "Welcome to BulkMessages example, " + from_name, "");
+        String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
+        welcome += "This is Bulk Messages example.\n\n";
+        welcome += "/showallusers : show all subscribed users\n";
+        welcome += "/testbulkmessage : send test message to subscribed users\n";
+        welcome += "/removeallusers : remove all subscribed users\n";
+        welcome += "/stop : unsubscribe from bot\n";
+        bot.sendMessage(chat_id, welcome, "Markdown");
       } else {
         bot.sendMessage(chat_id, "Something wrong, please try again (later?)", "");
       }
@@ -61,7 +67,7 @@ void handleNewMessages(int numNewMessages) {
       sendMessageToAllSubscribedUsers("ATTENTION, this is bulk message for all subscribed users!");
     }
 
-    if (text == "\/showallusers") {
+    if (text == "/showallusers") {
       File subscribedUsersFile = SPIFFS.open("/"+subscribed_users_filename, "r");
 
       if (!subscribedUsersFile) {
@@ -78,7 +84,7 @@ void handleNewMessages(int numNewMessages) {
       }
     }
 
-    if (text == "\/removeallusers") {
+    if (text == "/removeallusers") {
       if (SPIFFS.remove("/"+subscribed_users_filename)) {
         bot.sendMessage(chat_id, "All users removed", "");
       } else {
@@ -180,7 +186,7 @@ void sendMessageToAllSubscribedUsers(String message) {
 }
 
 void setup() {
-  Serial.begin(9600);
+  Serial.begin(115200);
 
   if (!SPIFFS.begin()) {
     Serial.println("Failed to mount file system");
@@ -215,4 +221,4 @@ void loop() {
 
     Bot_lasttime = millis();
   }
-}
+}

examples/ESP8266/CustomKeyboard/InlineKeyboardMarkup/InlineKeyboardMarkup.ino

@@ -0,0 +1,86 @@
+/*******************************************************************
+ *  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
+
+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 == "/options") {
+      String keyboardJson = "[[\{ \"text\" : \"Go to Google\", \"url\" : \"https://www.google.com\" \} ]]";
+      bot.sendMessageWithInlineKeyboard(chat_id, "Choose from one of the following options", "", keyboardJson);
+    }
+
+    if (text == "/start") {
+      String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
+      welcome += "This is Inline Keyboard Markup example.\n\n";
+      welcome += "/options : returns the inline keyboard\n";
+
+      bot.sendMessage(chat_id, welcome, "Markdown");
+    }
+  }
+}
+
+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();
+  }
+}

examples/ESP8266/CustomKeyboard/README.md

@@ -1,9 +1,22 @@
-#ESP8266 - Custom Keyboard bot
+#Reply Keyboard Markup
 
-This is an example of how to use custom reply keyboards on a ESP8266 based board.
+This is an example of how to use reply keyboard markup on a ESP8266 based board.
+
+![alt text](https://core.telegram.org/file/811140184/1/5YJxx-rostA/ad3f74094485fb97bd "Reply Keyboard example")
 
 The application will turn on and off an LED based on commands received via telegram.
 
+#Inline Keyboard Markup
+
+This is an example of how to use reply keyboard markup on a ESP8266 based board.
+
+
+![alt text](https://core.telegram.org/file/811140999/1/2JSoUVlWKa0/4fad2e2743dc8eda04 "Inline Keyboard example")
+
+Right now working only URL redirection button. Other features will be added later.
+
+-----------------
+
 NOTE: You will need to enter your SSID, password and bot Token for the example to work.
 
 Application written by [Brian Lough](https://github.com/witnessmenow)

examples/ESP8266/CustomKeyboard/CustomKeyboard.ino renamed to examples/ESP8266/CustomKeyboard/ReplyKeyboardMarkup/ReplyKeyboardMarkup.ino

@@ -1,22 +1,16 @@
 /*******************************************************************
- *  An example of how to use a custom reply keyboard.              *
+ *  An example of how to use a custom reply keyboard markup.       *
  *                                                                 *
  *                                                                 *
  *  written by Brian Lough                                         *
  *******************************************************************/
-
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecure.h>
 #include <UniversalTelegramBot.h>
 
-
 // Initialize Wifi connection to the router
-char ssid[] = "xxxxxxxxxxxxxxxxxxxxxx";              // your network SSID (name)
-char password[] = "yyyyyyyy";                              // your network key
-
-
-
-const int ledPin = 13;
+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)
@@ -26,87 +20,97 @@ UniversalTelegramBot bot(BOTtoken, client);
 
 int Bot_mtbs = 1000; //mean time between scan messages
 long Bot_lasttime;   //last time messages' scan has been done
+
+const int ledPin = 13;
 int ledStatus = 0;
 
 void handleNewMessages(int numNewMessages) {
   Serial.println("handleNewMessages");
   Serial.println(String(numNewMessages));
-  for(int i=0; i<numNewMessages; i++) {
+
+  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 == "/ledon") {
       digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
       ledStatus = 1;
       bot.sendMessage(chat_id, "Led is ON", "");
     }
+
     if (text == "/ledoff") {
       ledStatus = 0;
       digitalWrite(ledPin, LOW);    // turn the LED off (LOW is the voltage level)
       bot.sendMessage(chat_id, "Led is OFF", "");
     }
+
     if (text == "/status") {
       if(ledStatus){
         bot.sendMessage(chat_id, "Led is ON", "");
       } else {
         bot.sendMessage(chat_id, "Led is OFF", "");
       }
     }
+
     if (text == "/options") {
       String keyboardJson = "[[\"/ledon\", \"/ledoff\"],[\"/status\"]]";
       bot.sendMessageWithReplyKeyboard(chat_id, "Choose from one of the following options", "", keyboardJson, true);
     }
 
     if (text == "/start") {
-      String welcome = "Welcome from FlashLedBot, your personal Bot on ESP8266\n";
-      welcome = welcome + "/ledon : to switch the Led ON\n";
-      welcome = welcome + "/ledoff : to switch the Led OFF\n";
-      welcome = welcome + "/status : Returns current status of LED\n";
-      welcome = welcome + "/options : returns the custom keyboard\n";
+      String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
+      welcome += "This is Reply Keyboard Markup example.\n\n";
+      welcome += "/ledon : to switch the Led ON\n";
+      welcome += "/ledon : to switch the Led ON\n";
+      welcome += "/ledoff : to switch the Led OFF\n";
+      welcome += "/status : Returns current status of LED\n";
+      welcome += "/options : returns the reply keyboard\n";
       bot.sendMessage(chat_id, welcome, "Markdown");
     }
   }
 }
 
-
 void setup() {
   Serial.begin(115200);
 
-  // Set WiFi to station mode and disconnect from an AP if it was Previously
-  // connected
+  // 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.println("IP address: ");
-  IPAddress ip = WiFi.localIP();
-  Serial.println(ip);
+  Serial.print("IP address: ");
+  Serial.println(WiFi.localIP());
 
   pinMode(ledPin, OUTPUT); // initialize digital ledPin as an output.
   delay(10);
   digitalWrite(ledPin, HIGH); // initialize pin as off
-
 }
 
-
-
 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();
   }
 }