Merge pull request #264 from llnulldisk/master

Update to Bot API 6.5

Author: reo7sp

README.md

@@ -9,7 +9,7 @@ Documentation is located [here](http://reo7sp.github.io/tgbot-cpp).
 
 ## State
 
-- [x] Bot API 3.0 ~ 6.4
+- [x] Telegram Bot API 6.5
 
 
 ## Sample

include/tgbot/Api.h

@@ -770,7 +770,7 @@ friend class Bot;
      * @brief Use this method to get basic information about a file and prepare it for downloading.
      * 
      * For the moment, bots can download files of up to 20MB in size.
-     * The file can then be downloaded via Api::downloadFile, where filePath is taken from the response.
+     * The file can then be downloaded via Api::downloadFile or via the link https://api.telegram.org/file/bot<token>/<filePath>, where filePath is taken from the response.
      * It is guaranteed that the filePath will be valid for at least 1 hour.
      * When the link expires, a new one can be requested by calling Api::getFile again.
      * 
@@ -823,20 +823,22 @@ friend class Bot;
     /**
      * @brief Use this method to restrict a user in a supergroup.
      * 
-     * The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights.
+     * The bot must be an administrator in the supergroup for this to work and must have the appropriate administrator rights.
      * Pass True for all permissions to lift restrictions from a user.
      * 
      * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
      * @param userId Unique identifier of the target user
      * @param permissions A JSON-serialized object for new user permissions
      * @param untilDate Optional. Date when restrictions will be lifted for the user, unix time. If user is restricted for more than 366 days or less than 30 seconds from the current time, they are considered to be restricted forever
+     * @param useIndependentChatPermissions Optional. Pass True if chat permissions are set independently. Otherwise, the canSendOtherMessages and canAddWebPagPreviews permissions will imply the canSendMessages, canSendAudios, canSendDocuments, canSendPhotos, canSendVideos, canSendVideoNotes, and canSendVoiceNotes permissions; the canSendPolls permission will imply the canSendMessages permission.
      * 
      * @return Returns True on success.
      */
     bool restrictChatMember(boost::variant<std::int64_t, std::string> chatId,
                             std::int64_t userId,
                             ChatPermissions::Ptr permissions,
-                            std::int64_t untilDate = 0) const;
+                            std::int64_t untilDate = 0,
+                            bool useIndependentChatPermissions = false) const;
 
     /**
      * @brief Use this method to promote or demote a user in a supergroup or a channel.
@@ -852,7 +854,7 @@ friend class Bot;
      * @param canDeleteMessages Optional. Pass True if the administrator can delete messages of other users
      * @param canInviteUsers Optional. Pass True if the administrator can invite new users to the chat
      * @param canPinMessages Optional. Pass True if the administrator can pin messages, supergroups only
-     * @param canPromoteMembers Optional. Pass True if the administrator can add new administrators with a subset of their own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by him)
+     * @param canPromoteMembers Optional. Pass True if the administrator can add new administrators with a subset of their own privileges or demote administrators that they have promoted, directly or indirectly (promoted by administrators that were appointed by him)
      * @param isAnonymous Optional. Pass True if the administrator's presence in the chat is hidden
      * @param canManageChat Optional. Pass True if the administrator can access the chat event log, chat statistics, message statistics in channels, see channel members, see anonymous administrators in supergroups and ignore slow mode. Implied by any other administrator privilege
      * @param canManageVideoChats Optional. Pass True if the administrator can manage video chats
@@ -923,11 +925,13 @@ friend class Bot;
      * 
      * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
      * @param permissions A JSON-serialized object for new default chat permissions
+     * @param useIndependentChatPermissions Optional. Pass True if chat permissions are set independently. Otherwise, the canSendOtherMessages and canAddWebPagPreviews permissions will imply the canSendMessages, canSendAudios, canSendDocuments, canSendPhotos, canSendVideos, canSendVideoNotes, and canSendVoiceNotes permissions; the canSendPolls permission will imply the canSendMessages permission.
      * 
      * @return Returns True on success.
      */
     bool setChatPermissions(boost::variant<std::int64_t, std::string> chatId,
-                            ChatPermissions::Ptr permissions) const;
+                            ChatPermissions::Ptr permissions,
+                            bool useIndependentChatPermissions = false) const;
 
     /**
      * @brief Use this method to generate a new primary invite link for a chat; any previously generated primary link is revoked.
@@ -1157,7 +1161,7 @@ friend class Bot;
     /**
      * @brief Use this method to get information about a member of a chat.
      * 
-     * The method is guaranteed to work for other users, only if the bot is an administrator in the chat.
+     * The method is only guaranteed to work for other users if the bot is an administrator in the chat.
      * 
      * @param chatId Unique identifier for the target chat or username of the target supergroup or channel (in the format @channelusername)
      * @param userId Unique identifier of the target user
@@ -1207,7 +1211,7 @@ friend class Bot;
      * 
      * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
      * @param name Topic name, 1-128 characters
-     * @param iconColor Optional. Color of the topic icon in RGB format. Currently, must be one of 0x6FB9F0, 0xFFD67E, 0xCB86DB, 0x8EEE98, 0xFF93B2, or 0xFB6F5F
+     * @param iconColor Optional. Color of the topic icon in RGB format. Currently, must be one of 7322096 (0x6FB9F0), 16766590 (0xFFD67E), 13338331 (0xCB86DB), 9367192 (0x8EEE98), 16749490 (0xFF93B2), or 16478047 (0xFB6F5F)
      * @param iconCustomEmojiId Optional. Unique identifier of the custom emoji shown as the topic icon. Use Api::getForumTopicIconStickers to get all allowed custom emoji identifiers.
      * 
      * @return Returns information about the created topic as a ForumTopic object.

include/tgbot/TgTypeParser.h

@@ -32,6 +32,8 @@
 #include "tgbot/types/ForumTopicReopened.h"
 #include "tgbot/types/GeneralForumTopicHidden.h"
 #include "tgbot/types/GeneralForumTopicUnhidden.h"
+#include "tgbot/types/UserShared.h"
+#include "tgbot/types/ChatShared.h"
 #include "tgbot/types/WriteAccessAllowed.h"
 #include "tgbot/types/VideoChatScheduled.h"
 #include "tgbot/types/VideoChatStarted.h"
@@ -42,6 +44,8 @@
 #include "tgbot/types/WebAppInfo.h"
 #include "tgbot/types/ReplyKeyboardMarkup.h"
 #include "tgbot/types/KeyboardButton.h"
+#include "tgbot/types/KeyboardButtonRequestUser.h"
+#include "tgbot/types/KeyboardButtonRequestChat.h"
 #include "tgbot/types/KeyboardButtonPollType.h"
 #include "tgbot/types/ReplyKeyboardRemove.h"
 #include "tgbot/types/InlineKeyboardMarkup.h"
@@ -252,6 +256,12 @@ class TGBOT_API TgTypeParser {
     GeneralForumTopicUnhidden::Ptr parseJsonAndGetGeneralForumTopicUnhidden(const boost::property_tree::ptree& data) const;
     std::string parseGeneralForumTopicUnhidden(const GeneralForumTopicUnhidden::Ptr& object) const;
 
+    UserShared::Ptr parseJsonAndGetUserShared(const boost::property_tree::ptree& data) const;
+    std::string parseUserShared(const UserShared::Ptr& object) const;
+
+    ChatShared::Ptr parseJsonAndGetChatShared(const boost::property_tree::ptree& data) const;
+    std::string parseChatShared(const ChatShared::Ptr& object) const;
+
     WriteAccessAllowed::Ptr parseJsonAndGetWriteAccessAllowed(const boost::property_tree::ptree& data) const;
     std::string parseWriteAccessAllowed(const WriteAccessAllowed::Ptr& object) const;
 
@@ -282,6 +292,12 @@ class TGBOT_API TgTypeParser {
     KeyboardButton::Ptr parseJsonAndGetKeyboardButton(const boost::property_tree::ptree& data) const;
     std::string parseKeyboardButton(const KeyboardButton::Ptr& object) const;
 
+    KeyboardButtonRequestUser::Ptr parseJsonAndGetKeyboardButtonRequestUser(const boost::property_tree::ptree& data) const;
+    std::string parseKeyboardButtonRequestUser(const KeyboardButtonRequestUser::Ptr& object) const;
+
+    KeyboardButtonRequestChat::Ptr parseJsonAndGetKeyboardButtonRequestChat(const boost::property_tree::ptree& data) const;
+    std::string parseKeyboardButtonRequestChat(const KeyboardButtonRequestChat::Ptr& object) const;
+
     KeyboardButtonPollType::Ptr parseJsonAndGetKeyboardButtonPollType(const boost::property_tree::ptree& data) const;
     std::string parseKeyboardButtonPollType(const KeyboardButtonPollType::Ptr& object) const;
 

include/tgbot/types/ChatAdministratorRights.h

@@ -42,7 +42,7 @@ class ChatAdministratorRights {
     bool canRestrictMembers;
 
     /**
-     * @brief True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by the user)
+     * @brief True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that they have promoted, directly or indirectly (promoted by administrators that were appointed by the user)
      */
     bool canPromoteMembers;
 

