Rework Bot API 4.7

25 files changed, 336 insertions, 304 deletions

diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
index 18165d1..e5a17f5 100644
--- a/include/tgbot/Api.h
+++ b/include/tgbot/Api.h
@@ -56,20 +56,35 @@ public:
 
     /**
      * @brief Use this method to send text messages.
-     * @param chatId Unique identifier for the target chat.
-     * @param text Text of the message to be sent.
-     * @param disableWebPagePreview Optional. Disables link previews for links in this message.
-     * @param replyToMessageId Optional. If the message is a reply, ID of the original message.
-     * @param replyMarkup Optional. Additional interface options. An object for a custom reply keyboard, instructions to hide keyboard or to force a reply from the user.
-     * @param parseMode Optional. Set it to "Markdown" or "HTML" if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in your bot's message.
-     * @param disableNotification Optional. Sends the message silenty.
-     * @return On success, the sent message is returned.
+     * 
+     * @param chatId Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+     * @param text Text of the message to be sent
+     * @param parseMode Optional. Send Markdown or HTML, if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in your bot's message.
+     * @param disableWebPagePreview Optional. Disables link previews for links in this message
+     * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound.
+     * @param replyToMessageId Optional. If the message is a reply, ID of the original message
+     * @param replyMarkup Optional. Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
+     * 
+     * @return On success, the sent @ref Message is returned.
      */
-    Message::Ptr sendMessage(std::int64_t chatId, const std::string& text, bool disableWebPagePreview = false, std::int32_t replyToMessageId = 0,
-                             GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const;
+    Message::Ptr sendMessage(boost::variant<std::int64_t, const std::string&> chatId, const std::string& text, const std::string& parseMode = "",
+                             bool disableWebPagePreview = false, bool disableNotification = false, std::int32_t replyToMessageId = 0,
+                             GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const;
 
-    Message::Ptr sendMessage(const std::string& chatId, const std::string& text, bool disableWebPagePreview = false, std::int32_t replyToMessageId = 0,
-                            GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const;
+    /**
+     * @brief Deprecated. Use @ref Api::sendMessage
+     * @deprecated since Bot API 4.5. This remains unchanged for backward compatibility.
+     */
+    Message::Ptr sendMessage(const std::string& chatId, const std::string& text, bool disableWebPagePreview = false,
+                             std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "",
+                             bool disableNotification = false) const;
+    /**
+     * @brief Deprecated. Use @ref Api::sendMessage
+     * @deprecated since Bot API 4.5. This remains unchanged for backward compatibility.
+     */
+    Message::Ptr sendMessage(std::int64_t chatId, const std::string& text, bool disableWebPagePreview = false,
+                             std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "",
+                             bool disableNotification = false) const;
 
     /**
      * @brief Use this method to forward messages of any kind.
@@ -219,6 +234,7 @@ public:
 
     /**
      * @brief Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields pngSticker or tgsSticker.
+     * 
      * @param userId User identifier of created sticker set owner
      * @param name Short name of sticker set, to be used in t.me/addstickers/ URLs (e.g., animals). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in “_by_<bot username>”. <bot_username> is case insensitive. 1-64 characters.
      * @param title Sticker set title, 1-64 characters
@@ -227,25 +243,41 @@ public:
      * @param tgsSticker Optional. TGS animation with the sticker, uploaded using multipart/form-data. See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
      * @param containsMasks Optional. Pass True, if a set of mask stickers should be created
      * @param maskPosition Optional. A JSON-serialized object for position where the mask should be placed on faces
+     * 
      * @return Returns True on success.
      */
-    bool createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title, const std::string& emojis,
-                             boost::variant<InputFile::Ptr, std::string> pngSticker = "", boost::variant<InputFile::Ptr, std::string> tgsSticker = "",
+    bool createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title,
+                             const std::string& emojis, boost::variant<InputFile::Ptr, std::string> pngSticker = "", boost::variant<InputFile::Ptr, std::string> tgsSticker = "",
                              bool containsMasks = false, MaskPosition::Ptr maskPosition = nullptr) const;
 
     /**
+     * @brief Deprecated. Use @ref Api::createNewStickerSet
+     * @deprecated since Bot API 4.7. This remains unchanged for backward compatibility.
+     */
+    bool createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title,
+                             boost::variant<InputFile::Ptr, std::string> pngSticker, const std::string& emojis, bool containsMasks = false, MaskPosition::Ptr maskPosition = nullptr) const;
+
+    /**
      * @brief Use this method to add a new sticker to a set created by the bot. You must use exactly one of the fields png_sticker or tgs_sticker. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers.
+     * 
      * @param userId User identifier of sticker set owner
      * @param name Sticker set name
      * @param emojis One or more emoji corresponding to the sticker
      * @param pngSticker Optional. PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data.
      * @param tgsSticker Optional. TGS animation with the sticker, uploaded using multipart/form-data. See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
      * @param maskPosition Optional. A JSON-serialized object for position where the mask should be placed on faces
+     * 
      * @return Returns True on success.
      */
     bool addStickerToSet(std::int64_t userId, const std::string& name, const std::string& emojis,
-                         boost::variant<InputFile::Ptr, std::string> pngSticker = "", boost::variant<InputFile::Ptr, std::string> tgsSticker = "",
-                         MaskPosition::Ptr maskPosition = nullptr) const;
+                         boost::variant<InputFile::Ptr, std::string> pngSticker = "", boost::variant<InputFile::Ptr, std::string> tgsSticker = "", MaskPosition::Ptr maskPosition = nullptr) const;
+
+    /**
+     * @brief Deprecated. Use @ref Api::addStickerToSet
+     * @deprecated since Bot API 4.7. This remains unchanged for backward compatibility.
+     */
+    bool addStickerToSet(std::int64_t userId, const std::string& name, boost::variant<InputFile::Ptr, std::string> pngSticker,
+                         const std::string& emojis, MaskPosition::Ptr maskPosition = nullptr) const;
 
     /**
      * @brief Use this method to move a sticker in a set created by the bot to a specific position.
@@ -264,9 +296,11 @@ public:
 
     /**
      * @brief Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only.
+     * 
      * @param name Sticker set name
      * @param userId User identifier of the sticker set owner
      * @param thumb Optional. A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a TGS animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. Animated sticker set thumbnail can't be uploaded via HTTP URL.
+     * 
      * @return Returns True on success.
      */
     bool setStickerSetThumb(const std::string& name, std::int64_t userId, boost::variant<InputFile::Ptr, std::string> thumb = "") const;
@@ -696,9 +730,11 @@ public:
 
     /**
      * @brief Use this method to set a custom title for an administrator in a supergroup promoted by the bot.
+     * 
      * @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 customTitle New custom title for the administrator; 0-16 characters, emoji are not allowed
+     * 
      * @return True on success
      */
     bool setChatAdministratorCustomTitle(std::int64_t chatId, std::int64_t userId, const std::string& customTitle) const;
@@ -815,32 +851,45 @@ public:
 
     /**
      * @brief Use this method to send a native poll.
+     * 
      * @param chatId Unique identifier for the target chat or username of the target channel (in the format @channelusername)
      * @param question Poll question, 1-255 characters
      * @param options A JSON-serialized list of answer options, 2-10 strings 1-100 characters each
-     * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound.
-     * @param replyToMessageId Optional. If the message is a reply, ID of the original message
-     * @param replyMarkup Optional. Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
      * @param isAnonymous Optional. True, if the poll needs to be anonymous, defaults to True
      * @param type Optional. Poll type, “quiz” or “regular”, defaults to “regular”
      * @param allowsMultipleAnswers Optional. True, if the poll allows multiple answers, ignored for polls in quiz mode, defaults to False
      * @param correctOptionId Optional. 0-based identifier of the correct answer option, required for polls in quiz mode
      * @param isClosed Optional. Pass True, if the poll needs to be immediately closed. This can be useful for poll preview.
-     * @return On success, the sent message is returned.
+     * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound.
+     * @param replyToMessageId Optional. If the message is a reply, ID of the original message
+     * @param replyMarkup Optional. Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
+     * 
+     * @return On success, the sent @ref Message is returned.
      */
-    Message::Ptr sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options, bool disableNotification = false, std::int32_t replyToMessageId = 0,
-                          GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), bool isAnonymous = true, const std::string& type = "", bool allowsMultipleAnswers = false,
-                          std::int32_t correctOptionId = 0, bool isClosed = false) const;
+    Message::Ptr sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options,
+                          bool isAnonymous = true, const std::string& type = "", bool allowsMultipleAnswers = false,
+                          std::int32_t correctOptionId = 0, bool isClosed = false, bool disableNotification = false,
+                          std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const;
+
+    /**
+     * @brief Deprecated. Use @ref Api::sendPoll
+     * @deprecated since Bot API 4.6. This remains unchanged for backward compatibility.
+     */
+    Message::Ptr sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options,
+                          bool disableNotification = false, std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const;
 
     /**
      * @brief Use this method to send a dice, which will have a random value from 1 to 6.
+     * 
      * @param chatId Unique identifier for the target chat or username of the target channel (in the format @channelusername)
      * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound.
      * @param replyToMessageId Optional. If the message is a reply, ID of the original message
      * @param replyMarkup Optional. Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
-     * @return On success, the sent message is returned.
+     * 
+     * @return On success, the sent @ref Message is returned.
      */
