Merge remote-tracking branch 'llnulldisk/master' into merge-228

Author: reo7sp

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.gitignore

@@ -1,5 +1,6 @@
 CMakeCache.txt
 CMakeFiles
+CMakeSettings.json
 Makefile
 *.cmake
 install_manifest.txt
@@ -16,10 +17,10 @@ docs/
 cmake-build-*
 
 # Visual Studio
-/.vs/
+.vs/
 .vscode/
-/build/
-/out/
+build/
+out/
 
 # MacOS dependecies
 .DS_Store

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10.2)
 project(TgBot)
 
 # options
@@ -51,7 +51,7 @@ find_package(OpenSSL REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 ## curl
-find_package(CURL 7.56.0)
+find_package(CURL 7.58.0)
 if (CURL_FOUND)
     include_directories(${CURL_INCLUDE_DIRS})
     add_definitions(-DHAVE_CURL)
@@ -60,9 +60,9 @@ endif()
 ## boost
 set(Boost_USE_MULTITHREADED ON)
 if (ENABLE_TESTS)
-    find_package(Boost 1.59.0 COMPONENTS system unit_test_framework REQUIRED)
+    find_package(Boost 1.65.1 COMPONENTS system unit_test_framework REQUIRED)
 else()
-    find_package(Boost 1.59.0 COMPONENTS system REQUIRED)
+    find_package(Boost 1.65.1 COMPONENTS system REQUIRED)
 endif()
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIR_RELEASE})

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 MAINTAINER Oleg Morozenkov <m@oleg.rocks>
 
 RUN apt-get -qq update && \

Dockerfile_test

@@ -40,6 +40,20 @@ WORKDIR /usr/src/tgbot-cpp/samples/echobot-curl-client
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
+WORKDIR /usr/src/tgbot-cpp/samples/echobot-setmycommands
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
+WORKDIR /usr/src/tgbot-cpp
+RUN rm -rf samples/echobot-submodule/tgbot-cpp/
+COPY include samples/echobot-submodule/tgbot-cpp/include
+COPY src samples/echobot-submodule/tgbot-cpp/src
+COPY CMakeLists.txt samples/echobot-submodule/tgbot-cpp/
+
+WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
 WORKDIR /usr/src/tgbot-cpp/samples/echobot-webhook-server
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
@@ -56,7 +70,10 @@ WORKDIR /usr/src/tgbot-cpp/samples/received-text-processing
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
+WORKDIR /usr/src/tgbot-cpp/samples/reply-keyboard
+RUN rm -rf CMakeCache.txt CMakeFiles/ && \
+    cmake . && make -j$(nproc)
+
 WORKDIR /usr/src/tgbot-cpp
 ENV CTEST_OUTPUT_ON_FAILURE=1
 CMD make test
-

README.md