include/tgbot/types/ChatJoinRequest.h

@@ -1,5 +1,5 @@
-#ifndef TGBOT_CPP_CHATJOINREQUEST_H
-#define TGBOT_CPP_CHATJOINREQUEST_H
+#ifndef TGBOT_CHATJOINREQUEST_H
+#define TGBOT_CHATJOINREQUEST_H
 
 #include "tgbot/types/Chat.h"
 #include "tgbot/types/User.h"
@@ -31,6 +31,16 @@ class ChatJoinRequest {
      */
     User::Ptr from;
 
+    /**
+     * @brief Identifier of a private chat with the user who sent the join request.
+     * 
+     * The bot can use this identifier for 24 hours to send messages until the join request is processed, assuming no other administrator contacted the user.
+     * 
+     * This number may have more than 32 significant bits and some programming languages may have difficulty/silent defects in interpreting it.
+     * But it has at most 52 significant bits, so a 64-bit integer or double-precision float type are safe for storing this identifier.
+     */
+    std::int64_t userChatId;
+
     /**
      * @brief Date the request was sent in Unix time
      */
@@ -48,4 +58,4 @@ class ChatJoinRequest {
 };
 }
 
-#endif //TGBOT_CPP_CHATJOINREQUEST_H
+#endif //TGBOT_CHATJOINREQUEST_H