-    Message::Ptr sendDice(std::int64_t chatId, bool disableNotification = false, std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const;
+    Message::Ptr sendDice(std::int64_t chatId, bool disableNotification = false, std::int32_t replyToMessageId = 0,
+                          GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const;
 
     /**
      * @brief Use this method to stop a poll which was sent by the bot.
diff --git a/include/tgbot/types/Animation.h b/include/tgbot/types/Animation.h
index f1f62af..ee3cdd4 100644
--- a/include/tgbot/types/Animation.h
+++ b/include/tgbot/types/Animation.h
@@ -25,7 +25,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/Audio.h b/include/tgbot/types/Audio.h
index 0db0a36..a4b8c94 100644
--- a/include/tgbot/types/Audio.h
+++ b/include/tgbot/types/Audio.h
@@ -26,7 +26,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/Chat.h b/include/tgbot/types/Chat.h
index d70aa4b..ad2329e 100644
--- a/include/tgbot/types/Chat.h
+++ b/include/tgbot/types/Chat.h
@@ -30,7 +30,7 @@ public:
 
     /**
      * @brief Unique identifier for this chat.
-     *
+     * 
      * This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it.
      * But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
      */
@@ -62,66 +62,51 @@ public:
     std::string lastName;
 
     /**
-     * @brief Deprecated since Bot API 4.4. New bots should use the permissions field instead.
-     *
-     * Optional. True if a group has ‘All Members Are Admins’ enabled.
-     */
-    bool allMembersAreAdministrators;
-
-    /**
      * @brief Optional. Chat photo.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     ChatPhoto::Ptr photo;
 
     /**
      * @brief Optional. Description, for groups, supergroups and channel chats.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     std::string description;
 
     /**
      * @brief Optional. Chat invite link, for groups, supergroups and channel chats.
-     *
-     * Each administrator in a chat generates their own invite links, so the bot must first generate the link using exportChatInviteLink.
-     * Returned only in getChat.
+     * Each administrator in a chat generates their own invite links, so the bot must first generate the link using @ref Api::exportChatInviteLink.
+     * Returned only in @ref Api::getChat.
      */
     std::string inviteLink;
 
     /**
      * @brief Optional. Pinned message, for groups, supergroups and channels.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     std::shared_ptr<Message> pinnedMessage;
 
     /**
      * @brief Optional. Default chat member permissions, for groups and supergroups.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     ChatPermissions::Ptr permissions;
 
     /**
      * @brief Optional. For supergroups, the minimum allowed delay between consecutive messages sent by each unpriviledged user.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     std::int32_t slowModeDelay;
 
     /**
      * @brief Optional. For supergroups, name of group sticker set.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     std::string stickerSetName;
 
     /**
      * @brief Optional. True, if the bot can change the group sticker set.
-     *
-     * Returned only in getChat.
+     * Returned only in @ref Api::getChat.
      */
     bool canSetStickerSet;
 };
diff --git a/include/tgbot/types/ChatMember.h b/include/tgbot/types/ChatMember.h
index 99be20a..5ec07a5 100644
--- a/include/tgbot/types/ChatMember.h
+++ b/include/tgbot/types/ChatMember.h
@@ -25,7 +25,8 @@ public:
     User::Ptr user;
 
     /**
-     * @brief The member's status in the chat. Can be “creator”, “administrator”, “member”, “restricted”, “left” or “kicked”
+     * @brief The member's status in the chat.
+     * Can be “creator”, “administrator”, “member”, “restricted”, “left” or “kicked”
      */
     std::string status;
 
@@ -35,84 +36,84 @@ public:
     std::string customTitle;
 
     /**
-     * @brief Optional. Restricted and kicked only. Date when restrictions will be lifted for this user, unix time.
+     * @brief Optional. Restricted and kicked only. Date when restrictions will be lifted for this user; unix time
      */
     std::uint64_t untilDate;
 
     /**
-     * @brief Optional. Administrators only. True, if the bot is allowed to edit administrator privileges of that user.
+     * @brief Optional. Administrators only. True, if the bot is allowed to edit administrator privileges of that user
      */
-    bool canBeEdited = false;
+    bool canBeEdited;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can change the chat title, photo and other settings.
+     * @brief Optional. Administrators only. True, if the administrator can post in the channel; channels only
      */
-    bool canChangeInfo = false;
+    bool canPostMessages;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can post in the channel, channels only.
+     * @brief Optional. Administrators only. True, if the administrator can edit messages of other users and can pin messages; channels only
      */
-    bool canPostMessages = false;
+    bool canEditMessages;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can edit messages of other users and can pin messages, channels only.
+     * @brief Optional. Administrators only. True, if the administrator can delete messages of other users
      */
-    bool canEditMessages = false;
+    bool canDeleteMessages;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can delete messages of other users.
+     * @brief Optional. Administrators only. True, if the administrator can restrict, ban or unban chat members
      */
-    bool canDeleteMessages = false;
+    bool canRestrictMembers;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can invite new users to the chat.
+     * @brief Optional. Administrators only. True, if the administrator can add new administrators with a subset of his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by the user)
      */
-    bool canInviteUsers = false;
+    bool canPromoteMembers;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can restrict, ban or unban chat members.
+     * @brief Optional. Administrators and restricted only. True, if the user is allowed to change the chat title, photo and other settings
      */
-    bool canRestrictMembers = false;
+    bool canChangeInfo;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can pin messages, supergroups only.
+     * @brief Optional. Administrators and restricted only. True, if the user is allowed to invite new users to the chat
      */
-    bool canPinMessages = false;
+    bool canInviteUsers;
 
     /**
-     * @brief Optional. Restricted only. True, if the user is a member of the chat at the moment of the request.
+     * @brief Optional. Administrators and restricted only. True, if the user is allowed to pin messages; groups and supergroups only
      */
-    bool isMember = false;
+    bool canPinMessages;
 
     /**
-     * @brief Optional. Administrators only. True, if the administrator can add new administrators with a subset of his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by the user).
+     * @brief Optional. Restricted only. True, if the user is a member of the chat at the moment of the request
      */
-    bool canPromoteMembers = false;
+    bool isMember;
 
     /**
-     * @brief Optional. Restricted only. True, if the user can send text messages, contacts, locations and venues.
+     * @brief Optional. Restricted only. True, if the user is allowed to send text messages, contacts, locations and venues
      */
-    bool canSendMessages = false;
+    bool canSendMessages;
 
     /**
-     * @brief Optional. Restricted only. True, if the user can send audios, documents, photos, videos, video notes and voice notes, implies can_send_messages.
+     * @brief Optional. Restricted only. True, if the user is allowed to send audios, documents, photos, videos, video notes and voice notes
      */
-    bool canSendMediaMessages = false;
+    bool canSendMediaMessages;
 
     /**
-     * @brief Optional. Restricted only. True, if the user can send animations, games, stickers and use inline bots, implies can_send_media_messages.
+     * @brief Optional. Restricted only. True, if the user is allowed to send polls
      */
-    bool canSendOtherMessages = false;
+    bool canSendPolls;
 
     /**
-     * @brief Optional. Restricted only. True, if the user can send animations, games, stickers and use inline bots, implies can_send_media_messages.
+     * @brief Optional. Restricted only. True, if the user is allowed to send animations, games, stickers and use inline bots
      */
-    bool canSendPolls = false;
+    bool canSendOtherMessages;
 
     /**
-     * @brief Optional. Restricted only. True, if user may add web page previews to his messages, implies can_send_media_messages.
+     * @brief Optional. Restricted only. True, if the user is allowed to add web page previews to their messages
      */
-    bool canAddWebPagePreviews = false;
+    bool canAddWebPagePreviews;
 };
 }
 
