hauke/LibTgBotPP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Hauke Zühl 2016-05-23 13:11:42 +02:00
commit 1d4125cf6a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Telegram/Sticker.h
View File

@ -17,6 +17,7 @@ namespace Telegram {
Json::Int64 width; Json::Int64 width;
Json::Int64 height; Json::Int64 height;
PhotoSize *thumb; PhotoSize *thumb;
std::string emoji;
Json::Int64 file_size; Json::Int64 file_size;
}; };
} }

1
src/Sticker.cc
View File

@ -6,5 +6,6 @@ Telegram::Sticker::Sticker(Json::Value json) {
this->width = json["width"].asInt64(); this->width = json["width"].asInt64();
this->height = json["height"].asInt64(); this->height = json["height"].asInt64();
this->thumb = new PhotoSize(json["thumb"]); this->thumb = new PhotoSize(json["thumb"]);
this->emoji = json["emoji"].asString();
this->file_size = json["file_size"].asInt64(); this->file_size = json["file_size"].asInt64();
} }

6
src/TelegramBot.cc
View File

@ -7,9 +7,9 @@
#include <curlpp/Infos.hpp> #include <curlpp/Infos.hpp>
#include <curlpp/Options.hpp> #include <curlpp/Options.hpp>
#include "Telegram/http_build_query.h" #include "http_build_query.h"
#include "Telegram/json_encode.h" #include "json_encode.h"
#include "Telegram/std.h" #include "std.h"
#include "Telegram/Message.h" #include "Telegram/Message.h"
#include "Telegram/MessageEntity.h" #include "Telegram/MessageEntity.h"