diff options
| author | Oleg Morozenkov <omorozenkov@gmail.com> | 2016-04-17 23:58:20 +0300 |
|---|---|---|
| committer | Oleg Morozenkov <omorozenkov@gmail.com> | 2016-04-17 23:58:20 +0300 |
| commit | 5f2ea8897acf29523264dff8108ad483324138e4 (patch) | |
| tree | 925b72103c964a5bc0aea320a181f37229550ee8 /src | |
| parent | 53418361401958da5cfa3741a8f79687e103c94a (diff) | |
| parent | 4bb860175371969088fcb13f2c7bdb18e3cfdfce (diff) | |
Merge pull request #23 from aadeg/master
Fixed compilation errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/Api.cpp | 2 | ||||
| -rw-r--r-- | src/TgTypeParser.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Api.cpp b/src/Api.cpp index c882304..af5e83c 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -314,7 +314,7 @@ Message::Ptr Api::sendLocation(int64_t chatId, float latitude, float longitude, return TgTypeParser::getInstance().parseJsonAndGetMessage(sendRequest("sendLocation", args)); } -Message::Ptr Api::sendVenue(int64_t chatId, float latitude, float longitude, std::string title, std::string address, std::string foursquareId, bool disableNotification, int32_t replyToMessageId = 0, const GenericReply::Ptr& replyMarkup) const { +Message::Ptr Api::sendVenue(int64_t chatId, float latitude, float longitude, std::string title, std::string address, std::string foursquareId, bool disableNotification, int32_t replyToMessageId, const GenericReply::Ptr& replyMarkup) const { vector<HttpReqArg> args; args.push_back(HttpReqArg("chat_id", chatId)); args.push_back(HttpReqArg("latitude", latitude)); diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp index f58bca5..05a287d 100644 --- a/src/TgTypeParser.cpp +++ b/src/TgTypeParser.cpp @@ -119,8 +119,8 @@ Message::Ptr TgTypeParser::parseJsonAndGetMessage(const ptree& data) const { result->video = tryParseJson<Video>(&TgTypeParser::parseJsonAndGetVideo, data, "video"); result->contact = tryParseJson<Contact>(&TgTypeParser::parseJsonAndGetContact, data, "contact"); result->location = tryParseJson<Location>(&TgTypeParser::parseJsonAndGetLocation, data, "location"); - result->newChatParticipant = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "new_chat_participant"); - result->leftChatParticipant = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "left_chat_participant"); + result->newChatMember = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "new_chat_participant"); + result->leftChatMember = tryParseJson<User>(&TgTypeParser::parseJsonAndGetUser, data, "left_chat_participant"); result->newChatTitle = data.get("new_chat_title", ""); result->newChatPhoto = parseJsonAndGetArray<PhotoSize>(&TgTypeParser::parseJsonAndGetPhotoSize, data, "new_chat_photo"); result->deleteChatPhoto = data.get("delete_chat_photo", false); @@ -154,8 +154,8 @@ string TgTypeParser::parseMessage(const Message::Ptr& object) const { appendToJson(result, "video", parseVideo(object->video)); appendToJson(result, "contact", parseContact(object->contact)); appendToJson(result, "location", parseLocation(object->location)); - appendToJson(result, "new_chat_participant", parseUser(object->newChatParticipant)); - appendToJson(result, "left_chat_participant", parseUser(object->leftChatParticipant)); + appendToJson(result, "new_chat_member", parseUser(object->newChatMember)); + appendToJson(result, "left_chat_member", parseUser(object->leftChatMember)); appendToJson(result, "new_chat_title", object->newChatTitle); appendToJson(result, "new_chat_photo", parseArray(&TgTypeParser::parsePhotoSize, object->newChatPhoto)); appendToJson(result, "delete_chat_photo", object->deleteChatPhoto); |