diff --git a/include/tgbot/types/ChatPhoto.h b/include/tgbot/types/ChatPhoto.h
index 92275b2..8ee25f1 100644
--- a/include/tgbot/types/ChatPhoto.h
+++ b/include/tgbot/types/ChatPhoto.h
@@ -18,28 +18,24 @@ public:
 
     /**
      * @brief File identifier of small (160x160) chat photo.
-     *
      * This file_id can be used only for photo download and only for as long as the photo is not changed.
      */
     std::string smallFileId;
 
     /**
      * @brief Unique file identifier of small (160x160) chat photo, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string smallFileUniqueId;
 
     /**
      * @brief File identifier of big (640x640) chat photo.
-     *
      * This file_id can be used only for photo download and only for as long as the photo is not changed.
      */
     std::string bigFileId;
 
     /**
      * @brief Unique file identifier of big (640x640) chat photo, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string bigFileUniqueId;
diff --git a/include/tgbot/types/Document.h b/include/tgbot/types/Document.h
index 128b757..71f4f3c 100644
--- a/include/tgbot/types/Document.h
+++ b/include/tgbot/types/Document.h
@@ -26,7 +26,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/File.h b/include/tgbot/types/File.h
index 58aa6af..e684528 100644
--- a/include/tgbot/types/File.h
+++ b/include/tgbot/types/File.h
@@ -9,10 +9,9 @@ namespace TgBot {
 
 /**
  * @brief This object represents a file ready to be downloaded.
- *
- * The file can be downloaded via the link https://api.telegram.org/file/bot<token>/<file_path>.
- * It is guaranteed that the link will be valid for at least 1 hour.
- * When the link expires, a new one can be requested by calling getFile.
+ * The file can be downloaded via @ref Api::downloadFile.
+ * It is guaranteed that the @ref File::filePath will be valid for at least 1 hour.
+ * When the @ref File::filePath expires, a new one can be requested by calling @ref Api::getFile.
  * Maximum file size to download is 20 MB
  *
  * @ingroup types
@@ -29,7 +28,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
@@ -41,8 +39,7 @@ public:
 
     /**
      * @brief Optional. File path.
-     *
-     * Use https://api.telegram.org/file/bot<token>/<file_path> to get the file.
+     * Use @ref Api::downloadFile to get the file.
      */
     std::string filePath;
 };
diff --git a/include/tgbot/types/KeyboardButton.h b/include/tgbot/types/KeyboardButton.h
index f2b6791..40e6af1 100644
--- a/include/tgbot/types/KeyboardButton.h
+++ b/include/tgbot/types/KeyboardButton.h
@@ -10,7 +10,6 @@ namespace TgBot {
 
 /**
  * @brief This object represents one button of the reply keyboard.
- *
  * For simple text buttons String can be used instead of this object to specify text of the button.
  * Optional fields request_contact, request_location, and request_poll are mutually exclusive.
  *
@@ -22,22 +21,26 @@ public:
     typedef std::shared_ptr<KeyboardButton> Ptr;
 
     /**
-     * @brief Text of the button. If none of the optional fields are used, it will be sent as a message when the button is pressed
+     * @brief Text of the button.
+     * If none of the optional fields are used, it will be sent as a message when the button is pressed
      */
     std::string text;
 
     /**
-     * @brief Optional. If True, the user's phone number will be sent as a contact when the button is pressed. Available in private chats only
+     * @brief Optional. If True, the user's phone number will be sent as a contact when the button is pressed.
+     * Available in private chats only
      */
     bool requestContact = false;
 
     /**
-     * @brief Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only
+     * @brief Optional. If True, the user's current location will be sent when the button is pressed.
+     * Available in private chats only
      */
     bool requestLocation = false;
 
     /**
-     * @brief Optional. If specified, the user will be asked to create a poll and send it to the bot when the button is pressed. Available in private chats only
+     * @brief Optional. If specified, the user will be asked to create a poll and send it to the bot when the button is pressed.
+     * Available in private chats only
      */
     KeyboardButtonPollType::Ptr requestPoll;
 };
diff --git a/include/tgbot/types/KeyboardButtonPollType.h b/include/tgbot/types/KeyboardButtonPollType.h
index 1bead32..cdef75a 100644
--- a/include/tgbot/types/KeyboardButtonPollType.h
+++ b/include/tgbot/types/KeyboardButtonPollType.h
@@ -18,8 +18,8 @@ public:
 
     /**
      * @brief Optional. If quiz is passed, the user will be allowed to create only polls in the quiz mode.
-     * 
-     * If regular is passed, only regular polls will be allowed. Otherwise, the user will be allowed to create a poll of any type.
+     * If regular is passed, only regular polls will be allowed.
+     * Otherwise, the user will be allowed to create a poll of any type.
      */
     std::string type;
 };
diff --git a/include/tgbot/types/Message.h b/include/tgbot/types/Message.h
index d34fa0d..41612d1 100644
--- a/include/tgbot/types/Message.h
+++ b/include/tgbot/types/Message.h
@@ -91,8 +91,7 @@ public:
 
     /**
      * @brief Optional. For replies, the original message.
-     *
-     * Note that the Message object in this field will not contain further reply_to_message fields even if it itself is a reply.
+     * Note that the Message object in this field will not contain further @ref Message::replyToMessage fields even if it itself is a reply.
      */
     Message::Ptr replyToMessage;
 
@@ -138,7 +137,6 @@ public:
 
     /**
      * @brief Optional. Message is an animation, information about the animation.
-     *
      * For backward compatibility, when this field is set, the document field will also be set
      */
     Animation::Ptr animation;
@@ -204,13 +202,6 @@ public:
     Dice::Ptr dice;
 
     /**
-     * @brief Deprecated since Bot API 3.0. The field is replaced with newChatMembers.
-     *
-     * Optional. A new member was added to the group, information about them (this member may be the bot itself)
-     */
-    User::Ptr newChatMember;
-
-    /**
      * @brief Optional. New members that were added to the group or supergroup and information about them (the bot itself may be one of these members)
      */
     std::vector<User::Ptr> newChatMembers;
@@ -233,41 +224,42 @@ public:
     /**
      * @brief Optional. Service message: the chat photo was deleted
      */
-    bool deleteChatPhoto = false;
+    bool deleteChatPhoto;
 
     /**
      * @brief Optional. Service message: the group has been created
      */
-    bool groupChatCreated = false;
+    bool groupChatCreated;
 
     /**
      * @brief Optional. Service message: the supergroup has been created
      */
-    bool supergroupChatCreated = false;
+    bool supergroupChatCreated;
 
     /**
      * @brief Optional. Service message: the channel has been created
      */
-    bool channelChatCreated = false;
+    bool channelChatCreated;
 
     /**
      * @brief Optional. The group has been migrated to a supergroup with the specified identifier.
      *
-     * This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
+     * This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it.
+     * But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
      */
-    std::int64_t migrateToChatId = 0;
+    std::int64_t migrateToChatId;
 
     /**
      * @brief Optional. The supergroup has been migrated from a group with the specified identifier.
      *
-     * This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
+     * This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it.
+     * But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
      */
-    std::int64_t migrateFromChatId = 0;
+    std::int64_t migrateFromChatId;
 
     /**
      * @brief Optional. Specified message was pinned.
-     *
-     * Note that the Message object in this field will not contain further reply_to_message fields even if it is itself a reply.
+     * Note that the Message object in this field will not contain further @ref Message::replyToMessage fields even if it is itself a reply.
      */
     Message::Ptr pinnedMessage;
 
@@ -292,7 +284,8 @@ public:
     // TODO PassportData::Ptr passportData;
 
     /**
-     * @brief Optional. Inline keyboard attached to the message. login_url buttons are represented as ordinary url buttons.
+     * @brief Optional. Inline keyboard attached to the message.
+     * @ref InlineKeyboardButton::loginUrl buttons are represented as ordinary @ref InlineKeyboardButton::url buttons.
      */
     InlineKeyboardMarkup::Ptr replyMarkup;
 
@@ -301,7 +294,7 @@ public:
      *
      * Note: Added with Bot API 5.5
      */
-    bool automaticForward = false;
+    bool automaticForward;
 };
 }
 
diff --git a/include/tgbot/types/MessageEntity.h b/include/tgbot/types/MessageEntity.h
index 21d9b99..6cf42f5 100644
--- a/include/tgbot/types/MessageEntity.h
+++ b/include/tgbot/types/MessageEntity.h
@@ -20,7 +20,6 @@ public:
 
     /**
      * @brief Type of the entity.
-     *
      * Can be “mention” (@username), “hashtag” (#hashtag), “cashtag” ($USD), “bot_command” (/start@jobs_bot), “url” (https://telegram.org), “email” (do-not-reply@telegram.org), “phone_number” (+1-212-555-0123), “bold” (bold text), “italic” (italic text), “underline” (underlined text), “strikethrough” (strikethrough text), “code” (monowidth string), “pre” (monowidth block), “text_link” (for clickable text URLs), “text_mention” (for users without usernames)
      */
     std::string type;