include/tgbot/types/ChatMemberAdministrator.h

@@ -56,7 +56,7 @@ class ChatMemberAdministrator : public ChatMember {
     bool canRestrictMembers;
 
     /**
-     * @brief True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by the user)
+     * @brief True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that they have promoted, directly or indirectly (promoted by administrators that were appointed by the user)
      */
     bool canPromoteMembers;
 

include/tgbot/types/ChatMemberRestricted.h

@@ -31,34 +31,39 @@ class ChatMemberRestricted : public ChatMember {
     bool isMember;
 
     /**
-     * @brief True, if the user is allowed to change the chat title, photo and other settings
+     * @brief True, if the user is allowed to send text messages, contacts, invoices, locations and venues
      */
-    bool canChangeInfo;
+    bool canSendMessages;
 
     /**
-     * @brief True, if the user is allowed to invite new users to the chat
+     * @brief True, if the user is allowed to send audios
      */
-    bool canInviteUsers;
+    bool canSendAudios;
 
     /**
-     * @brief True, if the user is allowed to pin messages
+     * @brief True, if the user is allowed to send documents
      */
-    bool canPinMessages;
+    bool canSendDocuments;
 
     /**
-     * @brief True, if the user is allowed to create forum topics
+     * @brief True, if the user is allowed to send photos
      */
-    bool canManageTopics;
+    bool canSendPhotos;
 
     /**
-     * @brief True, if the user is allowed to send text messages, contacts, locations and venues
+     * @brief True, if the user is allowed to send videos
      */
-    bool canSendMessages;
+    bool canSendVideos;
+
+    /**
+     * @brief True, if the user is allowed to send video notes
+     */
+    bool canSendVideoNotes;
 
     /**
-     * @brief True, if the user is allowed to send audios, documents, photos, videos, video notes and voice notes
+     * @brief True, if the user is allowed to send voice notes
      */
-    bool canSendMediaMessages;
+    bool canSendVoiceNotes;
 
     /**
      * @brief True, if the user is allowed to send polls
@@ -75,6 +80,26 @@ class ChatMemberRestricted : public ChatMember {
      */
     bool canAddWebPagePreviews;
 
+    /**
+     * @brief True, if the user is allowed to change the chat title, photo and other settings
+     */
+    bool canChangeInfo;
+
+    /**
+     * @brief True, if the user is allowed to invite new users to the chat
+     */
+    bool canInviteUsers;
+
+    /**
+     * @brief True, if the user is allowed to pin messages
+     */
+    bool canPinMessages;
+
+    /**
+     * @brief True, if the user is allowed to create forum topics
+     */
+    bool canManageTopics;
+
     /**
      * @brief Date when restrictions will be lifted for this user; unix time.
      * 

include/tgbot/types/ChatPermissions.h

@@ -16,14 +16,39 @@ class ChatPermissions {
     typedef std::shared_ptr<ChatPermissions> Ptr;
 
     /**
-     * @brief Optional. True, if the user is allowed to send text messages, contacts, locations and venues
+     * @brief Optional. True, if the user is allowed to send text messages, contacts, invoices, locations and venues
      */
     bool canSendMessages;
 
     /**
-     * @brief Optional. True, if the user is allowed to send audios, documents, photos, videos, video notes and voice notes, implies canSendMessages
+     * @brief Optional. True, if the user is allowed to send audios
      */
-    bool canSendMediaMessages;
+    bool canSendAudios;
+
+    /**
+     * @brief Optional. True, if the user is allowed to send documents
+     */
+    bool canSendDocuments;
+
+    /**
+     * @brief Optional. True, if the user is allowed to send photos
+     */
+    bool canSendPhotos;
+
+    /**
+     * @brief Optional. True, if the user is allowed to send videos
+     */
+    bool canSendVideos;
+
+    /**
+     * @brief Optional. True, if the user is allowed to send video notes
+     */
+    bool canSendVideoNotes;
+
+    /**
+     * @brief Optional. True, if the user is allowed to send voice notes
+     */
+    bool canSendVoiceNotes;
 
     /**
      * @brief Optional. True, if the user is allowed to send polls, implies canSendMessages

include/tgbot/types/ChatShared.h

@@ -0,0 +1,36 @@
+#ifndef TGBOT_CHATSHARED_H
+#define TGBOT_CHATSHARED_H
+
+#include <cstdint>
+#include <memory>
+
+namespace TgBot {
+
+/**
+ * @brief This object contains information about the chat whose identifier was shared with the bot using a KeyboardButtonRequestChat button.
+ *
+ * @ingroup types
+ */
+class ChatShared  {
+
+public:
+    typedef std::shared_ptr<ChatShared> Ptr;
+
+    /**
+     * @brief Identifier of the request
+     */
+    std::int32_t requestId;
+
+    /**
+     * @brief Identifier of the shared chat.
+     * 
+     * The bot may not have access to the chat and could be unable to use this identifier, unless the chat is already known to the bot by some other means.
+     * 
+     * This number may have more than 32 significant bits and some programming languages may have difficulty/silent defects in interpreting it.
+     * But it has at most 52 significant bits, so a 64-bit integer or double-precision float type are safe for storing this identifier.
+     */
+    std::int64_t userId;
+};
+}
+
+#endif //TGBOT_CHATSHARED_H

include/tgbot/types/File.h

@@ -9,7 +9,7 @@ namespace TgBot {
 
 /**
  * @brief This object represents a file ready to be downloaded.
- * The file can be downloaded via Api::downloadFile.
+ * The file can be downloaded via Api::downloadFile or via the link https://api.telegram.org/file/bot<token>/<filePath>.
  * It is guaranteed that the File::filePath will be valid for at least 1 hour.
  * When the File::filePath expires, a new one can be requested by calling Api::getFile.
  * 
@@ -43,7 +43,7 @@ class File {
 
     /**
      * @brief Optional. File path.
-     * Use Api::downloadFile to get the file.
+     * Use Api::downloadFile or https://api.telegram.org/file/bot<token>/<filePath> to get the file.
      */
     std::string filePath;
 };