diff options
| -rw-r--r-- | include/tgbot/Api.h | 4 | ||||
| -rw-r--r-- | src/Api.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h index b9717ba..2b73d31 100644 --- a/include/tgbot/Api.h +++ b/include/tgbot/Api.h @@ -214,7 +214,7 @@ public: * @return On success, the sent Message is returned. */ Message::Ptr sendInvoice(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> prices, + const std::string& providerToken, const std::string& startParameter, const std::string& currency, const std::vector<LabeledPrice>& prices, const std::string& providerData = "", const std::string& photoUrl = "", int32_t photoSize = 0, int32_t photoWidth = 0, int32_t photoHeight = 0, bool needName = false, bool needPhoneNumber = false, bool needEmail = false, bool needShippingAddress = false, @@ -232,7 +232,7 @@ public: * @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> shippingOptions = nullptr, const std::string& errorMessage = "") const; + bool answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption>& shippingOptions = std::vector<ShippingOption>(), const std::string& errorMessage = "") const; /** * @brief Use this method to respond to such pre-checkout queries. diff --git a/src/Api.cpp b/src/Api.cpp index cd9fac8..de697df 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -229,7 +229,7 @@ Message::Ptr Api::sendDocument(int64_t chatId, const string& document, const str return TgTypeParser::getInstance().parseJsonAndGetMessage(sendRequest("sendDocument", args)); } -Message::Ptr sendInvoice(int64_t chatId, const std::string& title, const std::string& description, const std::string& payload, +Message::Ptr Api::sendInvoice(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>& prices, const std::string& providerData, const std::string& photoUrl, int32_t photoSize, int32_t photoWidth, int32_t photoHeight, bool needName, @@ -294,12 +294,12 @@ Message::Ptr sendInvoice(int64_t chatId, const std::string& title, const std::st return TgTypeParser::getInstance().parseJsonAndGetMessage(sendRequest("sendInvoice", args)); } -bool answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption>& shippingOptions, const std::string& errorMessage) const { +bool Api::answerShippingQuery(const std::string& shippingQueryId, bool ok, const std::vector<ShippingOption>& 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 != nullptr) { + if (!shippingOptions.empty()) { args.emplace_back("shipping_options", TgTypeParser::getInstance().parseArray<ShippingOption>(&TgTypeParser::parseShippingOption, shippingOptions)); } if (!errorMessage.empty()) { @@ -308,10 +308,10 @@ bool answerShippingQuery(const std::string& shippingQueryId, bool ok, const std: return sendRequest("answerShippingQuery", args).get<bool>("", false); } -bool answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage) const { +bool Api::answerPreCheckoutQuery(const std::string& preCheckoutQueryId, bool ok, const std::string& errorMessage) const { vector<HttpReqArg> args; args.reserve(3); - args.emplace_back("shipping_query_id", shippingQueryId); + args.emplace_back("pre_checkout_query_id", preCheckoutQueryId); args.emplace_back("ok", ok); if (!errorMessage.empty()) { args.emplace_back("error_message", errorMessage); |