diff --git a/include/tgbot/types/PhotoSize.h b/include/tgbot/types/PhotoSize.h
index a0cb5c5..97fdd84 100644
--- a/include/tgbot/types/PhotoSize.h
+++ b/include/tgbot/types/PhotoSize.h
@@ -8,7 +8,7 @@
 namespace TgBot {
 
 /**
- * @brief This object represents one size of a photo or a file / sticker thumbnail.
+ * @brief This object represents one size of a photo or a @ref File / @ref Sticker thumbnail.
  *
  * @ingroup types
  */
@@ -24,7 +24,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/Poll.h b/include/tgbot/types/Poll.h
index 9c81dc7..e1f9d2c 100644
--- a/include/tgbot/types/Poll.h
+++ b/include/tgbot/types/Poll.h
@@ -23,7 +23,7 @@ public:
     /**
      * @brief Unique poll identifier
      */
-    std::int64_t id;
+    std::string id;
 
     /**
      * @brief Poll question, 1-255 characters
@@ -62,7 +62,6 @@ public:
 
     /**
      * @brief Optional. 0-based identifier of the correct answer option.
-     *
      * Available only for polls in the quiz mode, which are closed, or was sent (not forwarded) by the bot or to the private chat with the bot.
      */
     std::int32_t correctOptionId;
diff --git a/include/tgbot/types/PollAnswer.h b/include/tgbot/types/PollAnswer.h
index 730248b..4476d63 100644
--- a/include/tgbot/types/PollAnswer.h
+++ b/include/tgbot/types/PollAnswer.h
@@ -30,7 +30,8 @@ public:
     User::Ptr user;
 
     /**
-     * @brief 0-based identifiers of answer options, chosen by the user. May be empty if the user retracted their vote.
+     * @brief 0-based identifiers of answer options, chosen by the user.
+     * May be empty if the user retracted their vote.
      */
     std::vector<std::int32_t> optionIds;
 };
diff --git a/include/tgbot/types/Sticker.h b/include/tgbot/types/Sticker.h
index 4986597..540e157 100644
--- a/include/tgbot/types/Sticker.h
+++ b/include/tgbot/types/Sticker.h
@@ -27,7 +27,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
@@ -45,7 +44,7 @@ public:
     /**
      * @brief True, if the sticker is animated
      */
-    bool isAnimated = false;
+    bool isAnimated;
 
     /**
      * @brief Optional. Sticker thumbnail in the .webp or .jpg format
diff --git a/include/tgbot/types/StickerSet.h b/include/tgbot/types/StickerSet.h
index 4b11cf3..4009096 100644
--- a/include/tgbot/types/StickerSet.h
+++ b/include/tgbot/types/StickerSet.h
@@ -32,12 +32,12 @@ public:
     /**
      * @brief True, if the sticker set contains animated stickers
      */
-    bool isAnimated = false;
+    bool isAnimated;
 
     /**
      * @brief True, if the sticker set contains masks
      */
-    bool containsMasks = false;
+    bool containsMasks;
 
     /**
      * @brief List of all set stickers
diff --git a/include/tgbot/types/Update.h b/include/tgbot/types/Update.h
index a80bd4e..f5b0237 100644
--- a/include/tgbot/types/Update.h
+++ b/include/tgbot/types/Update.h
@@ -16,7 +16,8 @@
 namespace TgBot {
 
 /**
- * @brief This object represents an incoming update. At most one of the optional parameters can be present in any given update.
+ * @brief This object represents an incoming update.
+ * At most one of the optional parameters can be present in any given update.
  *
  * @ingroup types
  */
@@ -26,7 +27,10 @@ public:
     typedef std::shared_ptr<Update> Ptr;
 
     /**
-     * @brief The update‘s unique identifier. Update identifiers start from a certain positive number and increase sequentially. This ID becomes especially handy if you’re using Webhooks, since it allows you to ignore repeated updates or to restore the correct update sequence, should they get out of order.
+     * @brief The update‘s unique identifier.
+     * Update identifiers start from a certain positive number and increase sequentially.
+     * This ID becomes especially handy if you’re using Webhooks, since it allows you to ignore repeated updates or to restore the correct update sequence, should they get out of order.
+     * If there are no new updates for at least a week, then identifier of the next update will be chosen randomly instead of sequentially.
      */
     std::int32_t updateId;
 
@@ -57,38 +61,35 @@ public:
 
     /**
      * @brief Optional. The result of an inline query that was chosen by a user and sent to their chat partner.
+     * Please see the documentation on the feedback collecting for details on how to enable these updates for your bot. (https://core.telegram.org/bots/inline#collecting-feedback)
      */
     ChosenInlineResult::Ptr chosenInlineResult;
 
     /**
-     * @brief Optional. New incoming callback query.
+     * @brief Optional. New incoming callback query
      */
     CallbackQuery::Ptr callbackQuery;
 
     /**
      * @brief Optional. New incoming shipping query.
-     *
      * Only for invoices with flexible price
      */
     ShippingQuery::Ptr shippingQuery;
 
     /**
      * @brief Optional. New incoming pre-checkout query.
-     *
      * Contains full information about checkout
      */
     PreCheckoutQuery::Ptr preCheckoutQuery;
 
     /**
      * @brief Optional. New poll state.
-     *
      * Bots receive only updates about stopped polls and polls, which are sent by the bot
      */
     Poll::Ptr poll;
 
     /**
      * @brief Optional. A user changed their answer in a non-anonymous poll.
-     *
      * Bots receive new votes only in polls that were sent by the bot itself.
      */
     PollAnswer::Ptr pollAnswer;
diff --git a/include/tgbot/types/User.h b/include/tgbot/types/User.h
index 7c7ceaf..629ee6c 100644
--- a/include/tgbot/types/User.h
+++ b/include/tgbot/types/User.h
@@ -25,7 +25,7 @@ public:
     /**
      * @brief True, if this user is a bot
      */
-    bool isBot = false;
+    bool isBot;
 
     /**
      * @brief User‘s or bot’s first name
@@ -48,21 +48,23 @@ public:
     std::string languageCode;
 
     /**
-     * @brief Optional. True, if the bot can be invited to groups. Returned only in getMe.
+     * @brief Optional. True, if the bot can be invited to groups.
+     * Returned only in @ref Api::getMe.
      */
     bool canJoinGroups;
 
     /**
-     * @brief Optional. True, if privacy mode is disabled for the bot. Returned only in getMe.
+     * @brief Optional. True, if privacy mode is disabled for the bot.
+     * Returned only in @ref Api::getMe.
      */
     bool canReadAllGroupMessages;
 
     /**
-     * @brief Optional. True, if the bot supports inline queries. Returned only in getMe.
+     * @brief Optional. True, if the bot supports inline queries.
+     * Returned only in @ref Api::getMe.
      */
     bool supportsInlineQueries;
 };
-
 }
 
 #endif //TGBOT_CPP_USER_H
diff --git a/include/tgbot/types/Venue.h b/include/tgbot/types/Venue.h
index 589b5cf..accce16 100644
--- a/include/tgbot/types/Venue.h
+++ b/include/tgbot/types/Venue.h
@@ -38,7 +38,8 @@ public:
     std::string foursquareId;
 
     /**
-     * @brief Optional. Foursquare type of the venue. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
+     * @brief Optional. Foursquare type of the venue.
+     * (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
      */
     std::string foursquareType;
 };
