diff options
| author | Oleg Morozenkov <m@oleg.rocks> | 2022-08-30 23:27:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 23:27:10 +0300 |
| commit | 4a3f1967ae255b4b9012598a6198fe4c9f17beee (patch) | |
| tree | 7c25c7968fae4442ea6030fbf5796166ef4a2d49 | |
| parent | 8651e22a472a1b740aee5fd6c8b243425c9498c8 (diff) | |
| parent | 5d84d4cb291e5a93d512ddf51f24fa6964e6e4cd (diff) | |
Merge pull request #221 from llnulldisk/master
Update to Bot API 4.9
30 files changed, 1361 insertions, 1263 deletions
@@ -12,7 +12,7 @@ Documentation is located [here](http://reo7sp.github.io/tgbot-cpp). ## State - [x] Bot API 3.0 ~ 3.6 -- [x] Bot API 4.0 ~ 4.7 (Implemented all APIs except 'Telegram Passport') +- [x] Bot API 4.0 ~ 4.9 (Implemented all APIs except 'Telegram Passport') ## Sample diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h index 18165d1..6a95139 100644 --- a/include/tgbot/Api.h +++ b/include/tgbot/Api.h @@ -49,6 +49,51 @@ public: Api(std::string token, const HttpClient& httpClient, const std::string& url); /** + * @brief Use this method to receive incoming updates using long polling. + * + * This method will not work if an outgoing webhook is set up. + * In order to avoid getting duplicate updates, recalculate offset after each server response. + * + * @param offset Optional. Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as getUpdates is called with an offset higher than its update_id. + * @param limit Optional. Limits the number of updates to be retrieved. Values between 1—100 are accepted. Defaults to 100. + * @param timeout Optional. Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. + * @param allowed_updates Optional. List the types of updates you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See Update for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used. + * @return An Array of Update objects + */ + std::vector<Update::Ptr> getUpdates(std::int32_t offset = 0, std::int32_t limit = 100, std::int32_t timeout = 0, const StringArrayPtr& allowedUpdates = nullptr) const; + + /** + * @brief Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. + * + * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. www.example.com/<token>. Since nobody else knows your bot‘s token, you can be pretty sure it’s us. + * You will not be able to receive updates using getUpdates for as long as an outgoing webhook is set up. + * We currently do not support self-signed certificates. + * Ports currently supported for Webhooks: 443, 80, 88, 8443. + * + * @param url Optional. HTTPS url to send updates to. Use an empty string to remove webhook integration. + */ + void setWebhook(const std::string& url = "", InputFile::Ptr certificate = nullptr, std::int32_t maxConnection = 40, const StringArrayPtr& allowedUpdates = nullptr) const; + + /** + * @brief Use this method to remove webhook integration if you decide to switch back to getUpdates. + * + * Requires no parameters. + * + * @return Returns True on success. + */ + bool deleteWebhook() const; + + /** + * @brief Use this method to get current webhook status. + * + * Requires no parameters. + * If the bot is using getUpdates, will return an object with the url field empty. + * + * @return On success, returns a WebhookInfo object. + */ + WebhookInfo::Ptr getWebhookInfo() const; + + /** * @brief A simple method for testing your bot's auth token. * @return Basic information about the bot in form of a User object. */ @@ -56,20 +101,20 @@ 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 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. 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 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 disableNotification Optional. Sends the message silently. Users will receive a notification with no sound. + * + * @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(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; + Message::Ptr sendMessage(boost::variant<std::int64_t, 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 Use this method to forward messages of any kind. @@ -110,7 +155,7 @@ public: * @param disableNotification Optional. Sends the message silenty. * @return On success, the sent message is returned. */ - Message::Ptr sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> audio, const std::string &caption = "", std::int32_t duration = 0, + Message::Ptr sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> audio, const std::string& caption = "", std::int32_t duration = 0, const std::string& performer = "", const std::string& title = "", boost::variant<InputFile::Ptr, std::string> thumb = "", std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const; @@ -126,152 +171,10 @@ public: * @param disableNotification Optional. Sends the message silenty. * @return On success, the sent message is returned. */ - Message::Ptr sendDocument(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> document, boost::variant<InputFile::Ptr, std::string> thumb = "", const std::string &caption = "", std::int32_t replyToMessageId = 0, + Message::Ptr sendDocument(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> document, boost::variant<InputFile::Ptr, std::string> thumb = "", const std::string& caption = "", 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 send invoices. - * @param chatId Unique identifier for the target private chat. - * @param title Product name, 1-32 characters. - * @param description Product description, 1-255 characters. - * @param payload Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes. - * @param providerToken Payments provider token, obtained via Botfather. - * @param startParameter Unique deep-linking parameter that can be used to generate this invoice when used as a start parameter. - * @param currency Three-letter ISO 4217 currency code. - * @param prices Price breakdown, a list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.) - * @param providerData Optional. JSON-encoded data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider. - * @param photoUrl Optional. URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for. - * @param photoSize Optional. Photo size - * @param photoWidth Optional. Photo width - * @param photoHeight Optional. Photo height - * @param needName Optional. Pass True, if you require the user's full name to complete the order. - * @param needPhoneNumber Optional. Pass True, if you require the user's phone number to complete the order. - * @param needEmail Optional. Pass True, if you require the user's email address to complete the order. - * @param needShippingAddress Optional. Pass True, if you require the user's shipping address to complete the order. - * @param sendPhoneNumberToProvider Optional. Pass True, if user's phone number should be sent to provider. - * @param sendEmailToProvider Optional. Pass True, if user's email address should be sent to provider - * @param isFlexible Optional. Pass True, if the final price depends on the shipping method. - * @param replyToMessageId Optional. If the message is a reply, ID of the original message. - * @param replyMarkup Optional. A JSON-serialized object for an inline keyboard. If empty, one 'Pay total price' button will be shown. If not empty, the first button must be a Pay button. - * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound. - * @return On success, the sent Message is returned. - */ - Message::Ptr sendInvoice(std::int64_t chatId, const std::string& title, const std::string& description, const std::string& payload, - const std::string& providerToken, const std::string& startParameter, const std::string& currency, const std::vector<LabeledPrice::Ptr>& prices, - const std::string& providerData = "", const std::string& photoUrl = "", std::int32_t photoSize = 0, - std::int32_t photoWidth = 0, std::int32_t photoHeight = 0, bool needName = false, - bool needPhoneNumber = false, bool needEmail = false, bool needShippingAddress = false, - bool sendPhoneNumberToProvider = false, bool sendEmailToProvider = false, bool isFlexible = false, - std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), bool disableNotification = false) const; - - /** - * @brief Use this method to reply to shipping queries. - * - * If you sent an invoice requesting a shipping address and the parameter isFlexible was specified, the Bot API will send an Update with a shipping_query field to the bot. - * - * @param shippingQueryId Unique identifier for the query to be answered. - * @param ok Specify True if delivery to the specified address is possible and False if there are any problems (for example, if delivery to the specified address is not possible) - * @param shippingOptions Optional. Required if ok is True. A JSON-serialized array of available shipping options. - * @param errorMessage Optional. Required if ok is False. Error message in human readable form that explains why it is impossible to complete the order (e.g. "Sorry, delivery to your desired address is unavailable'). Telegram will display this message to the user. - * @return On success, True is returned. - */ - bool answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption::Ptr>& shippingOptions = std::vector<ShippingOption::Ptr>(), const std::string& errorMessage = "") const; - - /** - * @brief Use this method to respond to such pre-checkout queries. - * - * Once the user has confirmed their payment and shipping details, the Bot API sends the final confirmation in the form of an Update with the field preCheckoutQuery. - * Note: The Bot API must receive an answer within 10 seconds after the pre-checkout query was sent. - * - * @param preCheckoutQueryId Unique identifier for the query to be answered - * @param ok Specify True if everything is alright (goods are available, etc.) and the bot is ready to proceed with the order. Use False if there are any problems. - * @param errorMessage Required if ok is False. Error message in human readable form that explains the reason for failure to proceed with the checkout (e.g. "Sorry, somebody just bought the last of our amazing black T-shirts while you were busy filling out your payment details. Please choose a different color or garment!"). Telegram will display this message to the user. - * @return On success, True is returned. - */ - bool answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage = "") const; - - /** - * @brief Use this method to send .webp stickers. - * @param chatId Unique identifier for the target chat. - * @param sticker Sticker to send. - * @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 disableNotification Optional. Sends the message silenty. - * @return On success, the sent message is returned. - */ - Message::Ptr sendSticker(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> sticker, std::int32_t replyToMessageId = 0, - GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), bool disableNotification = false) const; - - /** - * @brief Use this method to get a sticker set. - * @param chatId Name of the sticker set. - * @return On success, a StickerSet object is returned. - */ - StickerSet::Ptr getStickerSet(const std::string& name) const; - - /** - * @brief Use this method to upload a .png file with a sticker for later use in createNewStickerSet and addStickerToSet methods (can be used multiple times). - * @param userId User identifier of sticker file owner. - * @param pngSticker 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. - * @return Returns the uploaded File on success. - */ - File::Ptr uploadStickerFile(std::int64_t userId, InputFile::Ptr pngSticker) const; - - /** - * @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 - * @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 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 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; - - /** - * @brief Use this method to move a sticker in a set created by the bot to a specific position. - * @param stickers File identifier of the sticker. - * @param position New sticker position in the set, zero-based. - * @return Returns True on success. - */ - bool setStickerPositionInSet(const std::string& sticker, std::uint32_t position) const; - - /** - * @brief Use this method to delete a sticker from a set created by the bot. - * @param stickers File identifier of the sticker. - * @return Returns True on success. - */ - bool deleteStickerFromSet(const std::string& sticker) const; - - /** - * @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; - - /** * @brief Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as Document). * @param chatId Unique identifier for the target chat. * @param video Video to send. @@ -287,7 +190,6 @@ public: * @param disableNotification Optional. Sends the message silenty. * @return On success, the sent message is returned. */ - Message::Ptr sendVideo(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> video, bool supportsStreaming = false, std::int32_t duration = 0, std::int32_t width = 0, std::int32_t height = 0, boost::variant<InputFile::Ptr, std::string> thumb = "", const std::string& caption = "", std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const; @@ -309,8 +211,24 @@ public: * @param disableNotification Optional. Sends the message silenty. * @return On success, the sent Message is returned. */ - Message::Ptr sendAnimation(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> animation, std::int32_t duration = 0, std::int32_t width = 0, std::int32_t height = 0, boost::variant<InputFile::Ptr, std::string> thumb = "", const std::string &caption = "", - std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const; + Message::Ptr sendAnimation(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> animation, std::int32_t duration = 0, std::int32_t width = 0, std::int32_t height = 0, boost::variant<InputFile::Ptr, std::string> thumb = "", const std::string& caption = "", + 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 send audio files, if you want Telegram clients to display the file as a playable voice message. + * @param chatId Unique identifier for the target chat. + * @param voice Audio file to send. + * @param caption Voice message caption, 0-200 characters + * @param duration Duration of send audio in seconds. + * @param replyToMessageId Optional. If the message is a reply, ID of the original message. + * @param replyMarkup Optional. Additional interface options. A 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. + */ + Message::Ptr sendVoice(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> voice, const std::string& caption = "", int duration = 0, 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 send video messages. On success, the sent Message is returned. * @param chatId Unique identifier for the target chat. @@ -338,33 +256,6 @@ public: bool disableNotification = false, std::int32_t replyToMessageId = 0) const; /** - * @brief Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. - * @param chatId Unique identifier for the target chat. - * @param voice Audio file to send. - * @param caption Voice message caption, 0-200 characters - * @param duration Duration of send audio in seconds. - * @param replyToMessageId Optional. If the message is a reply, ID of the original message. - * @param replyMarkup Optional. Additional interface options. A 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. - */ - Message::Ptr sendVoice(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> voice, const std::string& caption = "", int duration = 0, 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 send a game. - * @param chatId Unique identifier for the target chat. - * @param gameShortName Short name of the game, serves as the unique identifier for the game. Set up your games via Botfather. - * @param replyToMessageId Optional. If the message is a reply, ID of the original message. - * @param replyMarkup Optional. A JSON-serialized object for an inline keyboard. If empty, one ‘Play game_title’ button will be shown. If not empty, the first button must launch the game. - * @param disableNotification Optional. Sends the message silenty. - * @return On success, the sent message is returned. - */ - Message::Ptr sendGame(std::int64_t chatId, const std::string& gameShortName, std::int32_t replyToMessageId = 0, - InlineKeyboardMarkup::Ptr replyMarkup = std::make_shared<InlineKeyboardMarkup>(), bool disableNotification = false) const; - - /** * @brief Use this method to send point on the map. * @param chatId Unique identifier for the target chat. * @param latitude Latitude of location. @@ -402,7 +293,6 @@ public: Message::Ptr stopMessageLiveLocation(std::int64_t chatId = 0, std::int32_t messageId = 0, std::int32_t inlineMessageId = 0, InlineKeyboardMarkup::Ptr replyMarkup = std::make_shared<InlineKeyboardMarkup>()) const; - /** * @brief Use this method to send information about a venue. On success, the sent Message is returned. * @param chatId Unique identifier for the target chat. @@ -433,7 +323,55 @@ public: * @return On success, the sent message is returned. */ Message::Ptr sendContact(std::int64_t chatId, const std::string& phoneNumber, const std::string& firstName, const std::string& lastName = "", const std::string& vcard = "", bool disableNotification = false, - std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const; + std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const; + + /** + * @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 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 explanation Optional. Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line feeds after entities parsing + * @param explanationParseMode Optional. Mode for parsing entities in the explanation. See https://core.telegram.org/bots/api#formatting-options for more details. + * @param openPeriod Optional. Amount of time in seconds the poll will be active after creation, 5-600. Can't be used together with close_date. + * @param closeDate Optional. Point in time (Unix timestamp) when the poll will be automatically closed. Must be at least 5 and no more than 600 seconds in the future. Can't be used together with open_period. + * @param isClosed Optional. Pass True, if the poll needs to be immediately closed. This can be useful for poll preview. + * @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 isAnonymous = true, const std::string& type = "", bool allowsMultipleAnswers = false, + std::int32_t correctOptionId = 0, const std::string& explanation = "", const std::string& explanationParseMode = "", + std::int32_t openPeriod = 0, std::int64_t closeDate = 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 emoji Optional. Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲” + * @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 sendDice(std::int64_t chatId, const std::string& emoji = "", bool disableNotification = false, + std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const; /** * @brief Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). @@ -460,7 +398,144 @@ public: * @param fileId File identifier to get info about * @return A File object. */ - File::Ptr getFile(const std::string &fileId) const; + File::Ptr getFile(const std::string& fileId) const; + + /** + * @brief Downloads file from Telegram and saves it in memory. + * @param filePath Telegram file path. + * @param args Additional api parameters. + * @return File contents in a string. + */ + std::string downloadFile(const std::string& filePath, const std::vector<HttpReqArg>& args = std::vector<HttpReqArg>()) const; + + /** + * @brief Use this method to kick a user from a group or a supergroup. + * @param chatId Unique identifier for the target group. + * @param userId Unique identifier of the target user. + * @param untilDate Optional. Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever. + * @return True on success + */ + bool kickChatMember(std::int64_t chatId, std::int64_t userId, std::uint64_t untilDate = 0) const; + + /** + * @brief Use this method to unban a previously kicked user in a supergroup. + * @param chatId Unique identifier for the target group. + * @param userId Unique identifier of the target user. + * @return True on success + */ + bool unbanChatMember(std::int64_t chatId, std::int64_t userId) const; + + /** + * @brief Use this method to restrict a user in a supergroup. + * @param chatId Unique identifier for the target chat of the target supergroup. + * @param userId Unique identifier of the target user. + * @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 canSendMessages Optional. Pass True, if the user can send text messages, contacts, locations and venues. + * @param canSendMediaMessages Optional. Pass True, if the user can send audios, documents, photos, videos, video notes and voice notes, implies can_send_messages. + * @param canSendOtherMessages Optional. Pass True, if the user can send animations, games, stickers and use inline bots, implies can_send_media_messages. + * @param canAddWebPagePreviews Optional. Pass True, if the user may add web page previews to their messages, implies can_send_media_messages. + * @return True on success + */ + bool restrictChatMember(std::int64_t chatId, std::int64_t userId, ChatPermissions::Ptr permissions, std::uint64_t untilDate = 0) const; + + /** + * @brief Use this method to promote or demote a user in a supergroup or a channel. + * @param chatId Unique identifier for the target chat of the target supergroup or channal. + * @param userId Unique identifier of the target user. + * @param canChangeInfo Optional. Pass True, if the administrator can change chat title, photo and other settings. + * @param canPostMessages Optional. Pass True, if the administrator can create channel posts, channels only. + * @param canEditMessages Optional. Pass True, if the administrator can edit messages of other users and can pin messages, channels only. + * @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 canRestrictMembers Optional. Pass True, if the administrator can restrict, ban or unban chat members. + * @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 his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by him). + * @return True on success + */ + bool promoteChatMember(std::int64_t chatId, std::int64_t userId, bool canChangeInfo = false, bool canPostMessages = false, + bool canEditMessages = false, bool canDeleteMessages = false, bool canInviteUsers = false, bool canPinMessages = false, bool canPromoteMembers = false) const; + + /** + * @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; + + /** + * @brief Use this method to set default chat permissions for all members. The bot must be an administrator in the group or a supergroup for this to work and must have the can_restrict_members admin rights. Returns True on success. + * @param chatId Unique identifier for the target chat of the target supergroup. + * @param permissions New default chat permissions. + * @return True on success + */ + bool setChatPermissions(std::int64_t chatId, ChatPermissions::Ptr permissions) const; + + /** + * @brief Use this method to generate a new invite link for a chat; any previously generated link is revoked. + * @param chatId Unique identifier for the target chat. + * @return The new invite link as String on success. + */ + std::string exportChatInviteLink(std::int64_t chatId) const; + + /** + * @brief Use this method to set a new profile photo for the chat. + * + * Photos can't be changed for private chats. + * + * @param chatId Unique identifier for the target chat. + * @param photo New chat photo. + * @return True on success + */ + bool setChatPhoto(std::int64_t chatId, InputFile::Ptr photo) const; + + /** + * @brief Use this method to delete a chat photo. + * + * Photos can't be changed for private chats. + * + * @param chatId Unique identifier for the target chat. + * @return True on success + */ + bool deleteChatPhoto(std::int64_t chatId) const; + + /** + * @brief Use this method to change the title of a chat. + * + * Titles can't be changed for private chats. + * + * @param chatId Unique identifier for the target chat. + * @param title New chat title, 1-255 characters. + * @return True on success + */ + bool setChatTitle(std::int64_t chatId, const std::string& title) const; + + /** + * @brief Use this method to change the description of a supergroup or a channel. + * @param chatId Unique identifier for the target chat. + * @param description New chat description, 1-255 characters. + * @return True on success + */ + bool setChatDescription(std::int64_t chatId, const std::string& description) const; + + /** + * @brief Use this method to pin a message in a group, a supergroup, or a channel. + * @param chatId Unique identifier for the target chat or username of the target channel. + * @param messageId Identifier of a message to pin. + * @param disableNotification Optional. Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels. + * @return True on success + */ + bool pinChatMessage(std::int64_t chatId, std::int32_t messageId, bool disableNotification = false) const; + + /** + * @brief Use this method to unpin a message in a group, a supergroup, or a channel. + * @param chatId Unique identifier for the target chat or username of the target channel. + * @return True on success + */ + bool unpinChatMessage(std::int64_t chatId) const; /** * @brief Use this method for your bot to leave a group, supergroup or channel. @@ -513,7 +588,6 @@ public: */ bool deleteChatStickerSet(std::int64_t chatId) const; - /** * @brief Use this method to send answers to callback queries sent from inline keyboards. The answer will be displayed to the user as a notification at the top of the chat screen or as an alert. * @param callbackQueryId Unique identifier for the query to be answered @@ -523,7 +597,20 @@ public: * @param cacheTime Optional The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0. * @return True on success */ - bool answerCallbackQuery(const std::string & callbackQueryId, const std::string & text="", bool showAlert=false, const std::string &url="", std::int32_t cacheTime=0) const; + bool answerCallbackQuery(const std::string& callbackQueryId, const std::string& text = "", bool showAlert = false, const std::string& url = "", std::int32_t cacheTime = 0) const; + + /** + * @brief Use this method to change the list of the bot's commands. + * @param commands A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most 100 commands can be specified. + * @return True on success. + */ + bool setMyCommands(const std::vector<BotCommand::Ptr>& commands) const; + + /** + * @brief Use this method to get the current list of the bot's commands. + * @return Array of @ref BotCommand on success. + */ + std::vector<BotCommand::Ptr> getMyCommands() const; /** * @brief Use this method to edit text and game messages sent by the bot or via the bot (for inline bots) @@ -536,7 +623,7 @@ public: * @param replyMarkup Optional A JSON-serialized object for an inline keyboard. * @return Message object on success, otherwise nullptr */ - Message::Ptr editMessageText(const std::string& text, std::int64_t chatId=0, std::int32_t messageId=0, const std::string& inlineMessageId="", + Message::Ptr editMessageText(const std::string& text, std::int64_t chatId = 0, std::int32_t messageId = 0, const std::string& inlineMessageId = "", const std::string& parseMode = "", bool disableWebPagePreview = false, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const; /** @@ -581,6 +668,17 @@ public: GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>()) const; /** + * @brief Use this method to stop a poll which was sent by the bot. + * @param chatId Unique identifier for the target chat or username of the target channel. + * @param messageId Identifier of the original message with the poll. + * @param replyMarkup Optional. A JSON-serialized object for a new message inline keyboard. + * + * @return On success, the stopped Poll with the final results is returned. + */ + + Poll::Ptr stopPoll(std::int64_t chatId, std::int64_t messageId, InlineKeyboardMarkup::Ptr replyMarkup = std::make_shared<InlineKeyboardMarkup>()) const; + + /** * @brief Use this method to delete messages sent by bot (or by other users if bot is admin). * @param chatId Unique identifier for the target chat or username of the target channel. * @param messageId Unique identifier for the target message. @@ -588,191 +686,192 @@ public: void deleteMessage(std::int64_t chatId, std::int32_t messageId) const; /** - * @brief Use this method to receive incoming updates using long polling. - * - * This method will not work if an outgoing webhook is set up. - * In order to avoid getting duplicate updates, recalculate offset after each server response. - * - * @param offset Optional. Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as getUpdates is called with an offset higher than its update_id. - * @param limit Optional. Limits the number of updates to be retrieved. Values between 1—100 are accepted. Defaults to 100. - * @param timeout Optional. Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. - * @param allowed_updates Optional. List the types of updates you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See Update for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used. - * @return An Array of Update objects + * @brief Use this method to send .webp stickers. + * @param chatId Unique identifier for the target chat. + * @param sticker Sticker to send. + * @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 disableNotification Optional. Sends the message silenty. + * @return On success, the sent message is returned. */ - std::vector<Update::Ptr> getUpdates(std::int32_t offset = 0, std::int32_t limit = 100, std::int32_t timeout = 0, const StringArrayPtr &allowedUpdates = nullptr) const; + Message::Ptr sendSticker(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> sticker, std::int32_t replyToMessageId = 0, + GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), bool disableNotification = false) const; /** - * @brief Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. - * - * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. www.example.com/<token>. Since nobody else knows your bot‘s token, you can be pretty sure it’s us. - * You will not be able to receive updates using getUpdates for as long as an outgoing webhook is set up. - * We currently do not support self-signed certificates. - * Ports currently supported for Webhooks: 443, 80, 88, 8443. - * - * @param url Optional. HTTPS url to send updates to. Use an empty string to remove webhook integration. + * @brief Use this method to get a sticker set. + * @param chatId Name of the sticker set. + * @return On success, a StickerSet object is returned. */ - void setWebhook(const std::string& url = "", InputFile::Ptr certificate = nullptr, std::int32_t maxConnection = 40, const StringArrayPtr &allowedUpdates = nullptr) const; + StickerSet::Ptr getStickerSet(const std::string& name) const; /** - * @brief Use this method to remove webhook integration if you decide to switch back to getUpdates. - * - * Requires no parameters. - * - * @return Returns True on success. + * @brief Use this method to upload a .png file with a sticker for later use in createNewStickerSet and addStickerToSet methods (can be used multiple times). + * @param userId User identifier of sticker file owner. + * @param pngSticker 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. + * @return Returns the uploaded File on success. */ - bool deleteWebhook() const; + File::Ptr uploadStickerFile(std::int64_t userId, InputFile::Ptr pngSticker) const; /** - * @brief Use this method to get current webhook status. + * @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. * - * Requires no parameters. - * If the bot is using getUpdates, will return an object with the url field empty. + * @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 + * @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 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 On success, returns a WebhookInfo object. + * @return Returns True on success. */ - WebhookInfo::Ptr getWebhookInfo() const; + 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 Use this method to send answers to an inline query. - * No mode that 50 results per query are allowed. - * @param inlineQueryId Unique identifier for the answered query. - * @param results Array of results for the inline query. - * @param cacheTime The maximum amount of time in seconds that the result of the inline query may be cached on the server. Defaults to 300. - * @param isPersonal Pass True, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query. - * @param nextOffset Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don‘t support pagination. Offset length can’t exceed 64 bytes. - * @param switchPmText If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter switch_pm_parameter - * @param switchPmParameter Parameter for the start message sent to the bot when user presses the switch button - * @return True on success + * @brief Deprecated. Use @ref Api::createNewStickerSet + * @deprecated since Bot API 4.7. This remains unchanged for backward compatibility. */ - bool answerInlineQuery(const std::string& inlineQueryId, const std::vector<InlineQueryResult::Ptr>& results, - std::int32_t cacheTime = 300, bool isPersonal = false, const std::string& nextOffset = "", const std::string& switchPmText = "", const std::string& switchPmParameter = "") const; + 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 kick a user from a group or a supergroup. - * @param chatId Unique identifier for the target group. - * @param userId Unique identifier of the target user. - * @param untilDate Optional. Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever. - * @return True on success + * @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 kickChatMember(std::int64_t chatId, std::int64_t userId, std::uint64_t untilDate = 0) const; + 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; /** - * @brief Use this method to unban a previously kicked user in a supergroup. - * @param chatId Unique identifier for the target group. - * @param userId Unique identifier of the target user. - * @return True on success + * @brief Deprecated. Use @ref Api::addStickerToSet + * @deprecated since Bot API 4.7. This remains unchanged for backward compatibility. */ - bool unbanChatMember(std::int64_t chatId, std::int64_t userId) const; + 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 restrict a user in a supergroup. - * @param chatId Unique identifier for the target chat of the target supergroup. - * @param userId Unique identifier of the target user. - * @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 canSendMessages Optional. Pass True, if the user can send text messages, contacts, locations and venues. - * @param canSendMediaMessages Optional. Pass True, if the user can send audios, documents, photos, videos, video notes and voice notes, implies can_send_messages. - * @param canSendOtherMessages Optional. Pass True, if the user can send animations, games, stickers and use inline bots, implies can_send_media_messages. - * @param canAddWebPagePreviews Optional. Pass True, if the user may add web page previews to their messages, implies can_send_media_messages. - * @return True on success + * @brief Use this method to move a sticker in a set created by the bot to a specific position. + * @param stickers File identifier of the sticker. + * @param position New sticker position in the set, zero-based. + * @return Returns True on success. */ - bool restrictChatMember(std::int64_t chatId, std::int64_t userId, ChatPermissions::Ptr permissions, std::uint64_t untilDate = 0) const; + bool setStickerPositionInSet(const std::string& sticker, std::uint32_t position) const; /** - * @brief Use this method to promote or demote a user in a supergroup or a channel. - * @param chatId Unique identifier for the target chat of the target supergroup or channal. - * @param userId Unique identifier of the target user. - * @param canChangeInfo Optional. Pass True, if the administrator can change chat title, photo and other settings. - * @param canPostMessages Optional. Pass True, if the administrator can create channel posts, channels only. - * @param canEditMessages Optional. Pass True, if the administrator can edit messages of other users and can pin messages, channels only. - * @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 canRestrictMembers Optional. Pass True, if the administrator can restrict, ban or unban chat members. - * @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 his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by him). - * @return True on success + * @brief Use this method to delete a sticker from a set created by the bot. + * @param stickers File identifier of the sticker. + * @return Returns True on success. */ - bool promoteChatMember(std::int64_t chatId, std::int64_t userId, bool canChangeInfo = false, bool canPostMessages = false, - bool canEditMessages = false, bool canDeleteMessages = false, bool canInviteUsers = false, bool canPinMessages = false, bool canPromoteMembers = false) const; + bool deleteStickerFromSet(const std::string& sticker) const; /** - * @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 + * @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 setChatAdministratorCustomTitle(std::int64_t chatId, std::int64_t userId, const std::string& customTitle) const; + bool setStickerSetThumb(const std::string& name, std::int64_t userId, boost::variant<InputFile::Ptr, std::string> thumb = "") const; /** - * @brief Use this method to set default chat permissions for all members. The bot must be an administrator in the group or a supergroup for this to work and must have the can_restrict_members admin rights. Returns True on success. - * @param chatId Unique identifier for the target chat of the target supergroup. - * @param permissions New default chat permissions. + * @brief Use this method to send answers to an inline query. + * No mode that 50 results per query are allowed. + * @param inlineQueryId Unique identifier for the answered query. + * @param results Array of results for the inline query. + * @param cacheTime The maximum amount of time in seconds that the result of the inline query may be cached on the server. Defaults to 300. + * @param isPersonal Pass True, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query. + * @param nextOffset Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don‘t support pagination. Offset length can’t exceed 64 bytes. + * @param switchPmText If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter switch_pm_parameter + * @param switchPmParameter Parameter for the start message sent to the bot when user presses the switch button * @return True on success */ - bool setChatPermissions(std::int64_t chatId, ChatPermissions::Ptr permissions) const; - - /** - * @brief Use this method to generate a new invite link for a chat; any previously generated link is revoked. - * @param chatId Unique identifier for the target chat. - * @return The new invite link as String on success. - */ - std::string exportChatInviteLink(std::int64_t chatId) const; + bool answerInlineQuery(const std::string& inlineQueryId, const std::vector<InlineQueryResult::Ptr>& results, + std::int32_t cacheTime = 300, bool isPersonal = false, const std::string& nextOffset = "", const std::string& switchPmText = "", const std::string& switchPmParameter = "") const; /** - * @brief Use this method to set a new profile photo for the chat. - * - * Photos can't be changed for private chats. - * - * @param chatId Unique identifier for the target chat. - * @param photo New chat photo. - * @return True on success + * @brief Use this method to send invoices. + * @param chatId Unique identifier for the target private chat. + * @param title Product name, 1-32 characters. + * @param description Product description, 1-255 characters. + * @param payload Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes. + * @param providerToken Payments provider token, obtained via Botfather. + * @param startParameter Unique deep-linking parameter that can be used to generate this invoice when used as a start parameter. + * @param currency Three-letter ISO 4217 currency code. + * @param prices Price breakdown, a list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.) + * @param providerData Optional. JSON-encoded data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider. + * @param photoUrl Optional. URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for. + * @param photoSize Optional. Photo size + * @param photoWidth Optional. Photo width + * @param photoHeight Optional. Photo height + * @param needName Optional. Pass True, if you require the user's full name to complete the order. + * @param needPhoneNumber Optional. Pass True, if you require the user's phone number to complete the order. + * @param needEmail Optional. Pass True, if you require the user's email address to complete the order. + * @param needShippingAddress Optional. Pass True, if you require the user's shipping address to complete the order. + * @param sendPhoneNumberToProvider Optional. Pass True, if user's phone number should be sent to provider. + * @param sendEmailToProvider Optional. Pass True, if user's email address should be sent to provider + * @param isFlexible Optional. Pass True, if the final price depends on the shipping method. + * @param replyToMessageId Optional. If the message is a reply, ID of the original message. + * @param replyMarkup Optional. A JSON-serialized object for an inline keyboard. If empty, one 'Pay total price' button will be shown. If not empty, the first button must be a Pay button. + * @param disableNotification Optional. Sends the message silently. Users will receive a notification with no sound. + * @return On success, the sent Message is returned. */ - bool setChatPhoto(std::int64_t chatId, InputFile::Ptr photo) const; + Message::Ptr sendInvoice(std::int64_t chatId, const std::string& title, const std::string& description, const std::string& payload, + const std::string& providerToken, const std::string& startParameter, const std::string& currency, const std::vector<LabeledPrice::Ptr>& prices, + const std::string& providerData = "", const std::string& photoUrl = "", std::int32_t photoSize = 0, + std::int32_t photoWidth = 0, std::int32_t photoHeight = 0, bool needName = false, + bool needPhoneNumber = false, bool needEmail = false, bool needShippingAddress = false, + bool sendPhoneNumberToProvider = false, bool sendEmailToProvider = false, bool isFlexible = false, + std::int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), bool disableNotification = false) const; /** - * @brief Use this method to delete a chat photo. + * @brief Use this method to reply to shipping queries. * - * Photos can't be changed for private chats. + * If you sent an invoice requesting a shipping address and the parameter isFlexible was specified, the Bot API will send an Update with a shipping_query field to the bot. * - * @param chatId Unique identifier for the target chat. - * @return True on success + * @param shippingQueryId Unique identifier for the query to be answered. + * @param ok Specify True if delivery to the specified address is possible and False if there are any problems (for example, if delivery to the specified address is not possible) + * @param shippingOptions Optional. Required if ok is True. A JSON-serialized array of available shipping options. + * @param errorMessage Optional. Required if ok is False. Error message in human readable form that explains why it is impossible to complete the order (e.g. "Sorry, delivery to your desired address is unavailable'). Telegram will display this message to the user. + * @return On success, True is returned. */ - bool deleteChatPhoto(std::int64_t chatId) const; + bool answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption::Ptr>& shippingOptions = std::vector<ShippingOption::Ptr>(), const std::string& errorMessage = "") const; /** - * @brief Use this method to change the title of a chat. + * @brief Use this method to respond to such pre-checkout queries. * - * Titles can't be changed for private chats. + * Once the user has confirmed their payment and shipping details, the Bot API sends the final confirmation in the form of an Update with the field preCheckoutQuery. + * Note: The Bot API must receive an answer within 10 seconds after the pre-checkout query was sent. * - * @param chatId Unique identifier for the target chat. - * @param title New chat title, 1-255 characters. - * @return True on success + * @param preCheckoutQueryId Unique identifier for the query to be answered + * @param ok Specify True if everything is alright (goods are available, etc.) and the bot is ready to proceed with the order. Use False if there are any problems. + * @param errorMessage Required if ok is False. Error message in human readable form that explains the reason for failure to proceed with the checkout (e.g. "Sorry, somebody just bought the last of our amazing black T-shirts while you were busy filling out your payment details. Please choose a different color or garment!"). Telegram will display this message to the user. + * @return On success, True is returned. */ - bool setChatTitle(std::int64_t chatId, const std::string& title) const; + bool answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage = "") const; /** - * @brief Use this method to change the description of a supergroup or a channel. + * @brief Use this method to send a game. * @param chatId Unique identifier for the target chat. - * @param description New chat description, 1-255 characters. - * @return True on success - */ - bool setChatDescription(std::int64_t chatId, const std::string& description) const; - - /** - * @brief Use this method to pin a message in a group, a supergroup, or a channel. - * @param chatId Unique identifier for the target chat or username of the target channel. - * @param messageId Identifier of a message to pin. - * @param disableNotification Optional. Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels. - * @return True on success - */ - bool pinChatMessage(std::int64_t chatId, std::int32_t messageId, bool disableNotification = false) const; - - /** - * @brief Use this method to unpin a message in a group, a supergroup, or a channel. - * @param chatId Unique identifier for the target chat or username of the target channel. - * @return True on success + * @param gameShortName Short name of the game, serves as the unique identifier for the game. Set up your games via Botfather. + * @param replyToMessageId Optional. If the message is a reply, ID of the original message. + * @param replyMarkup Optional. A JSON-serialized object for an inline keyboard. If empty, one ‘Play game_title’ button will be shown. If not empty, the first button must launch the game. + * @param disableNotification Optional. Sends the message silenty. + * @return On success, the sent message is returned. */ - bool unpinChatMessage(std::int64_t chatId) const; + Message::Ptr sendGame(std::int64_t chatId, const std::string& gameShortName, std::int32_t replyToMessageId = 0, + InlineKeyboardMarkup::Ptr replyMarkup = std::make_shared<InlineKeyboardMarkup>(), bool disableNotification = false) const; /** * @brief Use this method to set the score of the specified user in a game. @@ -804,60 +903,7 @@ public: */ std::vector<GameHighScore::Ptr> getGameHighScores(std::int64_t userId, std::int32_t score, bool force = false, bool disableEditMessage = false, std::int64_t chatId = 0, std::int32_t messageId = 0, const std::string& inlineMessageId = "") const; - - /** - * @brief Downloads file from Telegram and saves it in memory. - * @param filePath Telegram file path. - * @param args Additional api parameters. - * @return File contents in a string. - */ - std::string downloadFile(const std::string& filePath, const std::vector<HttpReqArg>& args = std::vector<HttpReqArg>()) const; - - /** - * @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. - */ - 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; - - /** - * @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. - */ - 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. - * @param chatId Unique identifier for the target chat or username of the target channel. - * @param messageId Identifier of the original message with the poll. - * @param replyMarkup Optional. A JSON-serialized object for a new message inline keyboard. - * - * @return On success, the stopped Poll with the final results is returned. - */ - - Poll::Ptr stopPoll(std::int64_t chatId, std::int64_t messageId, InlineKeyboardMarkup::Ptr replyMarkup = std::make_shared<InlineKeyboardMarkup>()) const; - - - bool setMyCommands(const std::vector<BotCommand::Ptr>& commands) const; - - std::vector<BotCommand::Ptr> getMyCommands() const; - + private: boost::property_tree::ptree sendRequest(const std::string& method, const std::vector<HttpReqArg>& args = std::vector<HttpReqArg>()) const; @@ -866,7 +912,6 @@ private: const TgTypeParser _tgTypeParser; const std::string _url; }; - } #endif //TGBOT_CPP_API_H 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/Dice.h b/include/tgbot/types/Dice.h index ec874e0..4c2a68e 100644 --- a/include/tgbot/types/Dice.h +++ b/include/tgbot/types/Dice.h @@ -6,7 +6,7 @@ namespace TgBot { /** - * @brief This object represents a dice with random value from 1 to 6. + * @brief This object represents an animated emoji that displays a random value. * * @ingroup types */ @@ -16,7 +16,12 @@ public: typedef std::shared_ptr<Dice> Ptr; /** - * @brief Value of the dice, 1-6 + * @brief Emoji on which the dice throw animation is based + */ + std::string emoji; + + /** + * @brief Value of the dice, 1-6 for “🎲” and “🎯” base emoji, 1-5 for “🏀” base emoji */ std::int8_t value; }; 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/InlineQueryResult.h b/include/tgbot/types/InlineQueryResult.h index ee385f9..5674015 100644 --- a/include/tgbot/types/InlineQueryResult.h +++ b/include/tgbot/types/InlineQueryResult.h @@ -23,32 +23,41 @@ public: virtual ~InlineQueryResult() { } /** - * @brief Type of the result. + * @brief Type of the result */ std::string type; /** - * @brief Unique identifier for this result. (1-64 bytes) + * @brief Unique identifier for this result, 1-64 bytes */ std::string id; /** - * @brief Requred, optional or missing. See description of derived classes. Title of the result. + * @brief Requred, optional or missing. See description of derived classes. + * Title for the result */ std::string title; /** - * @brief Optional or missing. See description of derived classes. Caption of the file to be sent, 0-200 characters + * @brief Optional or missing. See description of derived classes. + * Caption of the file to be sent, 0-1024 characters after entities parsing */ std::string caption; /** + * @brief Optional or missing. See description of derived classes. + * Mode for parsing entities in the caption. + */ + std::string parseMode; + + /** * @brief Optional. Inline keyboard attached to the message */ InlineKeyboardMarkup::Ptr replyMarkup; /** - * @brief Requred, optional or missing. See description of derived classes. Content of the message to be sent + * @brief Requred, optional or missing. See description of derived classes. + * Content of the message to be sent */ InputMessageContent::Ptr inputMessageContent; }; diff --git a/include/tgbot/types/InlineQueryResultGif.h b/include/tgbot/types/InlineQueryResultGif.h index e957d0f..118da7b 100644 --- a/include/tgbot/types/InlineQueryResultGif.h +++ b/include/tgbot/types/InlineQueryResultGif.h @@ -11,6 +11,8 @@ namespace TgBot { /** * @brief Represents a link to an animated GIF file. + * By default, this animated GIF file will be sent by the user with optional caption. + * Alternatively, you can use @ref InlineQueryResult::inputMessageContent to send a message with the specified content instead of the animation. * * @ingroup types */ @@ -27,17 +29,17 @@ public: } /** - * @brief A valid URL for the GIF file. + * @brief A valid URL for the GIF file. File size must not exceed 1MB */ std::string gifUrl; /** - * @brief Optional. Width of the GIF. + * @brief Optional. Width of the GIF */ std::int32_t gifWidth; /** - * @brief Optional. Height of the GIF. + * @brief Optional. Height of the GIF */ std::int32_t gifHeight; @@ -47,10 +49,15 @@ public: std::int32_t gifDuration; /** - * @brief URL of the static thumbnail for the result (jpeg or gif) + * @brief URL of the static (JPEG or GIF) or animated (MPEG4) thumbnail for the result */ std::string thumbUrl; + /** + * @brief Optional. MIME type of the thumbnail, must be one of “image/jpeg”, “image/gif”, or “video/mp4”. + * Defaults to “image/jpeg” + */ + std::string thumbMimeType; }; } diff --git a/include/tgbot/types/InlineQueryResultMpeg4Gif.h b/include/tgbot/types/InlineQueryResultMpeg4Gif.h index 2109e7b..f6319a9 100644 --- a/include/tgbot/types/InlineQueryResultMpeg4Gif.h +++ b/include/tgbot/types/InlineQueryResultMpeg4Gif.h @@ -9,6 +9,8 @@ namespace TgBot { /** * @brief Represents a link to a video animation (H.264/MPEG-4 AVC video without sound). + * By default, this animated MPEG-4 file will be sent by the user with optional caption. + * Alternatively, you can use @ref InlineQueryResult::inputMessageContent to send a message with the specified content instead of the animation. * * @ingroup types */ @@ -26,29 +28,35 @@ public: /** * @brief A valid URL for the MP4 file. + * File size must not exceed 1MB */ std::string mpeg4Url; /** - * @brief Optional. Video width. + * @brief Optional. Video width */ std::int32_t mpeg4Width; /** - * @brief Optional. Video height. + * @brief Optional. Video height */ std::int32_t mpeg4Height; /** - * @brief Optional. Video duration. + * @brief Optional. Video duration */ std::int32_t mpeg4Duration; /** - * @brief URL of the static thumbnail (jpeg or gif) for the result + * @brief URL of the static (JPEG or GIF) or animated (MPEG4) thumbnail for the result */ std::string thumbUrl; + /** + * @brief Optional. MIME type of the thumbnail, must be one of “image/jpeg”, “image/gif”, or “video/mp4”. + * Defaults to “image/jpeg” + */ + std::string thumbMimeType; }; } 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..753e393 100644 --- a/include/tgbot/types/Message.h +++ b/include/tgbot/types/Message.h @@ -91,12 +91,16 @@ 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; /** + * @brief Optional. Bot through which the message was sent + */ + User::Ptr viaBot; + + /** * @brief Optional. Date the message was last edited in Unix time */ std::int32_t editDate; @@ -138,7 +142,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 +207,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 +229,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 +289,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 +299,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..2a75c68 100644 --- a/include/tgbot/types/Poll.h +++ b/include/tgbot/types/Poll.h @@ -2,6 +2,7 @@ #define TGBOT_POLL_H #include "tgbot/types/PollOption.h" +#include "tgbot/types/MessageEntity.h" #include <cstdint> #include <memory> @@ -23,7 +24,7 @@ public: /** * @brief Unique poll identifier */ - std::int64_t id; + std::string id; /** * @brief Poll question, 1-255 characters @@ -62,10 +63,29 @@ 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; + + /** + * @brief Optional. Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a quiz-style poll, 0-200 characters + */ + std::string explanation; + + /** + * @brief Optional. Special entities like usernames, URLs, bot commands, etc. that appear in the explanation + */ + std::vector<MessageEntity::Ptr> explanationEntities; + + /** + * @brief Optional. Amount of time in seconds the poll will be active after creation + */ + std::int32_t openPeriod; + + /** + * @brief Optional. Point in time (Unix timestamp) when the poll will be automatically closed + */ + std::int64_t closeDate; }; } 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..9cb7f6e 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -19,42 +19,86 @@ Api::Api(string token, const HttpClient& httpClient, const std::string& url) : _token(std::move(token)), _httpClient(httpClient), _tgTypeParser(), _url(url) { } -User::Ptr Api::getMe() const { - return _tgTypeParser.parseJsonAndGetUser(sendRequest("getMe")); +vector<Update::Ptr> Api::getUpdates(std::int32_t offset, std::int32_t limit, std::int32_t timeout, const StringArrayPtr& allowedUpdates) const { + vector<HttpReqArg> args; + args.reserve(4); + if (offset) { + args.emplace_back("offset", offset); + } + limit = max(1, min(100, limit)); + args.emplace_back("limit", limit); + if (timeout) { + args.emplace_back("timeout", timeout); + } + if (allowedUpdates != nullptr) { + string allowedUpdatesJson = _tgTypeParser.parseArray<string>( + [] (const string& s)->string { + return s; + }, *allowedUpdates); + args.emplace_back("allowed_updates", allowedUpdatesJson); + } + return _tgTypeParser.parseJsonAndGetArray<Update>(&TgTypeParser::parseJsonAndGetUpdate, sendRequest("getUpdates", args)); } -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 { +void Api::setWebhook(const string& url, const InputFile::Ptr certificate, std::int32_t maxConnection, const StringArrayPtr& allowedUpdates) 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); + args.reserve(4); + if (!url.empty()) { + args.emplace_back("url", url); } - if (disableNotification){ - args.emplace_back("disable_notification", disableNotification); + if (certificate != nullptr) { + args.emplace_back("certificate", certificate->data, true, certificate->mimeType, certificate->fileName); } - if (replyToMessageId) { - args.emplace_back("reply_to_message_id", replyToMessageId); + if (maxConnection != 40) { + args.emplace_back("max_connections", maxConnection); } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + if (allowedUpdates != nullptr) { + auto allowedUpdatesJson = _tgTypeParser.parseArray<string>( + [] (const string& s)->string { + return s; + }, *allowedUpdates); + args.emplace_back("allowed_updates", allowedUpdatesJson); } - if (!parseMode.empty()) { - args.emplace_back("parse_mode", parseMode); + + sendRequest("setWebhook", args); +} + +bool Api::deleteWebhook() const { + return sendRequest("deleteWebhook").get<bool>("", false); +} + +WebhookInfo::Ptr Api::getWebhookInfo() const { + ptree p = sendRequest("getWebhookInfo"); + + if (!p.get_child_optional("url")) { + return nullptr; } - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendMessage", args)); + if (p.get<string>("url", "") != string("")) { + return _tgTypeParser.parseJsonAndGetWebhookInfo(p); + } else { + return nullptr; + } +} + +User::Ptr Api::getMe() const { + return _tgTypeParser.parseJsonAndGetUser(sendRequest("getMe")); } -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 { +Message::Ptr Api::sendMessage(boost::variant<std::int64_t, const std::string&> chatId, const std::string& text, bool disableWebPagePreview, + std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup, const std::string& parseMode, + bool disableNotification) const { vector<HttpReqArg> args; args.reserve(7); + args.emplace_back("chat_id", chatId); args.emplace_back("text", text); + if (!parseMode.empty()) { + args.emplace_back("parse_mode", parseMode); + } if (disableWebPagePreview) { args.emplace_back("disable_web_page_preview", disableWebPagePreview); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } if (replyToMessageId) { @@ -63,9 +107,7 @@ 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)); } @@ -75,7 +117,7 @@ Message::Ptr Api::forwardMessage(std::int64_t chatId, std::int64_t fromChatId, s args.emplace_back("chat_id", chatId); args.emplace_back("from_chat_id", fromChatId); args.emplace_back("message_id", messageId); - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("forwardMessage", args)); @@ -103,13 +145,13 @@ Message::Ptr Api::sendPhoto(std::int64_t chatId, boost::variant<InputFile::Ptr, if (!parseMode.empty()) { args.emplace_back("parse_mode", parseMode); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendPhoto", args)); } -Message::Ptr Api::sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> audio, const string &caption, std::int32_t duration, const string& performer, const string& title, boost::variant<InputFile::Ptr, std::string> thumb, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { +Message::Ptr Api::sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> audio, const string& caption, std::int32_t duration, const string& performer, const string& title, boost::variant<InputFile::Ptr, std::string> thumb, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { vector<HttpReqArg> args; args.reserve(11); args.emplace_back("chat_id", chatId); @@ -125,10 +167,10 @@ Message::Ptr Api::sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, if (duration) { args.emplace_back("duration", duration); } - if (!performer.empty()){ + if (!performer.empty()) { args.emplace_back("performer", performer); } - if (!title.empty()){ + if (!title.empty()) { args.emplace_back("title", title); } if (thumb.which() == 0 /* InputFile::Ptr */) { @@ -149,13 +191,13 @@ Message::Ptr Api::sendAudio(std::int64_t chatId, boost::variant<InputFile::Ptr, if (!parseMode.empty()) { args.emplace_back("parse_mode", parseMode); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendAudio", args)); } -Message::Ptr Api::sendDocument(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> document, boost::variant<InputFile::Ptr, std::string> thumb, const string &caption, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { +Message::Ptr Api::sendDocument(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> document, boost::variant<InputFile::Ptr, std::string> thumb, const string& caption, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { vector<HttpReqArg> args; args.reserve(8); args.emplace_back("chat_id", chatId); @@ -186,228 +228,13 @@ Message::Ptr Api::sendDocument(std::int64_t chatId, boost::variant<InputFile::Pt if (!parseMode.empty()) { args.emplace_back("parse_mode", parseMode); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendDocument", args)); } -Message::Ptr Api::sendInvoice(std::int64_t chatId, const std::string& title, const std::string& description, const std::string& payload, - const std::string& providerToken, const std::string& startParameter, const std::string& currency, const std::vector<LabeledPrice::Ptr>& prices, - const std::string& providerData, const std::string& photoUrl, std::int32_t photoSize, - std::int32_t photoWidth, std::int32_t photoHeight, bool needName, - bool needPhoneNumber, bool needEmail, bool needShippingAddress, - bool sendPhoneNumberToProvider, bool sendEmailToProvider, bool isFlexible, - std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, bool disableNotification) const { - vector<HttpReqArg> args; - args.reserve(23); - args.emplace_back("chat_id", chatId); - args.emplace_back("title", title); - args.emplace_back("description", description); - args.emplace_back("payload", payload); - args.emplace_back("provider_token", providerToken); - args.emplace_back("start_parameter", startParameter); - args.emplace_back("currency", currency); - args.emplace_back("prices", _tgTypeParser.parseArray<LabeledPrice>(&TgTypeParser::parseLabeledPrice, prices)); - if (!providerData.empty()) { - args.emplace_back("provider_data", providerData); - } - if (!photoUrl.empty()) { - args.emplace_back("photo_url", photoUrl); - } - if (photoSize) { - args.emplace_back("photo_size", photoSize); - } - if (photoWidth) { - args.emplace_back("photo_width", photoWidth); - } - if (photoHeight) { - args.emplace_back("photo_height", photoHeight); - } - if (needName) { - args.emplace_back("need_name", needName); - } - if (needPhoneNumber) { - args.emplace_back("need_phone_number", needPhoneNumber); - } - if (needEmail) { - args.emplace_back("need_email", needEmail); - } - if (needShippingAddress) { - args.emplace_back("need_shipping_address", needShippingAddress); - } - if (sendPhoneNumberToProvider) { - args.emplace_back("send_phone_number_to_provider", sendPhoneNumberToProvider); - } - if (sendEmailToProvider) { - args.emplace_back("send_email_to_provider", sendEmailToProvider); - } - if (isFlexible) { - args.emplace_back("is_flexible", isFlexible); - } - if (replyToMessageId) { - args.emplace_back("reply_to_message_id", replyToMessageId); - } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - if (disableNotification){ - args.emplace_back("disable_notification", disableNotification); - } - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendInvoice", args)); -} - -bool Api::answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption::Ptr>& shippingOptions, const std::string& errorMessage) const { - vector<HttpReqArg> args; - args.reserve(4); - args.emplace_back("shipping_query_id", shippingQueryId); - args.emplace_back("ok", ok); - if (!shippingOptions.empty()) { - args.emplace_back("shipping_options", _tgTypeParser.parseArray<ShippingOption>(&TgTypeParser::parseShippingOption, shippingOptions)); - } - if (!errorMessage.empty()) { - args.emplace_back("error_message", errorMessage); - } - return sendRequest("answerShippingQuery", args).get<bool>("", false); -} - -bool Api::answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage) const { - vector<HttpReqArg> args; - args.reserve(3); - args.emplace_back("pre_checkout_query_id", preCheckoutQueryId); - args.emplace_back("ok", ok); - if (!errorMessage.empty()) { - args.emplace_back("error_message", errorMessage); - } - return sendRequest("answerPreCheckoutQuery", args).get<bool>("", false); -} - - -Message::Ptr Api::sendSticker(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> sticker, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, bool disableNotification) const { - vector<HttpReqArg> args; - args.reserve(5); - args.emplace_back("chat_id", chatId); - if (sticker.which() == 0 /* InputFile::Ptr */) { - auto file = boost::get<InputFile::Ptr>(sticker); - args.emplace_back("sticker", file->data, true, file->mimeType, file->fileName); - } else /* std::string */ { - args.emplace_back("sticker", boost::get<std::string>(sticker)); - } - if (replyToMessageId) { - args.emplace_back("reply_to_message_id", replyToMessageId); - } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - if (disableNotification){ - args.emplace_back("disable_notification", disableNotification); - } - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendSticker", args)); -} - -StickerSet::Ptr Api::getStickerSet(const string& name) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("name", name); - return _tgTypeParser.parseJsonAndGetStickerSet(sendRequest("getStickerSet", args)); -} - -File::Ptr Api::uploadStickerFile(std::int64_t userId, const InputFile::Ptr pngSticker) const { - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("user_id", userId); - args.emplace_back("png_sticker", pngSticker->data, true, pngSticker->mimeType, pngSticker->fileName); - 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 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); - } else /* std::string */ { - args.emplace_back("png_sticker", boost::get<std::string>(pngSticker)); - } - if (tgsSticker.which() == 0 /* InputFile::Ptr */) { - auto file = boost::get<InputFile::Ptr>(tgsSticker); - args.emplace_back("tgs_sticker", file->data, true, file->mimeType, file->fileName); - } else /* std::string */ { - args.emplace_back("tgs_sticker", boost::get<std::string>(tgsSticker)); - } - if (containsMasks) { - args.emplace_back("contains_mask", containsMasks); - } - if (maskPosition != nullptr) { - args.emplace_back("mask_position", _tgTypeParser.parseMaskPosition(maskPosition)); - } - return sendRequest("createNewStickerSet", args).get<bool>("", false); -} - -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 { - 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); - } else /* std::string */ { - args.emplace_back("png_sticker", boost::get<std::string>(pngSticker)); - } - if (tgsSticker.which() == 0 /* InputFile::Ptr */) { - auto file = boost::get<InputFile::Ptr>(tgsSticker); - args.emplace_back("tgs_sticker", file->data, true, file->mimeType, file->fileName); - } else /* std::string */ { - args.emplace_back("tgs_sticker", boost::get<std::string>(tgsSticker)); - } - if (maskPosition != nullptr) { - args.emplace_back("mask_position", _tgTypeParser.parseMaskPosition(maskPosition)); - } - return sendRequest("addStickerToSet", args).get<bool>("", false); -} - -bool Api::setStickerPositionInSet(const string& sticker, std::uint32_t position) const { - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("sticker", sticker); - args.emplace_back("position", position); - return sendRequest("setStickerPositionInSet", args).get<bool>("", false); -} - -bool Api::deleteStickerFromSet(const string& sticker) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("sticker", sticker); - return sendRequest("deleteStickerFromSet", args).get<bool>("", false); -} - -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 */) { - auto file = boost::get<InputFile::Ptr>(thumb); - args.emplace_back("thumb", file->data, true, file->mimeType, file->fileName); - } else /* std::string */ { - args.emplace_back("thumb", boost::get<std::string>(thumb)); - } - return sendRequest("setStickerSetThumb", args).get<bool>("", false); -} - -Message::Ptr Api::sendVideo(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> video, bool supportsStreaming, std::int32_t duration, std::int32_t width, std::int32_t height, boost::variant<InputFile::Ptr, std::string> thumb, const string &caption, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { +Message::Ptr Api::sendVideo(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> video, bool supportsStreaming, std::int32_t duration, std::int32_t width, std::int32_t height, boost::variant<InputFile::Ptr, std::string> thumb, const string& caption, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { vector<HttpReqArg> args; args.reserve(12); args.emplace_back("chat_id", chatId); @@ -450,7 +277,7 @@ Message::Ptr Api::sendVideo(std::int64_t chatId, boost::variant<InputFile::Ptr, if (!parseMode.empty()) { args.emplace_back("parse_mode", parseMode); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendVideo", args)); @@ -496,12 +323,43 @@ Message::Ptr Api::sendAnimation(std::int64_t chatId, boost::variant<InputFile::P if (!parseMode.empty()) { args.emplace_back("parse_mode", parseMode); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendAnimation", args)); } +Message::Ptr Api::sendVoice(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> voice, const string& caption, int duration, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { + vector<HttpReqArg> args; + args.reserve(8); + args.emplace_back("chat_id", chatId); + if (voice.which() == 0 /* InputFile::Ptr */) { + auto file = boost::get<InputFile::Ptr>(voice); + args.emplace_back("voice", file->data, true, file->mimeType, file->fileName); + } else /* std::string */ { + args.emplace_back("voice", boost::get<std::string>(voice)); + } + if (!caption.empty()) { + args.emplace_back("caption", caption); + } + if (duration) { + args.emplace_back("duration", duration); + } + 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); + } + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendVoice", args)); +} + Message::Ptr Api::sendVideoNote(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> videoNote, std::int64_t replyToMessageId, bool disableNotification, std::int32_t duration, std::int32_t length, boost::variant<InputFile::Ptr, std::string> thumb, const GenericReply::Ptr replyMarkup) const { vector<HttpReqArg> args; args.reserve(8); @@ -550,54 +408,6 @@ vector<Message::Ptr> Api::sendMediaGroup(std::int64_t chatId, const vector<Input return _tgTypeParser.parseJsonAndGetArray<Message>(&TgTypeParser::parseJsonAndGetMessage, sendRequest("sendMediaGroup", args)); } -Message::Ptr Api::sendVoice(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> voice, const string &caption, int duration, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, const string& parseMode, bool disableNotification) const { - vector<HttpReqArg> args; - args.reserve(8); - args.emplace_back("chat_id", chatId); - if (voice.which() == 0 /* InputFile::Ptr */) { - auto file = boost::get<InputFile::Ptr>(voice); - args.emplace_back("voice", file->data, true, file->mimeType, file->fileName); - } else /* std::string */ { - args.emplace_back("voice", boost::get<std::string>(voice)); - } - if (!caption.empty()) { - args.emplace_back("caption", caption); - } - if (duration){ - args.emplace_back("duration", duration); - } - 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); - } - if (disableNotification){ - args.emplace_back("disable_notification", disableNotification); - } - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendVoice", args)); -} - -Message::Ptr Api::sendGame(std::int64_t chatId, const std::string& gameShortName, std::int32_t replyToMessageId, const InlineKeyboardMarkup::Ptr replyMarkup, bool disableNotification) const { - vector<HttpReqArg> args; - args.reserve(5); - args.emplace_back("chat_id", chatId); - args.emplace_back("game_short_name", gameShortName); - if (replyToMessageId) { - args.emplace_back("reply_to_message_id", replyToMessageId); - } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - if (disableNotification){ - args.emplace_back("disable_notification", disableNotification); - } - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendGame", args)); -} - Message::Ptr Api::sendLocation(std::int64_t chatId, float latitude, float longitude, std::uint32_t livePeriod, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, bool disableNotification) const { vector<HttpReqArg> args; args.reserve(7); @@ -613,7 +423,7 @@ Message::Ptr Api::sendLocation(std::int64_t chatId, float latitude, float longit if (replyMarkup) { args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendLocation", args)); @@ -657,21 +467,6 @@ Message::Ptr Api::stopMessageLiveLocation(std::int64_t chatId, std::int32_t mess return _tgTypeParser.parseJsonAndGetMessage(sendRequest("editMessageLiveLocation", args)); } -bool Api::setChatStickerSet(std::int64_t chatId, const string& stickerSetName) const { - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("sticker_set_name ", stickerSetName); - return sendRequest("setChatStickerSet", args).get<bool>("", false); -} - -bool Api::deleteChatStickerSet(std::int64_t chatId) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("chat_id", chatId); - return sendRequest("deleteChatStickerSet", args).get<bool>("", false); -} - Message::Ptr Api::sendVenue(std::int64_t chatId, float latitude, float longitude, const string& title, const string& address, const string& foursquareId, const string& foursquareType, bool disableNotification, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup) const { vector<HttpReqArg> args; args.reserve(10); @@ -692,7 +487,7 @@ Message::Ptr Api::sendVenue(std::int64_t chatId, float latitude, float longitude if (replyMarkup) { args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendVenue", args)); @@ -716,12 +511,93 @@ Message::Ptr Api::sendContact(std::int64_t chatId, const string& phoneNumber, co if (replyMarkup) { args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - if (disableNotification){ + if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendContact", args)); } +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, const std::string& explanation, const std::string& explanationParseMode, + std::int32_t openPeriod, std::int64_t closeDate, bool isClosed, + bool disableNotification, std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup) const { + vector<HttpReqArg> args; + args.reserve(15); + + 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); + } + if (!type.empty()) { + args.emplace_back("type", type); + } + if (allowsMultipleAnswers) { + args.emplace_back("allows_multiple_answers", allowsMultipleAnswers); + } + if (correctOptionId != 0) { + args.emplace_back("correct_option_id", correctOptionId); + } + if (!explanation.empty()) { + args.emplace_back("explanation", explanation); + } + if (!explanationParseMode.empty()) { + args.emplace_back("explanation_parse_mode", explanationParseMode); + } + if (openPeriod != 0) { + args.emplace_back("open_period", openPeriod); + } + if (closeDate != 0) { + args.emplace_back("close_date", closeDate); + } + if (isClosed) { + args.emplace_back("is_closed", isClosed); + } + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + if (replyToMessageId != 0) { + args.emplace_back("reply_to_message_id", replyToMessageId); + } + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + } + + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendPoll", args)); +} + +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, "", "", 0, 0, false, false, 0); +} + +Message::Ptr Api::sendDice(std::int64_t chatId, const std::string& emoji, bool disableNotification, + std::int32_t replyToMessageId, GenericReply::Ptr replyMarkup) const { + vector<HttpReqArg> args; + args.reserve(5); + + args.emplace_back("chat_id", chatId); + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + if (!emoji.empty()) { + args.emplace_back("emoji", emoji); + } + if (replyToMessageId != 0) { + args.emplace_back("reply_to_message_id", replyToMessageId); + } + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + } + + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendDice", args)); +} + void Api::sendChatAction(std::int64_t chatId, const string& action) const { vector<HttpReqArg> args; args.reserve(2); @@ -742,13 +618,163 @@ UserProfilePhotos::Ptr Api::getUserProfilePhotos(std::int64_t userId, std::int32 return _tgTypeParser.parseJsonAndGetUserProfilePhotos(sendRequest("getUserProfilePhotos", args)); } -File::Ptr Api::getFile(const string &fileId) const { +File::Ptr Api::getFile(const string& fileId) const { vector<HttpReqArg> args; args.reserve(1); args.emplace_back("file_id", fileId); return _tgTypeParser.parseJsonAndGetFile(sendRequest("getFile", args)); } +string Api::downloadFile(const string& filePath, const std::vector<HttpReqArg>& args) const { + string url(_url); + url += "/file/bot"; + url += _token; + url += "/"; + url += filePath; + + string serverResponse = _httpClient.makeRequest(url, args); + + return serverResponse; +} + +bool Api::kickChatMember(std::int64_t chatId, std::int64_t userId, std::uint64_t untilDate) const { + vector<HttpReqArg> args; + args.reserve(3); + args.emplace_back("chat_id", chatId); + args.emplace_back("user_id", userId); + if (untilDate) { + args.emplace_back("until_date", untilDate); + } + return sendRequest("kickChatMember", args).get<bool>("", false); +} + +bool Api::unbanChatMember(std::int64_t chatId, std::int64_t userId) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("user_id", userId); + return sendRequest("unbanChatMember", args).get<bool>("", false); +} + +bool Api::restrictChatMember(std::int64_t chatId, std::int64_t userId, TgBot::ChatPermissions::Ptr permissions, + std::uint64_t untilDate) const { + vector<HttpReqArg> args; + args.reserve(4); + args.emplace_back("chat_id", chatId); + args.emplace_back("user_id", userId); + args.emplace_back("permissions", _tgTypeParser.parseChatPermissions(permissions)); + if (untilDate) { + args.emplace_back("until_date", untilDate); + } + + return sendRequest("restrictChatMember", args).get<bool>("", false); +} + +bool Api::promoteChatMember(std::int64_t chatId, std::int64_t userId, bool canChangeInfo, bool canPostMessages, + bool canEditMessages, bool canDeleteMessages, bool canInviteUsers, bool canPinMessages, bool canPromoteMembers) const { + vector<HttpReqArg> args; + args.reserve(9); + args.emplace_back("chat_id", chatId); + args.emplace_back("user_id", userId); + if (canChangeInfo) { + args.emplace_back("can_change_info", canChangeInfo); + } + if (canPostMessages) { + args.emplace_back("can_post_messages", canPostMessages); + } + if (canEditMessages) { + args.emplace_back("can_edit_messages", canEditMessages); + } + if (canDeleteMessages) { + args.emplace_back("can_delete_messages", canDeleteMessages); + } + if (canInviteUsers) { + args.emplace_back("can_invite_users", canInviteUsers); + } + if (canPinMessages) { + args.emplace_back("can_pin_messages", canPinMessages); + } + if (canPromoteMembers) { + args.emplace_back("can_promote_members", canPromoteMembers); + } + return sendRequest("promoteChatMember", args).get<bool>("", false); +} + +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); +} + +bool Api::setChatPermissions(std::int64_t chatId, ChatPermissions::Ptr permissions) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("permissions", _tgTypeParser.parseChatPermissions(permissions)); + return sendRequest("setChatPermissions", args).get<bool>("", false); +} + +string Api::exportChatInviteLink(std::int64_t chatId) const { + vector<HttpReqArg> args; + args.reserve(1); + args.emplace_back("chat_id", chatId); + return sendRequest("exportChatInviteLink", args).get("", ""); +} + +bool Api::setChatPhoto(std::int64_t chatId, const InputFile::Ptr photo) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("photo", photo->data, true, photo->mimeType, photo->fileName); + return sendRequest("setChatPhoto", args).get<bool>("", false); +} + +bool Api::deleteChatPhoto(std::int64_t chatId) const { + vector<HttpReqArg> args; + args.reserve(1); + args.emplace_back("chat_id", chatId); + return sendRequest("deleteChatPhoto", args).get<bool>("", false); +} + +bool Api::setChatTitle(std::int64_t chatId, const string& title) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("title", title); + return sendRequest("setChatTitle", args).get<bool>("", false); +} + +bool Api::setChatDescription(std::int64_t chatId, const string& description) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("description", description); + return sendRequest("setChatDescription", args).get<bool>("", false); +} + +bool Api::pinChatMessage(std::int64_t chatId, std::int32_t messageId, bool disableNotification) const { + vector<HttpReqArg> args; + args.reserve(3); + args.emplace_back("chat_id", chatId); + args.emplace_back("message_id", messageId); + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + return sendRequest("pinChatMessage", args).get<bool>("", false); +} + +bool Api::unpinChatMessage(std::int64_t chatId) const { + vector<HttpReqArg> args; + args.reserve(1); + args.emplace_back("chat_id", chatId); + return sendRequest("unpinChatMessage", args).get<bool>("", false); +} + bool Api::leaveChat(std::int64_t chatId) const { vector<HttpReqArg> args; args.reserve(1); @@ -777,7 +803,30 @@ int32_t Api::getChatMembersCount(std::int64_t chatId) const { return sendRequest("getChatMembersCount", args).get<int32_t>("", 0); } -bool Api::answerCallbackQuery(const string & callbackQueryId, const string & text, bool showAlert, const string &url, std::int32_t cacheTime) const { +ChatMember::Ptr Api::getChatMember(std::int64_t chatId, std::int64_t userId) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("user_id", userId); + return _tgTypeParser.parseJsonAndGetChatMember(sendRequest("getChatMember", args)); +} + +bool Api::setChatStickerSet(std::int64_t chatId, const string& stickerSetName) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("chat_id", chatId); + args.emplace_back("sticker_set_name ", stickerSetName); + return sendRequest("setChatStickerSet", args).get<bool>("", false); +} + +bool Api::deleteChatStickerSet(std::int64_t chatId) const { + vector<HttpReqArg> args; + args.reserve(1); + args.emplace_back("chat_id", chatId); + return sendRequest("deleteChatStickerSet", args).get<bool>("", false); +} + +bool Api::answerCallbackQuery(const string& callbackQueryId, const string& text, bool showAlert, const string& url, std::int32_t cacheTime) const { vector<HttpReqArg> args; args.reserve(5); args.emplace_back("callback_query_id", callbackQueryId); @@ -796,8 +845,22 @@ bool Api::answerCallbackQuery(const string & callbackQueryId, const string & tex return sendRequest("answerCallbackQuery", args).get<bool>("", false); } +bool Api::setMyCommands(const std::vector<BotCommand::Ptr>& commands) const { + vector<HttpReqArg> args; + args.reserve(5); + + string commandsJson = _tgTypeParser.parseArray<BotCommand>(&TgTypeParser::parseBotCommand, commands); + args.emplace_back("commands", commandsJson); + + return sendRequest("setMyCommands", args).get<bool>("", false); +} + +std::vector<BotCommand::Ptr> Api::getMyCommands() const { + return _tgTypeParser.parseJsonAndGetArray<BotCommand>(&TgTypeParser::parseJsonAndGetBotCommand, sendRequest("getMyCommands")); +} + Message::Ptr Api::editMessageText(const string& text, std::int64_t chatId, std::int32_t messageId, const string& inlineMessageId, - const string& parseMode, bool disableWebPagePreview, const GenericReply::Ptr replyMarkup) const { + const string& parseMode, bool disableWebPagePreview, const GenericReply::Ptr replyMarkup) const { vector<HttpReqArg> args; args.reserve(7); @@ -830,7 +893,6 @@ Message::Ptr Api::editMessageText(const string& text, std::int64_t chatId, std:: Message::Ptr Api::editMessageCaption(std::int64_t chatId, std::int32_t messageId, const string& caption, const string& inlineMessageId, const GenericReply::Ptr replyMarkup) const { - vector<HttpReqArg> args; args.reserve(5); if (chatId) { @@ -856,11 +918,12 @@ Message::Ptr Api::editMessageCaption(std::int64_t chatId, std::int32_t messageId } } -Message::Ptr Api::editMessageReplyMarkup(std::int64_t chatId, std::int32_t messageId, const string& inlineMessageId, - const GenericReply::Ptr replyMarkup) const { +Message::Ptr Api::editMessageMedia(InputMedia::Ptr media, std::int64_t chatId, std::int32_t messageId, const std::string& inlineMessageId, + GenericReply::Ptr replyMarkup) const { vector<HttpReqArg> args; - args.reserve(4); + args.reserve(5); + args.emplace_back("media", _tgTypeParser.parseInputMedia(media)); if (chatId) { args.emplace_back("chat_id", chatId); } @@ -873,7 +936,7 @@ Message::Ptr Api::editMessageReplyMarkup(std::int64_t chatId, std::int32_t messa if (replyMarkup) { args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - ptree p = sendRequest("editMessageReplyMarkup", args); + ptree p = sendRequest("editMessageMedia", args); if (p.get_child_optional("message_id")) { return _tgTypeParser.parseJsonAndGetMessage(p); } else { @@ -881,12 +944,11 @@ Message::Ptr Api::editMessageReplyMarkup(std::int64_t chatId, std::int32_t messa } } -Message::Ptr Api::editMessageMedia(InputMedia::Ptr media, std::int64_t chatId, std::int32_t messageId, const std::string& inlineMessageId, - GenericReply::Ptr replyMarkup) const { +Message::Ptr Api::editMessageReplyMarkup(std::int64_t chatId, std::int32_t messageId, const string& inlineMessageId, + const GenericReply::Ptr replyMarkup) const { vector<HttpReqArg> args; - args.reserve(5); - args.emplace_back("media", _tgTypeParser.parseInputMedia(media)); + args.reserve(4); if (chatId) { args.emplace_back("chat_id", chatId); } @@ -899,7 +961,7 @@ Message::Ptr Api::editMessageMedia(InputMedia::Ptr media, std::int64_t chatId, s if (replyMarkup) { args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - ptree p = sendRequest("editMessageMedia", args); + ptree p = sendRequest("editMessageReplyMarkup", args); if (p.get_child_optional("message_id")) { return _tgTypeParser.parseJsonAndGetMessage(p); } else { @@ -907,74 +969,159 @@ Message::Ptr Api::editMessageMedia(InputMedia::Ptr media, std::int64_t chatId, s } } -ChatMember::Ptr Api::getChatMember(std::int64_t chatId, std::int64_t userId) const { +Poll::Ptr Api::stopPoll(std::int64_t chatId, std::int64_t messageId, const InlineKeyboardMarkup::Ptr replyMarkup) const { vector<HttpReqArg> args; - args.reserve(2); + args.reserve(3); args.emplace_back("chat_id", chatId); - args.emplace_back("user_id", userId); - return _tgTypeParser.parseJsonAndGetChatMember(sendRequest("getChatMember", args)); + args.emplace_back("message_id", messageId); + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + } + return _tgTypeParser.parseJsonAndGetPoll(sendRequest("stopPoll", args)); } -vector<Update::Ptr> Api::getUpdates(std::int32_t offset, std::int32_t limit, std::int32_t timeout, const StringArrayPtr &allowedUpdates) const { +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::sendSticker(std::int64_t chatId, boost::variant<InputFile::Ptr, std::string> sticker, std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, bool disableNotification) const { vector<HttpReqArg> args; - args.reserve(4); - if (offset) { - args.emplace_back("offset", offset); + args.reserve(5); + args.emplace_back("chat_id", chatId); + if (sticker.which() == 0 /* InputFile::Ptr */) { + auto file = boost::get<InputFile::Ptr>(sticker); + args.emplace_back("sticker", file->data, true, file->mimeType, file->fileName); + } else /* std::string */ { + args.emplace_back("sticker", boost::get<std::string>(sticker)); } - limit = max(1, min(100, limit)); - args.emplace_back("limit", limit); - if (timeout) { - args.emplace_back("timeout", timeout); + if (replyToMessageId) { + args.emplace_back("reply_to_message_id", replyToMessageId); } - if (allowedUpdates != nullptr) { - string allowedUpdatesJson = _tgTypeParser.parseArray<string>( - [](const string &s)->string { - return s; - }, *allowedUpdates); - args.emplace_back("allowed_updates", allowedUpdatesJson); + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); } - return _tgTypeParser.parseJsonAndGetArray<Update>(&TgTypeParser::parseJsonAndGetUpdate, sendRequest("getUpdates", args)); + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendSticker", args)); } -void Api::setWebhook(const string& url, const InputFile::Ptr certificate, std::int32_t maxConnection, const StringArrayPtr &allowedUpdates) const { +StickerSet::Ptr Api::getStickerSet(const string& name) const { vector<HttpReqArg> args; - args.reserve(4); - if (!url.empty()) { - args.emplace_back("url", url); + args.reserve(1); + args.emplace_back("name", name); + return _tgTypeParser.parseJsonAndGetStickerSet(sendRequest("getStickerSet", args)); +} + +File::Ptr Api::uploadStickerFile(std::int64_t userId, const InputFile::Ptr pngSticker) const { + vector<HttpReqArg> args; + args.reserve(2); + args.emplace_back("user_id", userId); + args.emplace_back("png_sticker", pngSticker->data, true, pngSticker->mimeType, pngSticker->fileName); + 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 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); + } else /* std::string */ { + args.emplace_back("png_sticker", boost::get<std::string>(pngSticker)); } - if (certificate != nullptr) { - args.emplace_back("certificate", certificate->data, true, certificate->mimeType, certificate->fileName); + if (tgsSticker.which() == 0 /* InputFile::Ptr */) { + auto file = boost::get<InputFile::Ptr>(tgsSticker); + args.emplace_back("tgs_sticker", file->data, true, file->mimeType, file->fileName); + } else /* std::string */ { + args.emplace_back("tgs_sticker", boost::get<std::string>(tgsSticker)); } - if (maxConnection != 40) { - args.emplace_back("max_connections", maxConnection); + if (containsMasks) { + args.emplace_back("contains_mask", containsMasks); } - if (allowedUpdates != nullptr) { - auto allowedUpdatesJson = _tgTypeParser.parseArray<string>( - [](const string &s)->string { - return s; - }, *allowedUpdates); - args.emplace_back("allowed_updates", allowedUpdatesJson); + if (maskPosition != nullptr) { + args.emplace_back("mask_position", _tgTypeParser.parseMaskPosition(maskPosition)); } - sendRequest("setWebhook", args); + return sendRequest("createNewStickerSet", args).get<bool>("", false); } -bool Api::deleteWebhook() const { - return sendRequest("deleteWebhook").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); } -WebhookInfo::Ptr Api::getWebhookInfo() const { - ptree p = sendRequest("getWebhookInfo"); +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 { + vector<HttpReqArg> args; + args.reserve(6); - if (!p.get_child_optional("url")) { - return nullptr; + 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); + } else /* std::string */ { + args.emplace_back("png_sticker", boost::get<std::string>(pngSticker)); } - if (p.get<string>("url","") != string("")) { - return _tgTypeParser.parseJsonAndGetWebhookInfo(p); + if (tgsSticker.which() == 0 /* InputFile::Ptr */) { + auto file = boost::get<InputFile::Ptr>(tgsSticker); + args.emplace_back("tgs_sticker", file->data, true, file->mimeType, file->fileName); + } else /* std::string */ { + args.emplace_back("tgs_sticker", boost::get<std::string>(tgsSticker)); } - else { - return nullptr; + 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); + args.emplace_back("sticker", sticker); + args.emplace_back("position", position); + return sendRequest("setStickerPositionInSet", args).get<bool>("", false); +} + +bool Api::deleteStickerFromSet(const string& sticker) const { + vector<HttpReqArg> args; + args.reserve(1); + args.emplace_back("sticker", sticker); + return sendRequest("deleteStickerFromSet", args).get<bool>("", false); +} + +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 */) { + auto file = boost::get<InputFile::Ptr>(thumb); + args.emplace_back("thumb", file->data, true, file->mimeType, file->fileName); + } else /* std::string */ { + args.emplace_back("thumb", boost::get<std::string>(thumb)); + } + + return sendRequest("setStickerSetThumb", args).get<bool>("", false); } bool Api::answerInlineQuery(const string& inlineQueryId, const std::vector<InlineQueryResult::Ptr>& results, @@ -1002,139 +1149,111 @@ bool Api::answerInlineQuery(const string& inlineQueryId, const std::vector<Inlin return sendRequest("answerInlineQuery", args).get<bool>("", false); } -bool Api::kickChatMember(std::int64_t chatId, std::int64_t userId, std::uint64_t untilDate) const { +Message::Ptr Api::sendInvoice(std::int64_t chatId, const std::string& title, const std::string& description, const std::string& payload, + const std::string& providerToken, const std::string& startParameter, const std::string& currency, const std::vector<LabeledPrice::Ptr>& prices, + const std::string& providerData, const std::string& photoUrl, std::int32_t photoSize, + std::int32_t photoWidth, std::int32_t photoHeight, bool needName, + bool needPhoneNumber, bool needEmail, bool needShippingAddress, + bool sendPhoneNumberToProvider, bool sendEmailToProvider, bool isFlexible, + std::int32_t replyToMessageId, const GenericReply::Ptr replyMarkup, bool disableNotification) const { vector<HttpReqArg> args; - args.reserve(3); + args.reserve(23); args.emplace_back("chat_id", chatId); - args.emplace_back("user_id", userId); - if (untilDate) { - args.emplace_back("until_date", untilDate); + args.emplace_back("title", title); + args.emplace_back("description", description); + args.emplace_back("payload", payload); + args.emplace_back("provider_token", providerToken); + args.emplace_back("start_parameter", startParameter); + args.emplace_back("currency", currency); + args.emplace_back("prices", _tgTypeParser.parseArray<LabeledPrice>(&TgTypeParser::parseLabeledPrice, prices)); + if (!providerData.empty()) { + args.emplace_back("provider_data", providerData); } - return sendRequest("kickChatMember", args).get<bool>("", false); -} - -bool Api::unbanChatMember(std::int64_t chatId, std::int64_t userId) const { - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("user_id", userId); - return sendRequest("unbanChatMember", args).get<bool>("", false); -} -bool Api::restrictChatMember(std::int64_t chatId, std::int64_t userId, TgBot::ChatPermissions::Ptr permissions, - std::uint64_t untilDate) const { - vector<HttpReqArg> args; - args.reserve(4); - args.emplace_back("chat_id", chatId); - args.emplace_back("user_id", userId); - args.emplace_back("permissions", _tgTypeParser.parseChatPermissions(permissions)); - if (untilDate) { - args.emplace_back("until_date", untilDate); + if (!photoUrl.empty()) { + args.emplace_back("photo_url", photoUrl); } - - return sendRequest("restrictChatMember", args).get<bool>("", false); -} - -bool Api::promoteChatMember(std::int64_t chatId, std::int64_t userId, bool canChangeInfo, bool canPostMessages, - bool canEditMessages, bool canDeleteMessages, bool canInviteUsers, bool canPinMessages, bool canPromoteMembers) const { - vector<HttpReqArg> args; - args.reserve(9); - args.emplace_back("chat_id", chatId); - args.emplace_back("user_id", userId); - if (canChangeInfo) { - args.emplace_back("can_change_info", canChangeInfo); + if (photoSize) { + args.emplace_back("photo_size", photoSize); } - if (canPostMessages) { - args.emplace_back("can_post_messages", canPostMessages); + if (photoWidth) { + args.emplace_back("photo_width", photoWidth); } - if (canEditMessages) { - args.emplace_back("can_edit_messages", canEditMessages); + if (photoHeight) { + args.emplace_back("photo_height", photoHeight); } - if (canDeleteMessages) { - args.emplace_back("can_delete_messages", canDeleteMessages); + if (needName) { + args.emplace_back("need_name", needName); } - if (canInviteUsers) { - args.emplace_back("can_invite_users", canInviteUsers); + if (needPhoneNumber) { + args.emplace_back("need_phone_number", needPhoneNumber); } - if (canPinMessages) { - args.emplace_back("can_pin_messages", canPinMessages); + if (needEmail) { + args.emplace_back("need_email", needEmail); } - if (canPromoteMembers) { - args.emplace_back("can_promote_members", canPromoteMembers); + if (needShippingAddress) { + args.emplace_back("need_shipping_address", needShippingAddress); } - return sendRequest("promoteChatMember", args).get<bool>("", false); -} - -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); -} - -bool Api::setChatPermissions(std::int64_t chatId, ChatPermissions::Ptr permissions) const{ - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("permissions", _tgTypeParser.parseChatPermissions(permissions)); - return sendRequest("setChatPermissions", args).get<bool>("", false); -} - -string Api::exportChatInviteLink(std::int64_t chatId) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("chat_id", chatId); - return sendRequest("exportChatInviteLink", args).get("", ""); -} - -bool Api::setChatPhoto(std::int64_t chatId, const InputFile::Ptr photo) const { - vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("photo", photo->data, true, photo->mimeType, photo->fileName); - return sendRequest("setChatPhoto", args).get<bool>("", false); -} - -bool Api::deleteChatPhoto(std::int64_t chatId) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("chat_id", chatId); - return sendRequest("deleteChatPhoto", args).get<bool>("", false); + if (sendPhoneNumberToProvider) { + args.emplace_back("send_phone_number_to_provider", sendPhoneNumberToProvider); + } + if (sendEmailToProvider) { + args.emplace_back("send_email_to_provider", sendEmailToProvider); + } + if (isFlexible) { + args.emplace_back("is_flexible", isFlexible); + } + if (replyToMessageId) { + args.emplace_back("reply_to_message_id", replyToMessageId); + } + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + } + if (disableNotification) { + args.emplace_back("disable_notification", disableNotification); + } + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendInvoice", args)); } -bool Api::setChatTitle(std::int64_t chatId, const string& title) const { +bool Api::answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption::Ptr>& shippingOptions, const std::string& errorMessage) const { vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("title", title); - return sendRequest("setChatTitle", args).get<bool>("", false); + args.reserve(4); + args.emplace_back("shipping_query_id", shippingQueryId); + args.emplace_back("ok", ok); + if (!shippingOptions.empty()) { + args.emplace_back("shipping_options", _tgTypeParser.parseArray<ShippingOption>(&TgTypeParser::parseShippingOption, shippingOptions)); + } + if (!errorMessage.empty()) { + args.emplace_back("error_message", errorMessage); + } + return sendRequest("answerShippingQuery", args).get<bool>("", false); } -bool Api::setChatDescription(std::int64_t chatId, const string& description) const { +bool Api::answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage) const { vector<HttpReqArg> args; - args.reserve(2); - args.emplace_back("chat_id", chatId); - args.emplace_back("description", description); - return sendRequest("setChatDescription", args).get<bool>("", false); + args.reserve(3); + args.emplace_back("pre_checkout_query_id", preCheckoutQueryId); + args.emplace_back("ok", ok); + if (!errorMessage.empty()) { + args.emplace_back("error_message", errorMessage); + } + return sendRequest("answerPreCheckoutQuery", args).get<bool>("", false); } -bool Api::pinChatMessage(std::int64_t chatId, std::int32_t messageId, bool disableNotification) const { +Message::Ptr Api::sendGame(std::int64_t chatId, const std::string& gameShortName, std::int32_t replyToMessageId, const InlineKeyboardMarkup::Ptr replyMarkup, bool disableNotification) const { vector<HttpReqArg> args; - args.reserve(3); + args.reserve(5); args.emplace_back("chat_id", chatId); - args.emplace_back("message_id", messageId); + args.emplace_back("game_short_name", gameShortName); + if (replyToMessageId) { + args.emplace_back("reply_to_message_id", replyToMessageId); + } + if (replyMarkup) { + args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); + } if (disableNotification) { args.emplace_back("disable_notification", disableNotification); } - return sendRequest("pinChatMessage", args).get<bool>("", false); -} - -bool Api::unpinChatMessage(std::int64_t chatId) const { - vector<HttpReqArg> args; - args.reserve(1); - args.emplace_back("chat_id", chatId); - return sendRequest("unpinChatMessage", args).get<bool>("", false); + return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendGame", args)); } Message::Ptr Api::setGameScore(std::int64_t userId, std::int32_t score, bool force, bool disableEditMessage, std::int64_t chatId, std::int32_t messageId, const std::string& inlineMessageId) const { @@ -1148,13 +1267,13 @@ Message::Ptr Api::setGameScore(std::int64_t userId, std::int32_t score, bool for if (disableEditMessage) { args.emplace_back("disable_edit_message", disableEditMessage); } - if (chatId){ + if (chatId) { args.emplace_back("chat_id", chatId); } - if (messageId){ + if (messageId) { args.emplace_back("message_id", messageId); } - if (!inlineMessageId.empty()){ + if (!inlineMessageId.empty()) { args.emplace_back("inline_message_id", inlineMessageId); } return _tgTypeParser.parseJsonAndGetMessage(sendRequest("setGameScore", args)); @@ -1177,98 +1296,12 @@ vector<GameHighScore::Ptr> Api::getGameHighScores(std::int64_t userId, std::int3 if (messageId) { args.emplace_back("message_id", messageId); } - if (!inlineMessageId.empty()){ + if (!inlineMessageId.empty()) { args.emplace_back("inline_message_id", inlineMessageId); } return _tgTypeParser.parseJsonAndGetArray<GameHighScore>(&TgTypeParser::parseJsonAndGetGameHighScore, sendRequest("getGameHighScores", args)); } -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 { - 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); - } - if (!type.empty()) { - args.emplace_back("type", type); - } - if (allowsMultipleAnswers) { - args.emplace_back("allows_multiple_answers", allowsMultipleAnswers); - } - if (correctOptionId != 0) { - args.emplace_back("correct_option_id", correctOptionId); - } - if (isClosed) { - args.emplace_back("is_closed", isClosed); - } - if (disableNotification) { - args.emplace_back("disable_notification", disableNotification); - } - if (replyToMessageId != 0) { - args.emplace_back("reply_to_message_id", replyToMessageId); - } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendPoll", args)); -} - -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); - - if (disableNotification) { - args.emplace_back("disable_notification", disableNotification); - } - if (replyToMessageId != 0) { - args.emplace_back("reply_to_message_id", replyToMessageId); - } - if (replyMarkup) { - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - - return _tgTypeParser.parseJsonAndGetMessage(sendRequest("sendDice", args)); -} - -Poll::Ptr Api::stopPoll(std::int64_t chatId, std::int64_t messageId, const InlineKeyboardMarkup::Ptr replyMarkup) const { - vector<HttpReqArg> args; - args.reserve(3); - args.emplace_back("chat_id", chatId); - args.emplace_back("message_id", messageId); - if (replyMarkup){ - args.emplace_back("reply_markup", _tgTypeParser.parseGenericReply(replyMarkup)); - } - return _tgTypeParser.parseJsonAndGetPoll(sendRequest("stopPoll", args)); -} - -bool Api::setMyCommands(const std::vector<BotCommand::Ptr>& commands) const { - vector<HttpReqArg> args; - args.reserve(5); - - string commandsJson = _tgTypeParser.parseArray<BotCommand>(&TgTypeParser::parseBotCommand, commands); - args.emplace_back("commands", commandsJson); - - return sendRequest("setMyCommands",args).get<bool>("",false); -} - -std::vector<BotCommand::Ptr> Api::getMyCommands() const { - return _tgTypeParser.parseJsonAndGetArray<BotCommand>(&TgTypeParser::parseJsonAndGetBotCommand, sendRequest("getMyCommands")); -} - ptree Api::sendRequest(const string& method, const vector<HttpReqArg>& args) const { string url(_url); url += "/bot"; @@ -1292,19 +1325,4 @@ ptree Api::sendRequest(const string& method, const vector<HttpReqArg>& args) con throw TgException("tgbot-cpp library can't parse json response. " + string(e.what())); } } - -string Api::downloadFile(const string& filePath, const std::vector<HttpReqArg>& args) const { - string url(_url); - url += "/file/bot"; - url += _token; - url += "/"; - url += filePath; - - string serverResponse = _httpClient.makeRequest(url, args); - - return serverResponse; -} - - - } diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp index 37dafb6..daa6184 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,22 @@ 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->viaBot = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "via_bot"); 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 +160,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; } @@ -207,6 +203,7 @@ string TgTypeParser::parseMessage(const Message::Ptr& object) const { appendToJson(result, "forward_sender_name", object->forwardSenderName); appendToJson(result, "forward_date", object->forwardDate); appendToJson(result, "reply_to_message", parseMessage(object->replyToMessage)); + appendToJson(result, "via_bot", parseUser(object->viaBot)); appendToJson(result, "edit_date", object->editDate); appendToJson(result, "media_group_id", object->mediaGroupId); appendToJson(result, "author_signature", object->authorSignature); @@ -228,7 +225,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 +241,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 +249,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 +275,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 +307,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 +335,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 +371,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 +423,19 @@ 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); + result->explanation = data.get<string>("explanation", ""); + result->explanationEntities = parseJsonAndGetArray<MessageEntity>(&TgTypeParser::parseJsonAndGetMessageEntity, data, "explanation_entities"); + result->openPeriod = data.get<int32_t>("open_period", 0); + result->closeDate = data.get<int64_t>("close_date", 0); return result; } @@ -453,6 +454,10 @@ string TgTypeParser::parsePoll(const Poll::Ptr& object) const { appendToJson(result, "type", object->type); appendToJson(result, "allows_multiple_answers", object->allowsMultipleAnswers); appendToJson(result, "correct_option_id", object->correctOptionId); + appendToJson(result, "explanation", object->correctOptionId); + appendToJson(result, "explanation_entities", parseArray(&TgTypeParser::parseMessageEntity, object->explanationEntities)); + appendToJson(result, "open_period", object->openPeriod); + appendToJson(result, "close_date", object->closeDate); removeLastComma(result); result += '}'; return result; @@ -460,7 +465,8 @@ 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->emoji = data.get<string>("emoji", ""); + result->value = data.get<int8_t>("value", 0); return result; } @@ -470,6 +476,7 @@ string TgTypeParser::parseDice(const Dice::Ptr& object) const { } string result; result += '{'; + appendToJson(result, "emoji", object->emoji); appendToJson(result, "value", object->value); removeLastComma(result); result += '}'; @@ -478,12 +485,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 +563,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 +595,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 +621,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 +642,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 +699,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 +784,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 +805,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 +966,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 +1028,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 +1054,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 +1108,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 +1132,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 +1162,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 ""; } @@ -1258,8 +1262,8 @@ std::string TgTypeParser::parseInlineQuery(const InlineQuery::Ptr& object) const return result; } -InlineQueryResult::Ptr TgTypeParser::parseJsonAndGetInlineQueryResult(const boost::property_tree::ptree& data) const { - string type = data.get<string>("type"); +InlineQueryResult::Ptr TgTypeParser::parseJsonAndGetInlineQueryResult(const ptree& data) const { + string type = data.get<string>("type", ""); InlineQueryResult::Ptr result; if (type == InlineQueryResultCachedAudio::TYPE) { @@ -1306,26 +1310,27 @@ InlineQueryResult::Ptr TgTypeParser::parseJsonAndGetInlineQueryResult(const boos result = make_shared<InlineQueryResult>(); } - result->id = data.get<string>("id"); + result->id = data.get<string>("id", ""); result->title = data.get<string>("title", ""); result->caption = data.get<string>("caption", ""); + result->parseMode = data.get<string>("parse_mode", ""); result->replyMarkup = tryParseJson<InlineKeyboardMarkup>(&TgTypeParser::parseJsonAndGetInlineKeyboardMarkup, data, "reply_markup"); result->inputMessageContent = tryParseJson<InputMessageContent>(&TgTypeParser::parseJsonAndGetInputMessageContent, data, "input_message_content"); return result; } -std::string TgTypeParser::parseInlineQueryResult(const InlineQueryResult::Ptr& object) const { +string TgTypeParser::parseInlineQueryResult(const InlineQueryResult::Ptr& object) const { if (!object){ return ""; } - string result; result += '{'; appendToJson(result, "id", object->id); appendToJson(result, "type", object->type); appendToJson(result, "title", object->title); appendToJson(result, "caption", object->caption); + appendToJson(result, "parse_mode", object->parseMode); appendToJson(result, "reply_markup", parseInlineKeyboardMarkup(object->replyMarkup)); appendToJson(result, "input_message_content", parseInputMessageContent(object->inputMessageContent)); @@ -1396,7 +1401,7 @@ std::string TgTypeParser::parseInlineQueryResult(const InlineQueryResult::Ptr& o } InlineQueryResultCachedAudio::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedAudio(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedAudio>()); result->audioFileId = data.get<string>("audio_file_id"); return result; @@ -1415,7 +1420,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedAudio(const InlineQueryRes } InlineQueryResultCachedDocument::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedDocument(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedDocument>()); result->documentFileId = data.get<string>("document_file_id"); result->description = data.get<string>("description", ""); @@ -1437,7 +1442,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedDocument(const InlineQuery InlineQueryResultCachedGif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedGif(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedGif>()); result->gifFileId = data.get<string>("gif_file_id"); return result; @@ -1457,7 +1462,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedGif(const InlineQueryResul InlineQueryResultCachedMpeg4Gif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedMpeg4Gif(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedMpeg4Gif>()); result->mpeg4FileId = data.get<string>("mpeg4_file_id"); return result; @@ -1477,7 +1482,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedMpeg4Gif(const InlineQuery InlineQueryResultCachedPhoto::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedPhoto(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedPhoto>()); result->photoFileId = data.get<string>("photo_file_id"); result->description = data.get<string>("description", ""); @@ -1499,7 +1504,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedPhoto(const InlineQueryRes InlineQueryResultCachedSticker::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedSticker(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedSticker>()); result->stickerFileId = data.get<string>("sticker_file_id"); return result; @@ -1518,7 +1523,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedSticker(const InlineQueryR } InlineQueryResultCachedVideo::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedVideo(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedVideo>()); result->videoFileId = data.get<string>("video_file_id"); result->description = data.get<string>("description", ""); @@ -1540,7 +1545,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedVideo(const InlineQueryRes InlineQueryResultCachedVoice::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultCachedVoice(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultCachedVoice>()); result->voiceFileId = data.get<string>("voice_file_id"); return result; @@ -1559,7 +1564,7 @@ std::string TgTypeParser::parseInlineQueryResultCachedVoice(const InlineQueryRes } InlineQueryResultArticle::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultArticle(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultArticle>()); result->url = data.get<string>("url", ""); result->hideUrl = data.get("hide_url", false); @@ -1588,7 +1593,7 @@ std::string TgTypeParser::parseInlineQueryResultArticle(const InlineQueryResultA } InlineQueryResultAudio::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultAudio(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultAudio>()); result->audioUrl = data.get<string>("audio_url"); result->performer = data.get<string>("performer", ""); @@ -1612,7 +1617,7 @@ std::string TgTypeParser::parseInlineQueryResultAudio(const InlineQueryResultAud InlineQueryResultContact::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultContact(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultContact>()); result->phoneNumber = data.get<string>("phone_number"); result->firstName = data.get<string>("first_name"); @@ -1644,7 +1649,7 @@ std::string TgTypeParser::parseInlineQueryResultContact(const InlineQueryResultC InlineQueryResultGame::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultGame(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultGame>()); result->gameShortName = data.get<string>("game_short_name"); return result; @@ -1663,7 +1668,7 @@ std::string TgTypeParser::parseInlineQueryResultGame(const InlineQueryResultGame } InlineQueryResultDocument::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultDocument(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultDocument>()); result->documentUrl = data.get<string>("document_url"); result->mimeType = data.get<string>("mime_type"); @@ -1692,7 +1697,7 @@ std::string TgTypeParser::parseInlineQueryResultDocument(const InlineQueryResult } InlineQueryResultLocation::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultLocation(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultLocation>()); result->latitude = data.get<float>("latitude"); result->longitude = data.get<float>("longitude"); @@ -1720,7 +1725,7 @@ std::string TgTypeParser::parseInlineQueryResultLocation(const InlineQueryResult InlineQueryResultVenue::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultVenue(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultVenue>()); result->latitude = data.get<float>("latitude"); result->longitude = data.get<float>("longitude"); @@ -1753,7 +1758,7 @@ std::string TgTypeParser::parseInlineQueryResultVenue(const InlineQueryResultVen } InlineQueryResultVoice::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultVoice(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultVoice>()); result->voiceUrl = data.get<string>("voice_url"); result->voiceDuration = data.get<int32_t>("voice_duration", 0); @@ -1774,7 +1779,7 @@ std::string TgTypeParser::parseInlineQueryResultVoice(const InlineQueryResultVoi } InlineQueryResultPhoto::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultPhoto(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultPhoto>()); result->photoUrl = data.get<string>("photo_url", ""); result->thumbUrl = data.get<string>("thumb_url"); @@ -1800,17 +1805,19 @@ std::string TgTypeParser::parseInlineQueryResultPhoto(const InlineQueryResultPho return result; } -InlineQueryResultGif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultGif(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). +InlineQueryResultGif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultGif(const ptree& data) const { + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultGif>()); result->gifUrl = data.get<string>("gif_url", ""); - result->gifWidth = data.get("gif_width", 0); - result->gifHeight = data.get("gif_height", 0); - result->gifDuration = data.get("gif_duration", 0); - result->thumbUrl = data.get<string>("thumb_url"); + result->gifWidth = data.get<int32_t>("gif_width", 0); + result->gifHeight = data.get<int32_t>("gif_height", 0); + result->gifDuration = data.get<int32_t>("gif_duration", 0); + result->thumbUrl = data.get<string>("thumb_url", ""); + result->thumbMimeType = data.get<string>("thumb_mime_type", ""); return result; } -std::string TgTypeParser::parseInlineQueryResultGif(const InlineQueryResultGif::Ptr& object) const { + +string TgTypeParser::parseInlineQueryResultGif(const InlineQueryResultGif::Ptr& object) const { if (!object){ return ""; } @@ -1822,18 +1829,20 @@ std::string TgTypeParser::parseInlineQueryResultGif(const InlineQueryResultGif:: appendToJson(result, "gif_height", object->gifHeight); appendToJson(result, "gif_duration", object->gifDuration); appendToJson(result, "thumb_url", object->thumbUrl); + appendToJson(result, "thumb_mime_type", object->thumbMimeType); // The last comma will be erased by parseInlineQueryResult(). return result; } -InlineQueryResultMpeg4Gif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultMpeg4Gif(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). +InlineQueryResultMpeg4Gif::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultMpeg4Gif(const ptree& data) const { + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultMpeg4Gif>()); - result->mpeg4Url = data.get<string>("mpeg4_url"); - result->mpeg4Width = data.get("mpeg4_width", 0); - result->mpeg4Height = data.get("mpeg4_height", 0); - result->mpeg4Duration = data.get("mpeg4_duration", 0); - result->thumbUrl = data.get<string>("thumb_url"); + result->mpeg4Url = data.get<string>("mpeg4_url", ""); + result->mpeg4Width = data.get<int32_t>("mpeg4_width", 0); + result->mpeg4Height = data.get<int32_t>("mpeg4_height", 0); + result->mpeg4Duration = data.get<int32_t>("mpeg4_duration", 0); + result->thumbUrl = data.get<string>("thumb_url", ""); + result->thumbMimeType = data.get<string>("thumb_mime_type", ""); return result; } @@ -1849,12 +1858,13 @@ std::string TgTypeParser::parseInlineQueryResultMpeg4Gif(const InlineQueryResult appendToJson(result, "mpeg4_height", object->mpeg4Height); appendToJson(result, "mpeg4_duration", object->mpeg4Duration); appendToJson(result, "thumb_url", object->thumbUrl); + appendToJson(result, "thumb_mime_type", object->thumbMimeType); // The last comma will be erased by parseInlineQueryResult(). return result; } InlineQueryResultVideo::Ptr TgTypeParser::parseJsonAndGetInlineQueryResultVideo(const boost::property_tree::ptree& data) const { - // NOTE: This function will be called by parseJsonAndGgetInlineQueryResult(). + // NOTE: This function will be called by parseJsonAndGetInlineQueryResult(). auto result(make_shared<InlineQueryResultVideo>()); result->videoUrl = data.get<string>("video_url"); result->mimeType = data.get<string>("mime_type"); |