summaryrefslogtreecommitdiff
path: root/include/tgbot/Api.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/tgbot/Api.h')
-rw-r--r--include/tgbot/Api.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
index b6be878..cba4b56 100644
--- a/include/tgbot/Api.h
+++ b/include/tgbot/Api.h
@@ -66,11 +66,18 @@ public:
* @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.
+<<<<<<< HEAD
+ * @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.
+ * @return On success, the sent message is returned.
+ */
+ Message::Ptr sendMessage(int64_t chatId, const std::string& text, bool disableWebPagePreview = false, int32_t replyToMessageId = 0, const GenericReply::Ptr& replyMarkup = GenericReply::Ptr(), const std::string& parseMode = "") const;
+=======
* @param disableNotification Optional. Sends the message silenty.
* @return On success, the sent message is returned.
*/
Message::Ptr sendMessage(int64_t chatId, const std::string& text, bool disableWebPagePreview = false,
int32_t replyToMessageId = 0,const GenericReply::Ptr& replyMarkup = GenericReply::Ptr(), bool disableNotification = false) const;
+>>>>>>> 9ba69d7e87c9b8ff9997294b68550852ef0274b8
/**
* Use this method to forward messages of any kind.