@@ -73,6 +73,57 @@ You can treat this repository as a submodule of your project, for example, see [
 
 You can use Docker to build and run your bot. Set the base image of your's Dockerfile to [reo7sp/tgbot-cpp](https://hub.docker.com/r/reo7sp/tgbot-cpp/).
 
+## Installation Windows
+
+### Download vcpkg and tgbot-cpp
+
+Taken from [Vcpkg - Quick Start: Windows](https://github.com/Microsoft/vcpkg/#quick-start-windows):
+
+Prerequisites:
+- Windows 7 or newer
+- Git
+- Visual Studio 2015 Update 3 or greater with the English language pack
+
+First, download and bootstrap vcpkg itself; it can be installed anywhere,
+but generally we recommend using vcpkg as a submodule for CMake projects,
+and installing it globally for Visual Studio projects.
+We recommend somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`,
+since otherwise you may run into path issues for some port build systems.
+
+```cmd
+> git clone https://github.com/microsoft/vcpkg
+> .\vcpkg\bootstrap-vcpkg.bat
+```
+
+In order to use vcpkg with Visual Studio,
+run the following command (may require administrator elevation):
+
+```cmd
+> .\vcpkg\vcpkg integrate install
+```
+
+To install the libraries for Windows x64, run:
+
+```cmd
+> .\vcpkg\vcpkg install tgbot-cpp:x64-windows
+```
+
+To install for Windows x86, run:
+
+```cmd
+> .\vcpkg\vcpkg install tgbot-cpp
+```
+
+The library will now be installed and Visual Studio should be able to find the vcpkg installation.
+
+### Setup project with CMakeLists
+
+Use the [example CMakeLists.txt](samples/echobot/CMakeLists.txt) with changes:
+
+Remove `/usr/local/include`
+
+Change `/usr/local/lib/libTgBot.a` to `C:/src/vcpkg/installed/x64-windows/lib/TgBot.lib` or something simmilar according to your own installation path.
+
 
 ## Bot compilation
 

include/tgbot/Api.h

@@ -6,12 +6,18 @@
 #include "tgbot/types/InlineQuery.h"
 #include "tgbot/types/ChosenInlineResult.h"
 #include "tgbot/types/CallbackQuery.h"
+#include "tgbot/types/ShippingQuery.h"
+#include "tgbot/types/PreCheckoutQuery.h"
+#include "tgbot/types/Poll.h"
+#include "tgbot/types/PollAnswer.h"
+#include "tgbot/types/ChatMemberUpdated.h"
+#include "tgbot/types/ChatJoinRequest.h"
 
+#include <functional>
 #include <initializer_list>
 #include <string>
-#include <functional>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace TgBot {
 
@@ -31,9 +37,15 @@ friend EventHandler;
     typedef std::function<void (const InlineQuery::Ptr)> InlineQueryListener;
     typedef std::function<void (const ChosenInlineResult::Ptr)> ChosenInlineResultListener;
     typedef std::function<void (const CallbackQuery::Ptr)> CallbackQueryListener;
+    typedef std::function<void (const ShippingQuery::Ptr)> ShippingQueryListener;
+    typedef std::function<void (const PreCheckoutQuery::Ptr)> PreCheckoutQueryListener;
+    typedef std::function<void (const Poll::Ptr)> PollListener;
+    typedef std::function<void (const PollAnswer::Ptr)> PollAnswerListener;
+    typedef std::function<void (const ChatMemberUpdated::Ptr)> ChatMemberUpdatedListener;
+    typedef std::function<void (const ChatJoinRequest::Ptr)> ChatJoinRequestListener;
 
     /**
-     * @brief Registers listener which receives all messages which the bot can ever receive.
+     * @brief Registers listener which receives new incoming message of any kind - text, photo, sticker, etc.
      * @param listener Listener.
      */
     inline void onAnyMessage(const MessageListener& listener) {
@@ -43,21 +55,30 @@ friend EventHandler;
     /**
      * @brief Registers listener which receives all messages with commands (messages with leading '/' char).
      * @param commandName Command name which listener can handle.
-     * @param listener Listener.
+     * @param listener Listener. Pass nullptr to remove listener of command
      */
     inline void onCommand(const std::string& commandName, const MessageListener& listener) {
-        _onCommandListeners[commandName] = listener;
+        if (listener) {
+            _onCommandListeners[commandName] = listener;
+        } else {
+            _onCommandListeners.erase(commandName);
+        }
     }
 
     /**
     * @brief Registers listener which receives all messages with commands (messages with leading '/' char).
     * @param commandsList Commands names which listener can handle.
-    * @param listener Listener.
+    * @param listener Listener. Pass nullptr to remove listener of commands
     */
     inline void onCommand(const std::initializer_list<std::string>& commandsList, const MessageListener& listener) {
-        for (const auto& command : commandsList)
-        {
-            _onCommandListeners[command] = listener;
+        if (listener) {
+            for (const auto& command : commandsList) {
+                _onCommandListeners[command] = listener;
+            }
+        } else {
+            for (const auto& command : commandsList) {
+                _onCommandListeners.erase(command);
+            }
         }
     }
 
@@ -78,25 +99,109 @@ friend EventHandler;
     }
 
     /**
-     * @brief Registers listener which receives all the inline query.
+     * @brief Registers listener which receives new versions of a message that is known to the bot and was edited
+     * @param listener Listener.
+     */
+    inline void onEditedMessage(const MessageListener& listener) {
+        _onEditedMessageListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives new incoming inline queries
      * @param listener Listener.
      */
     inline void onInlineQuery(const InlineQueryListener& listener) {
         _onInlineQueryListeners.push_back(listener);
     }
 
     /**
-     * @brief Registers listener which receives all the chosen inline result.
+     * @brief Registers listener which receives the results of an inline query that was chosen by a user and sent to their chat partner.
+     * Please see https://core.telegram.org/bots/inline#collecting-feedback for details on how to enable these updates for your bot.
+     * 
      * @param listener Listener.
      */
     inline void onChosenInlineResult(const ChosenInlineResultListener& listener){
         _onChosenInlineResultListeners.push_back(listener);
     }
 
+    /**
+     * @brief Registers listener which receives new incoming callback queries
+     * @param listener Listener.
+     */
     inline void onCallbackQuery(const CallbackQueryListener& listener){
         _onCallbackQueryListeners.push_back(listener);
     }
 
+    /**
+     * @brief Registers listener which receives new incoming shipping queries.
+     * Only for invoices with flexible price
+     * 
+     * @param listener Listener.
+     */
+    inline void onShippingQuery(const ShippingQueryListener& listener){
+        _onShippingQueryListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives new incoming pre-checkout queries.
+     * Contains full information about checkout
+     * 
+     * @param listener Listener.
+     */
+    inline void onPreCheckoutQuery(const PreCheckoutQueryListener& listener){
+        _onPreCheckoutQueryListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives new poll states.
+     * Bots receive only updates about stopped polls and polls, which are sent by the bot
+     * 
+     * @param listener Listener.
+     */
+    inline void onPoll(const PollListener& listener){
+        _onPollListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives an answer if a user changed their answer in a non-anonymous poll.
+     * Bots receive new votes only in polls that were sent by the bot itself.
+     * 
+     * @param listener Listener.
+     */
+    inline void onPollAnswer(const PollAnswerListener& listener){
+        _onPollAnswerListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives the bot's chat member status if it was updated in a chat.
+     * For private chats, this update is received only when the bot is blocked or unblocked by the user.
+     * 
+     * @param listener Listener.
+     */
+    inline void onMyChatMember(const ChatMemberUpdatedListener& listener){
+        _onMyChatMemberListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives a status if a chat member's status was updated in a chat.
+     * The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowedUpdates to receive these updates.
+     * 
+     * @param listener Listener.
+     */
+    inline void onChatMember(const ChatMemberUpdatedListener& listener){
+        _onChatMemberListeners.push_back(listener);
+    }
+
+    /**
+     * @brief Registers listener which receives requests to join the chat.
+     * The bot must have the canInviteUsers administrator right in the chat to receive these updates.
+     * 
+     * @param listener Listener.
+     */
+    inline void onChatJoinRequest(const ChatJoinRequestListener& listener){
+        _onChatJoinRequestListeners.push_back(listener);
+    }
+
 private:
     template<typename ListenerType, typename ObjectType>
     inline void broadcast(const std::vector<ListenerType>& listeners, const ObjectType object) const {
@@ -129,6 +234,10 @@ friend EventHandler;
         broadcast<MessageListener, Message::Ptr>(_onNonCommandMessageListeners, message);
     }
 
+    inline void broadcastEditedMessage(const Message::Ptr& message) const {
+        broadcast<MessageListener, Message::Ptr>(_onEditedMessageListeners, message);
+    }
+
     inline void broadcastInlineQuery(const InlineQuery::Ptr& query) const {
         broadcast<InlineQueryListener, InlineQuery::Ptr>(_onInlineQueryListeners, query);
     }
@@ -141,13 +250,49 @@ friend EventHandler;
         broadcast<CallbackQueryListener, CallbackQuery::Ptr>(_onCallbackQueryListeners, result);
     }
 
+    inline void broadcastShippingQuery(const ShippingQuery::Ptr& result) const {
+        broadcast<ShippingQueryListener, ShippingQuery::Ptr>(_onShippingQueryListeners, result);
+    }
+
+    inline void broadcastPreCheckoutQuery(const PreCheckoutQuery::Ptr& result) const {
+        broadcast<PreCheckoutQueryListener, PreCheckoutQuery::Ptr>(_onPreCheckoutQueryListeners, result);
+    }
+
+    inline void broadcastPoll(const Poll::Ptr& result) const {
+        broadcast<PollListener, Poll::Ptr>(_onPollListeners, result);
+    }
+
+    inline void broadcastPollAnswer(const PollAnswer::Ptr& result) const {
+        broadcast<PollAnswerListener, PollAnswer::Ptr>(_onPollAnswerListeners, result);
+    }
+
+    inline void broadcastMyChatMember(const ChatMemberUpdated::Ptr& result) const {
+        broadcast<ChatMemberUpdatedListener, ChatMemberUpdated::Ptr>(_onMyChatMemberListeners, result);
+    }
+
+    inline void broadcastChatMember(const ChatMemberUpdated::Ptr& result) const {
+        broadcast<ChatMemberUpdatedListener, ChatMemberUpdated::Ptr>(_onChatMemberListeners, result);
+    }
+
+    inline void broadcastChatJoinRequest(const ChatJoinRequest::Ptr& result) const {
+        broadcast<ChatJoinRequestListener, ChatJoinRequest::Ptr>(_onChatJoinRequestListeners, result);
+    }
+
     std::vector<MessageListener> _onAnyMessageListeners;
     std::unordered_map<std::string, MessageListener> _onCommandListeners;
     std::vector<MessageListener> _onUnknownCommandListeners;
     std::vector<MessageListener> _onNonCommandMessageListeners;
+    std::vector<MessageListener> _onEditedMessageListeners;
     std::vector<InlineQueryListener> _onInlineQueryListeners;
     std::vector<ChosenInlineResultListener> _onChosenInlineResultListeners;
     std::vector<CallbackQueryListener> _onCallbackQueryListeners;
+    std::vector<ShippingQueryListener> _onShippingQueryListeners;
+    std::vector<PreCheckoutQueryListener> _onPreCheckoutQueryListeners;
+    std::vector<PollListener> _onPollListeners;
+    std::vector<PollAnswerListener> _onPollAnswerListeners;
+    std::vector<ChatMemberUpdatedListener> _onMyChatMemberListeners;
+    std::vector<ChatMemberUpdatedListener> _onChatMemberListeners;
+    std::vector<ChatJoinRequestListener> _onChatJoinRequestListeners;
 };
 
 }