diff options
| -rw-r--r-- | include/tgbot/Api.h | 7 | ||||
| -rw-r--r-- | src/Api.cpp | 7 |
2 files changed, 14 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. diff --git a/src/Api.cpp b/src/Api.cpp index 8fcef97..af5e83c 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -38,7 +38,11 @@ User::Ptr Api::getMe() const { return TgTypeParser::getInstance().parseJsonAndGetUser(sendRequest("getMe")); } +<<<<<<< HEAD +Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWebPagePreview, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup, const string& parseMode) const { +======= Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWebPagePreview, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup, bool disableNotification) const { +>>>>>>> 9ba69d7e87c9b8ff9997294b68550852ef0274b8 vector<HttpReqArg> args; args.push_back(HttpReqArg("chat_id", chatId)); args.push_back(HttpReqArg("text", text)); @@ -54,6 +58,9 @@ Message::Ptr Api::sendMessage(int64_t chatId, const string& text, bool disableWe if (replyMarkup) { args.push_back(HttpReqArg("reply_markup", TgTypeParser::getInstance().parseGenericReply(replyMarkup))); } + if (!parseMode.empty()) { + args.push_back(HttpReqArg("parse_mode", parseMode)); + } return TgTypeParser::getInstance().parseJsonAndGetMessage(sendRequest("sendMessage", args)); } |