diff --git a/include/tgbot/types/Video.h b/include/tgbot/types/Video.h
index f305891..fac8de5 100644
--- a/include/tgbot/types/Video.h
+++ b/include/tgbot/types/Video.h
@@ -26,7 +26,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/VideoNote.h b/include/tgbot/types/VideoNote.h
index 64684a3..755e3d0 100644
--- a/include/tgbot/types/VideoNote.h
+++ b/include/tgbot/types/VideoNote.h
@@ -10,7 +10,7 @@
 namespace TgBot {
 
 /**
- * @brief This object represents a video message (available in Telegram apps as of v.4.0).
+ * @brief This object represents a video message.
  *
  * @ingroup types
  */
@@ -26,7 +26,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/include/tgbot/types/Voice.h b/include/tgbot/types/Voice.h
index 34ab016..c337b0a 100644
--- a/include/tgbot/types/Voice.h
+++ b/include/tgbot/types/Voice.h
@@ -23,7 +23,6 @@ public:
 
     /**
      * @brief Unique identifier for this file, which is supposed to be the same over time and for different bots.
-     *
      * Can't be used to download or reuse the file.
      */
     std::string fileUniqueId;
diff --git a/src/Api.cpp b/src/Api.cpp
index 22115c2..38ad8e3 100644
--- a/src/Api.cpp
+++ b/src/Api.cpp
@@ -23,34 +23,17 @@ User::Ptr Api::getMe() const {
     return _tgTypeParser.parseJsonAndGetUser(sendRequest("getMe"));
 }
 
-Message::Ptr Api::sendMessage(std::int64_t chatId, const string& text, bool disableWebPagePreview, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const {
+Message::Ptr Api::sendMessage(boost::variant<std::int64_t, const std::string&> chatId, const std::string& text, const std::string& parseMode,
+                              bool disableWebPagePreview, bool disableNotification, std::int32_t replyToMessageId,
+                              GenericReply::Ptr replyMarkup) const {
     vector<HttpReqArg> args;
     args.reserve(7);
+
     args.emplace_back("chat_id", chatId);
     args.emplace_back("text", text);
-    if (disableWebPagePreview) {
-        args.emplace_back("disable_web_page_preview", disableWebPagePreview);
-    }
-    if (disableNotification){
-        args.emplace_back("disable_notification", disableNotification);
-    }
-    if (replyToMessageId) {
-        args.emplace_back("reply_to_message_id", replyToMessageId);
-    }
-    if (replyMarkup) {
-        args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup));
-    }
     if (!parseMode.empty()) {
         args.emplace_back("parse_mode", parseMode);
     }
-    return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendMessage", args));
-}
-
-Message::Ptr Api::sendMessage(const std::string &chatId, const string& text, bool disableWebPagePreview, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const {
-    vector<HttpReqArg> args;
-    args.reserve(7);
-    args.emplace_back("chat_id", chatId);
-    args.emplace_back("text", text);
     if (disableWebPagePreview) {
         args.emplace_back("disable_web_page_preview", disableWebPagePreview);
     }
@@ -63,12 +46,24 @@ Message::Ptr Api::sendMessage(const std::string &chatId, const string& text, boo
     if (replyMarkup) {
         args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup));
     }
-    if (!parseMode.empty()) {
-        args.emplace_back("parse_mode", parseMode);
-    }
+
     return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendMessage", args));
 }
 
+Message::Ptr Api::sendMessage(const std::string& chatId, const std::string& text, bool disableWebPagePreview,
+                         std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup, const std::string& parseMode,
+                         bool disableNotification) const {
+
+    return sendMessage(chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup);
+}
+
+Message::Ptr Api::sendMessage(std::int64_t chatId, const std::string& text, bool disableWebPagePreview,
+                              std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup, const std::string& parseMode,
+                              bool disableNotification) const {
+
+    return sendMessage(chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup);
+}
+
 Message::Ptr Api::forwardMessage(std::int64_t chatId, std::int64_t fromChatId, std::int32_t messageId, bool disableNotification) const {
     vector<HttpReqArg> args;
     args.reserve(4);
@@ -320,16 +315,16 @@ File::Ptr Api::uploadStickerFile(std::int64_t userId, const InputFile::Ptr pngSt
     return _tgTypeParser.parseJsonAndGetFile(sendRequest("uploadStickerFile", args));
 }
 
-bool Api::createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title, const std::string& emojis,
-                              boost::variant<InputFile::Ptr, std::string> pngSticker, boost::variant<InputFile::Ptr, std::string> tgsSticker,
+bool Api::createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title,
+                              const std::string& emojis, boost::variant<InputFile::Ptr, std::string> pngSticker, boost::variant<InputFile::Ptr, std::string> tgsSticker,
                               bool containsMasks, MaskPosition::Ptr maskPosition) const {
     vector<HttpReqArg> args;
     args.reserve(8);
+
     args.emplace_back("user_id", userId);
     args.emplace_back("name", name);
     args.emplace_back("title", title);
     args.emplace_back("emojis", emojis);
-
     if (pngSticker.which() == 0 /* InputFile::Ptr */) {
         auto file = boost::get<InputFile::Ptr>(pngSticker);
         args.emplace_back("png_sticker", file->data, true, file->mimeType, file->fileName);
@@ -348,18 +343,25 @@ bool Api::createNewStickerSet(std::int64_t userId, const std::string& name, cons
     if (maskPosition != nullptr) {
         args.emplace_back("mask_position", _tgTypeParser.parseMaskPosition(maskPosition));
     }
+
     return sendRequest("createNewStickerSet", args).get<bool>("", false);
 }
 
+bool Api::createNewStickerSet(std::int64_t userId, const std::string& name, const std::string& title,
+                         boost::variant<InputFile::Ptr, std::string> pngSticker, const std::string& emojis, bool containsMasks,
+                         MaskPosition::Ptr maskPosition) const {
+
+    return createNewStickerSet(userId, name, title, emojis, pngSticker, "", containsMasks, maskPosition);
+}
+
 bool Api::addStickerToSet(std::int64_t userId, const std::string& name, const std::string& emojis,
-                          boost::variant<InputFile::Ptr, std::string> pngSticker, boost::variant<InputFile::Ptr, std::string> tgsSticker,
-                          MaskPosition::Ptr maskPosition) const {
+                          boost::variant<InputFile::Ptr, std::string> pngSticker, boost::variant<InputFile::Ptr, std::string> tgsSticker, MaskPosition::Ptr maskPosition) const {
     vector<HttpReqArg> args;
     args.reserve(6);
+
     args.emplace_back("user_id", userId);
     args.emplace_back("name", name);
     args.emplace_back("emojis", emojis);
-
     if (pngSticker.which() == 0 /* InputFile::Ptr */) {
         auto file = boost::get<InputFile::Ptr>(pngSticker);
         args.emplace_back("png_sticker", file->data, true, file->mimeType, file->fileName);
@@ -375,9 +377,16 @@ bool Api::addStickerToSet(std::int64_t userId, const std::string& name, const st
     if (maskPosition != nullptr) {
         args.emplace_back("mask_position", _tgTypeParser.parseMaskPosition(maskPosition));
     }
+
     return sendRequest("addStickerToSet", args).get<bool>("", false);
 }
 
+bool Api::addStickerToSet(std::int64_t userId, const std::string& name, boost::variant<InputFile::Ptr, std::string> pngSticker,
+                          const std::string& emojis, MaskPosition::Ptr maskPosition) const {
+
+    return addStickerToSet(userId, name, emojis, pngSticker, "", maskPosition);
+}
+
 bool Api::setStickerPositionInSet(const string& sticker, std::uint32_t position) const {
     vector<HttpReqArg> args;
     args.reserve(2);
@@ -396,6 +405,7 @@ bool Api::deleteStickerFromSet(const string& sticker) const {
 bool Api::setStickerSetThumb(const std::string& name, std::int64_t userId, boost::variant<InputFile::Ptr, std::string> thumb) const {
     vector<HttpReqArg> args;
     args.reserve(3);
+
     args.emplace_back("name", name);
     args.emplace_back("user_id", userId);
     if (thumb.which() == 0 /* InputFile::Ptr */) {
@@ -404,6 +414,7 @@ bool Api::setStickerSetThumb(const std::string& name, std::int64_t userId, boost
     } else /* std::string */ {
         args.emplace_back("thumb", boost::get<std::string>(thumb));
     }
+
     return sendRequest("setStickerSetThumb", args).get<bool>("", false);
 }
 
@@ -1067,9 +1078,11 @@ bool Api::promoteChatMember(std::int64_t chatId, std::int64_t userId, bool canCh
 bool Api::setChatAdministratorCustomTitle(std::int64_t chatId, std::int64_t userId, const std::string& customTitle) const {
     vector<HttpReqArg> args;
     args.reserve(3);
+
     args.emplace_back("chat_id", chatId);
     args.emplace_back("user_id", userId);
     args.emplace_back("custom_title", customTitle);
+
     return sendRequest("setChatAdministratorCustomTitle", args).get<bool>("", false);
 }
 
@@ -1187,17 +1200,18 @@ void Api::deleteMessage(std::int64_t chatId, std::int32_t messageId) const {
     sendRequest("deleteMessage", { HttpReqArg("chat_id", chatId), HttpReqArg("message_id", messageId) });
 }
 
-Message::Ptr Api::sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options, bool disableNotification, std::int32_t replyToMessageId, 
-                           const GenericReply::Ptr replyMarkup, bool isAnonymous, const std::string& type, bool allowsMultipleAnswers,
-                           std::int32_t correctOptionId, bool isClosed) const {
+Message::Ptr Api::sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options,
+                           bool isAnonymous, const std::string& type, bool allowsMultipleAnswers,
+                           std::int32_t correctOptionId, bool isClosed, bool disableNotification,
+                           std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup) const {
     vector<HttpReqArg> args;
     args.reserve(11);
+
     args.emplace_back("chat_id", chatId);
     args.emplace_back("question", question);
     args.emplace_back("options", _tgTypeParser.parseArray<std::string>([] (const std::string& option) -> std::string {
         return StringTools::urlEncode(option);
     }, options));
-
     if (!isAnonymous) {
         args.emplace_back("is_anonymous", isAnonymous);
     }
@@ -1226,11 +1240,18 @@ Message::Ptr Api::sendPoll(std::int64_t chatId, const std::string& question, con
     return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendPoll", args));
 }
 
-Message::Ptr Api::sendDice(std::int64_t chatId, bool disableNotification, std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup) const {
+Message::Ptr Api::sendPoll(std::int64_t chatId, const std::string& question, const std::vector<std::string>& options,
+                      bool disableNotification, std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup) const {
+
+    return sendPoll(chatId, question, options, true, "", false, 0, false, disableNotification, replyToMessageId, replyMarkup);
+}
+
+Message::Ptr Api::sendDice(std::int64_t chatId, bool disableNotification, std::int32_t replyToMessageId,
+                           GenericReply::Ptr replyMarkup) const {
     vector<HttpReqArg> args;
     args.reserve(4);
-    args.emplace_back("chat_id", chatId);
 
+    args.emplace_back("chat_id", chatId);
     if (disableNotification) {
         args.emplace_back("disable_notification", disableNotification);
     }
diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp
index 37dafb6..41cf642 100644
--- a/src/TgTypeParser.cpp
+++ b/src/TgTypeParser.cpp
@@ -10,8 +10,8 @@ namespace TgBot {
 
 Chat::Ptr TgTypeParser::parseJsonAndGetChat(const ptree& data) const {
     auto result(make_shared<Chat>());
-    result->id = data.get<int64_t>("id");
-    string type = data.get<string>("type");
+    result->id = data.get<int64_t>("id", 0);
+    string type = data.get<string>("type", "");
     if (type == "private") {
         result->type = Chat::Type::Private;
     } else if (type == "group") {
@@ -21,20 +21,18 @@ Chat::Ptr TgTypeParser::parseJsonAndGetChat(const ptree& data) const {
     } else if (type == "channel") {
         result->type = Chat::Type::Channel;
     }
-    result->title = data.get("title", "");
-    result->username = data.get("username", "");
-    result->firstName = data.get("first_name", "");
-    result->lastName = data.get("last_name", "");
-    result->allMembersAreAdministrators = data.get<bool>("all_members_are_administrators", false);
+    result->title = data.get<string>("title", "");
+    result->username = data.get<string>("username", "");
+    result->firstName = data.get<string>("first_name", "");
+    result->lastName = data.get<string>("last_name", "");
     result->photo = tryParseJson<ChatPhoto>(&TgTypeParser::parseJsonAndGetChatPhoto, data, "photo");
-    result->description = data.get("description", "");
-    result->inviteLink = data.get("invite_link", "");
+    result->description = data.get<string>("description", "");
+    result->inviteLink = data.get<string>("invite_link", "");
     result->pinnedMessage = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "pinned_message");
     result->permissions = tryParseJson<ChatPermissions>(&TgTypeParser::parseJsonAndGetChatPermissions, data, "permissions");
-    result->slowModeDelay = data.get<int32_t>("slow_mode_delay");
-    result->stickerSetName = data.get("sticker_set_name", "");
+    result->slowModeDelay = data.get<int32_t>("slow_mode_delay", 0);
+    result->stickerSetName = data.get<string>("sticker_set_name", "");
     result->canSetStickerSet = data.get<bool>("can_set_sticker_set", false);
-
     return result;
 }
 
@@ -58,7 +56,6 @@ string TgTypeParser::parseChat(const Chat::Ptr& object) const {
     appendToJson(result, "username", object->username);
     appendToJson(result, "first_name", object->firstName);
     appendToJson(result, "last_name", object->lastName);
-    appendToJson(result, "all_members_are_administrators", object->allMembersAreAdministrators);
     appendToJson(result, "photo", parseChatPhoto(object->photo));
     appendToJson(result, "description", object->description);
     appendToJson(result, "invite_link", object->inviteLink);
@@ -74,12 +71,12 @@ string TgTypeParser::parseChat(const Chat::Ptr& object) const {
 
 User::Ptr TgTypeParser::parseJsonAndGetUser(const ptree& data) const {
     auto result(make_shared<User>());
-    result->id = data.get<int64_t>("id");
+    result->id = data.get<int64_t>("id", 0);
     result->isBot = data.get<bool>("is_bot", false);
-    result->firstName = data.get<string>("first_name");
-    result->lastName = data.get("last_name", "");
-    result->username = data.get("username", "");
-    result->languageCode = data.get("language_code", "");
+    result->firstName = data.get<string>("first_name", "");
+    result->lastName = data.get<string>("last_name", "");
+    result->username = data.get<string>("username", "");
+    result->languageCode = data.get<string>("language_code", "");
     result->canJoinGroups = data.get<bool>("can_join_groups", false);
     result->canReadAllGroupMessages = data.get<bool>("can_read_all_group_messages", false);
     result->supportsInlineQueries = data.get<bool>("supports_inline_queries", false);
@@ -108,9 +105,9 @@ string TgTypeParser::parseUser(const User::Ptr& object) const {
 
 MessageEntity::Ptr TgTypeParser::parseJsonAndGetMessageEntity(const ptree& data) const{
     auto result(make_shared<MessageEntity>());
-    result->type = data.get<string>("type");
-    result->offset = data.get<int32_t>("offset");
-    result->length = data.get<int32_t>("length");
+    result->type = data.get<string>("type", "");
+    result->offset = data.get<int32_t>("offset", 0);
+    result->length = data.get<int32_t>("length", 0);
     result->url = data.get<string>("url", "");
     result->user = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "user");
     result->language = data.get<string>("language", "");
@@ -136,21 +133,21 @@ string TgTypeParser::parseMessageEntity(const MessageEntity::Ptr& object) const
 
 Message::Ptr TgTypeParser::parseJsonAndGetMessage(const ptree& data) const {
     auto result(make_shared<Message>());
-    result->messageId = data.get<int32_t>("message_id");
+    result->messageId = data.get<int32_t>("message_id", 0);
     result->from = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "from");
-    result->date = data.get<int32_t>("date");
+    result->date = data.get<int32_t>("date", 0);
     result->chat = parseJsonAndGetChat(data.find("chat")->second);
     result->forwardFrom = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "forward_from");
     result->forwardFromChat = tryParseJson<Chat>(&TgTypeParser::parseJsonAndGetChat, data, "forward_from_chat");
     result->forwardFromMessageId = data.get<int32_t>("forward_from_message_id", 0);
-    result->forwardSignature = data.get("forward_signature", "");
-    result->forwardSenderName = data.get("forward_sender_name", "");
-    result->forwardDate = data.get("forward_date", 0);
+    result->forwardSignature = data.get<string>("forward_signature", "");
+    result->forwardSenderName = data.get<string>("forward_sender_name", "");
+    result->forwardDate = data.get<int32_t>("forward_date", 0);
     result->replyToMessage = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "reply_to_message");
     result->editDate = data.get<int32_t>("edit_date", 0);
-    result->mediaGroupId = data.get("media_group_id", "");
-    result->authorSignature = data.get("author_signature", "");
-    result->text = data.get("text", "");
+    result->mediaGroupId = data.get<string>("media_group_id", "");
+    result->authorSignature = data.get<string>("author_signature", "");
+    result->text = data.get<string>("text", "");
     result->entities = parseJsonAndGetArray<MessageEntity>(&TgTypeParser::parseJsonAndGetMessageEntity, data, "entities");
     result->captionEntities = parseJsonAndGetArray<MessageEntity>(&TgTypeParser::parseJsonAndGetMessageEntity, data, "caption_entities");
     result->audio = tryParseJson<Audio>(&TgTypeParser::parseJsonAndGetAudio, data, "audio");
@@ -162,31 +159,29 @@ Message::Ptr TgTypeParser::parseJsonAndGetMessage(const ptree& data) const {
     result->video = tryParseJson<Video>(&TgTypeParser::parseJsonAndGetVideo, data, "video");
     result->voice = tryParseJson<Voice>(&TgTypeParser::parseJsonAndGetVoice, data, "voice");
     result->videoNote = tryParseJson<VideoNote>(&TgTypeParser::parseJsonAndGetVideoNote, data, "video_note");
-    result->caption = data.get("caption", "");
+    result->caption = data.get<string>("caption", "");
     result->contact = tryParseJson<Contact>(&TgTypeParser::parseJsonAndGetContact, data, "contact");
     result->location = tryParseJson<Location>(&TgTypeParser::parseJsonAndGetLocation, data, "location");
     result->venue = tryParseJson<Venue>(&TgTypeParser::parseJsonAndGetVenue, data, "venue");
     result->poll = tryParseJson<Poll>(&TgTypeParser::parseJsonAndGetPoll, data, "poll");
     result->dice = tryParseJson<Dice>(&TgTypeParser::parseJsonAndGetDice, data, "dice");
-    result->newChatMember = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "new_chat_member");
     result->newChatMembers = parseJsonAndGetArray<User>(&TgTypeParser::parseJsonAndGetUser, data, "new_chat_members");
     result->leftChatMember = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "left_chat_member");
-    result->newChatTitle = data.get("new_chat_title", "");
+    result->newChatTitle = data.get<string>("new_chat_title", "");
     result->newChatPhoto = parseJsonAndGetArray<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "new_chat_photo");
-    result->deleteChatPhoto = data.get("delete_chat_photo", false);
-    result->groupChatCreated = data.get("group_chat_created", false);
-    result->supergroupChatCreated = data.get("supergroup_chat_created", false);
-    result->channelChatCreated = data.get("channel_chat_created", false);
+    result->deleteChatPhoto = data.get<bool>("delete_chat_photo", false);
+    result->groupChatCreated = data.get<bool>("group_chat_created", false);
+    result->supergroupChatCreated = data.get<bool>("supergroup_chat_created", false);
+    result->channelChatCreated = data.get<bool>("channel_chat_created", false);
     result->migrateToChatId = data.get<int64_t>("migrate_to_chat_id", 0);
     result->migrateFromChatId = data.get<int64_t>("migrate_from_chat_id", 0);
     result->pinnedMessage = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "pinned_message");
     result->invoice = tryParseJson<Invoice>(&TgTypeParser::parseJsonAndGetInvoice, data, "invoice");
     result->successfulPayment = tryParseJson<SuccessfulPayment>(&TgTypeParser::parseJsonAndGetSuccessfulPayment, data, "successful_payment");
-    result->connectedWebsite = data.get("connected_website", "");
+    result->connectedWebsite = data.get<string>("connected_website", "");
     // result->passportData = tryParseJson<PassportData>(&TgTypeParser::parseJsonAndGetPassportData, data, "passport_data");
     result->replyMarkup = tryParseJson<InlineKeyboardMarkup>(&TgTypeParser::parseJsonAndGetInlineKeyboardMarkup, data, "reply_markup");
-    result->automaticForward = data.get("is_automatic_forward", false);
-    
+    result->automaticForward = data.get<bool>("is_automatic_forward", false);
     return result;
 }
 
@@ -228,7 +223,6 @@ string TgTypeParser::parseMessage(const Message::Ptr& object) const {
     appendToJson(result, "venue", parseVenue(object->venue));
     appendToJson(result, "poll", parsePoll(object->poll));
     appendToJson(result, "dice", parseDice(object->dice));
-    appendToJson(result, "new_chat_member", parseUser(object->newChatMember));
     appendToJson(result, "new_chat_members", parseArray(&TgTypeParser::parseUser, object->newChatMembers));
     appendToJson(result, "left_chat_member", parseUser(object->leftChatMember));
     appendToJson(result, "new_chat_title", object->newChatTitle);
@@ -245,6 +239,7 @@ string TgTypeParser::parseMessage(const Message::Ptr& object) const {
     appendToJson(result, "connected_website", object->connectedWebsite);
     // appendToJson(result, "passport_data", parsePassportData(object->passportData));
     appendToJson(result, "reply_markup", parseInlineKeyboardMarkup(object->replyMarkup));
+    appendToJson(result, "is_automatic_forward", object->automaticForward);
     removeLastComma(result);
     result += '}';
     return result;
@@ -252,11 +247,11 @@ string TgTypeParser::parseMessage(const Message::Ptr& object) const {
 
 PhotoSize::Ptr TgTypeParser::parseJsonAndGetPhotoSize(const ptree& data) const {
     auto result(make_shared<PhotoSize>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->width = data.get<int32_t>("width");
-    result->height = data.get<int32_t>("height");
-    result->fileSize = data.get("file_size", 0);
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->width = data.get<int32_t>("width", 0);
+    result->height = data.get<int32_t>("height", 0);
+    result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
 
@@ -278,13 +273,13 @@ string TgTypeParser::parsePhotoSize(const PhotoSize::Ptr& object) const {
 
 Audio::Ptr TgTypeParser::parseJsonAndGetAudio(const ptree& data) const {
     auto result(make_shared<Audio>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->duration = data.get<int32_t>("duration");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->duration = data.get<int32_t>("duration", 0);
     result->performer = data.get<string>("performer", "");
     result->title = data.get<string>("title", "");
-    result->mimeType = data.get("mime_type", "");
-    result->fileSize = data.get("file_size", 0);
+    result->mimeType = data.get<string>("mime_type", "");
+    result->fileSize = data.get<int32_t>("file_size", 0);
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
     return result;
 }
@@ -310,12 +305,12 @@ string TgTypeParser::parseAudio(const Audio::Ptr& object) const {
 
 Document::Ptr TgTypeParser::parseJsonAndGetDocument(const ptree& data) const {
     auto result(make_shared<Document>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
-    result->fileName = data.get("file_name", "");
-    result->mimeType = data.get("mime_type", "");
-    result->fileSize = data.get("file_size", 0);
+    result->fileName = data.get<string>("file_name", "");
+    result->mimeType = data.get<string>("mime_type", "");
+    result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
 
@@ -338,16 +333,16 @@ string TgTypeParser::parseDocument(const Document::Ptr& object) const {
 
 Sticker::Ptr TgTypeParser::parseJsonAndGetSticker(const ptree& data) const {
     auto result(make_shared<Sticker>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->width = data.get<int32_t>("width");
-    result->height = data.get<int32_t>("height");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->width = data.get<int32_t>("width", 0);
+    result->height = data.get<int32_t>("height", 0);
     result->isAnimated = data.get<bool>("is_animated", false);
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
-    result->emoji = data.get("emoji", "");
-    result->setName = data.get("set_name", "");
+    result->emoji = data.get<string>("emoji", "");
+    result->setName = data.get<string>("set_name", "");
     result->maskPosition = tryParseJson<MaskPosition>(&TgTypeParser::parseJsonAndGetMaskPosition, data, "mask_position");
-    result->fileSize = data.get("file_size", 0);
+    result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
 
@@ -374,8 +369,8 @@ string TgTypeParser::parseSticker(const Sticker::Ptr& object) const {
 
 StickerSet::Ptr TgTypeParser::parseJsonAndGetStickerSet(const ptree& data) const {
     auto result(make_shared<StickerSet>());
-    result->name = data.get("name", "");
-    result->title = data.get("title", "");
+    result->name = data.get<string>("name", "");
+    result->title = data.get<string>("title", "");
     result->isAnimated = data.get<bool>("is_animated", false);
     result->containsMasks = data.get<bool>("contains_masks", false);
     result->stickers = parseJsonAndGetArray<Sticker>(&TgTypeParser::parseJsonAndGetSticker, data, "stickers");
@@ -426,15 +421,15 @@ string TgTypeParser::parseMaskPosition(const MaskPosition::Ptr& object) const {
 
 Poll::Ptr TgTypeParser::parseJsonAndGetPoll(const ptree& data) const {
     auto result(make_shared<Poll>());
-    result->id = data.get("id", 0);
-    result->question = data.get("question", "");
+    result->id = data.get<string>("id", "");
+    result->question = data.get<string>("question", "");
     result->options = parseJsonAndGetArray<PollOption>(&TgTypeParser::parseJsonAndGetPollOption, data, "options");
-    result->totalVoterCount = data.get("total_voter_count", 0);
-    result->isClosed = data.get<bool>("is_closed");
-    result->isAnonymous = data.get<bool>("is_anonymous");
-    result->type = data.get("type", "");
-    result->allowsMultipleAnswers = data.get<bool>("allows_multiple_answers");
-    result->correctOptionId = data.get("correct_option_id", 0);
+    result->totalVoterCount = data.get<int32_t>("total_voter_count", 0);
+    result->isClosed = data.get<bool>("is_closed", false);
+    result->isAnonymous = data.get<bool>("is_anonymous", true);
+    result->type = data.get<string>("type", "");
+    result->allowsMultipleAnswers = data.get<bool>("allows_multiple_answers", false);
+    result->correctOptionId = data.get<int32_t>("correct_option_id", 0);
     return result;
 }
 
@@ -460,7 +455,7 @@ string TgTypeParser::parsePoll(const Poll::Ptr& object) const {
 
 Dice::Ptr TgTypeParser::parseJsonAndGetDice(const ptree& data) const {
     auto result(make_shared<Dice>());
-    result->value = data.get("value", 0);
+    result->value = data.get<int8_t>("value", 0);
     return result;
 }
 
@@ -478,12 +473,11 @@ string TgTypeParser::parseDice(const Dice::Ptr& object) const {
 
 PollAnswer::Ptr TgTypeParser::parseJsonAndGetPollAnswer(const ptree& data) const {
     auto result(make_shared<PollAnswer>());
-    result->pollId = data.get("poll_id", "");
+    result->pollId = data.get<string>("poll_id", "");
     result->user = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "user");
     result->optionIds = parseJsonAndGetArray<std::int32_t>([] (const ptree& innerData)->std::int32_t {
         return innerData.get<std::int32_t>(0);
     }, data, "option_ids");
-
     return result;
 }
 
@@ -557,14 +551,14 @@ string TgTypeParser::parseChatPermissions(const ChatPermissions::Ptr& object) co
 
 Video::Ptr TgTypeParser::parseJsonAndGetVideo(const ptree& data) const {
     auto result(make_shared<Video>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->width = data.get<int32_t>("width");
-    result->height = data.get<int32_t>("height");
-    result->duration = data.get<int32_t>("duration");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->width = data.get<int32_t>("width", 0);
+    result->height = data.get<int32_t>("height", 0);
+    result->duration = data.get<int32_t>("duration", 0);
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
-    result->mimeType = data.get("mime_type", "");
-    result->fileSize = data.get("file_size", 0);
+    result->mimeType = data.get<string>("mime_type", "");
+    result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
 
@@ -589,11 +583,11 @@ string TgTypeParser::parseVideo(const Video::Ptr& object) const {
 
 Voice::Ptr TgTypeParser::parseJsonAndGetVoice(const ptree& data) const {
     auto result(make_shared<Voice>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->duration = data.get<int32_t>("duration");
-    result->mimeType = data.get("mime_type", "");
-    result->fileSize = data.get("file_size", 0);
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->duration = data.get<int32_t>("duration", 0);
+    result->mimeType = data.get<string>("mime_type", "");
+    result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
 
@@ -615,10 +609,10 @@ string TgTypeParser::parseVoice(const Voice::Ptr& object) const {
 
 VideoNote::Ptr TgTypeParser::parseJsonAndGetVideoNote(const ptree& data) const {
     auto result(make_shared<VideoNote>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
-    result->length = data.get<int32_t>("length");
-    result->duration = data.get<int32_t>("duration");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
+    result->length = data.get<int32_t>("length", 0);
+    result->duration = data.get<int32_t>("duration", 0);
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
     result->fileSize = data.get("file_size", 0);
     return result;
@@ -636,8 +630,8 @@ string TgTypeParser::parseVideoNote(const VideoNote::Ptr& object) const {
     appendToJson(result, "duration", object->duration);
     appendToJson(result, "thumb", parsePhotoSize(object->thumb));
     appendToJson(result, "file_size", object->fileSize);
+    removeLastComma(result);
     result += '}';
-    result.erase();
     return result;
 }
 
@@ -693,14 +687,14 @@ string TgTypeParser::parseGameHighScore(const GameHighScore::Ptr& object) const
 
 Animation::Ptr TgTypeParser::parseJsonAndGetAnimation(const ptree& data) const {
     auto result(make_shared<Animation>());
-    result->fileId = data.get("file_id", "");
-    result->fileUniqueId = data.get("file_unique_id", "");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
     result->width = data.get<int32_t>("width", 0);
     result->height = data.get<int32_t>("height", 0);
     result->duration = data.get<int32_t>("duration", 0);
     result->thumb = tryParseJson<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "thumb");
-    result->fileName = data.get("file_name", "");
-    result->mimeType = data.get("mime_type", "");
+    result->fileName = data.get<string>("file_name", "");
+    result->mimeType = data.get<string>("mime_type", "");
     result->fileSize = data.get<int32_t>("file_size", 0);
     return result;
 }
@@ -778,7 +772,6 @@ Venue::Ptr TgTypeParser::parseJsonAndGetVenue(const ptree& data) const {
     result->address = data.get<string>("address", "");
     result->foursquareId = data.get<string>("foursquare_id", "");
     result->foursquareType = data.get<string>("foursquare_type", "");
-
     return result;
 }
 
@@ -800,7 +793,7 @@ string TgTypeParser::parseVenue(const Venue::Ptr& object) const {
 
 Update::Ptr TgTypeParser::parseJsonAndGetUpdate(const ptree& data) const {
     auto result(make_shared<Update>());
-    result->updateId = data.get<int32_t>("update_id");
+    result->updateId = data.get<int32_t>("update_id", 0);
     result->message = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "message");
     result->editedMessage = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "edited_message");
     result->channelPost = tryParseJson<Message>(&TgTypeParser::parseJsonAndGetMessage, data, "channel_post");
@@ -961,10 +954,10 @@ string TgTypeParser::parseInputMedia(const InputMedia::Ptr& object) const {
     return result;
 }
 
-File::Ptr TgTypeParser::parseJsonAndGetFile(const boost::property_tree::ptree& data) const {
+File::Ptr TgTypeParser::parseJsonAndGetFile(const ptree& data) const {
     auto result(make_shared<File>());
-    result->fileId = data.get<string>("file_id");
-    result->fileUniqueId = data.get<string>("file_unique_id");
+    result->fileId = data.get<string>("file_id", "");
+    result->fileUniqueId = data.get<string>("file_unique_id", "");
     result->fileSize = data.get<int32_t>("file_size", 0);
     result->filePath = data.get<string>("file_path", "");
     return result;
@@ -1023,17 +1016,16 @@ std::string TgTypeParser::parseReplyKeyboardMarkup(const ReplyKeyboardMarkup::Pt
     return result;
 }
 
-KeyboardButton::Ptr TgTypeParser::parseJsonAndGetKeyboardButton(const boost::property_tree::ptree& data) const {
+KeyboardButton::Ptr TgTypeParser::parseJsonAndGetKeyboardButton(const ptree& data) const {
     auto result(make_shared<KeyboardButton>());
-    result->text = data.get<string>("text");
+    result->text = data.get<string>("text", "");
     result->requestContact = data.get<bool>("request_contact", false);
     result->requestLocation = data.get<bool>("request_location", false);
     result->requestPoll = tryParseJson<KeyboardButtonPollType>(&TgTypeParser::parseJsonAndGetKeyboardButtonPollType, data, "request_poll");
-
     return result;
 }
 
-std::string TgTypeParser::parseKeyboardButton(const KeyboardButton::Ptr& object) const {
+string TgTypeParser::parseKeyboardButton(const KeyboardButton::Ptr& object) const {
     if (!object) {
         return "";
     }
@@ -1050,7 +1042,7 @@ std::string TgTypeParser::parseKeyboardButton(const KeyboardButton::Ptr& object)
 
 KeyboardButtonPollType::Ptr TgTypeParser::parseJsonAndGetKeyboardButtonPollType(const ptree& data) const {
     auto result(make_shared<KeyboardButtonPollType>());
-    result->type = data.get<string>("type");
+    result->type = data.get<string>("type", "");
     return result;
 }
 
@@ -1104,11 +1096,11 @@ std::string TgTypeParser::parseForceReply(const ForceReply::Ptr& object) const {
     return result;
 }
 
-ChatMember::Ptr TgTypeParser::parseJsonAndGetChatMember(const boost::property_tree::ptree& data) const {
+ChatMember::Ptr TgTypeParser::parseJsonAndGetChatMember(const ptree& data) const {
     auto result(make_shared<ChatMember>());
     result->user = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "user");
-    result->status = data.get("status", "");
-    result->customTitle = data.get("custom_title", "");
+    result->status = data.get<string>("status", "");
+    result->customTitle = data.get<string>("custom_title", "");
     result->untilDate = data.get<uint64_t>("until_date", 0);
     result->canBeEdited = data.get<bool>("can_be_edited", false);
     result->canPostMessages = data.get<bool>("can_post_messages", false);
@@ -1128,7 +1120,7 @@ ChatMember::Ptr TgTypeParser::parseJsonAndGetChatMember(const boost::property_tr
     return result;
 }
 
-std::string TgTypeParser::parseChatMember(const ChatMember::Ptr& object) const {
+string TgTypeParser::parseChatMember(const ChatMember::Ptr& object) const {
     if (!object) {
         return "";
     }
@@ -1158,16 +1150,16 @@ std::string TgTypeParser::parseChatMember(const ChatMember::Ptr& object) const {
     return result;
 }
 
-ChatPhoto::Ptr TgTypeParser::parseJsonAndGetChatPhoto(const boost::property_tree::ptree& data) const {
+ChatPhoto::Ptr TgTypeParser::parseJsonAndGetChatPhoto(const ptree& data) const {
     auto result(make_shared<ChatPhoto>());
-    result->smallFileId = data.get("small_file_id", "");
-    result->smallFileUniqueId = data.get("small_file_unique_id", "");
-    result->bigFileId = data.get("big_file_id", "");
-    result->bigFileUniqueId = data.get("big_file_unique_id", "");
+    result->smallFileId = data.get<string>("small_file_id", "");
+    result->smallFileUniqueId = data.get<string>("small_file_unique_id", "");
+    result->bigFileId = data.get<string>("big_file_id", "");
+    result->bigFileUniqueId = data.get<string>("big_file_unique_id", "");
     return result;
 }
 
-std::string TgTypeParser::parseChatPhoto(const ChatPhoto::Ptr& object) const {
+string TgTypeParser::parseChatPhoto(const ChatPhoto::Ptr& object) const {
     if (!object) {
         return "";
     }