andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Support pageBlockPhoto URL.

Browse Source 
GitOrigin-RevId: 12c91546ccfe87f3fa995933dea81a705f5009c0
This commit is contained in:
levlam 2019-02-06 21:00:00 +03:00
parent 13b54369b7
commit 9d81e82721
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/generate/scheme/td_api.tl
View File

@ -759,8 +759,8 @@ pageBlockAnimation animation:animation caption:pageBlockCaption need_autoplay:Bo
//@description An audio file @audio Audio file; may be null @caption Audio file caption //@description An audio file @audio Audio file; may be null @caption Audio file caption
pageBlockAudio audio:audio caption:pageBlockCaption = PageBlock; pageBlockAudio audio:audio caption:pageBlockCaption = PageBlock;
//@description A photo @photo Photo file; may be null @caption Photo caption //@description A photo @photo Photo file; may be null @caption Photo caption @url URL associated with the photo
pageBlockPhoto photo:photo caption:pageBlockCaption = PageBlock; pageBlockPhoto photo:photo caption:pageBlockCaption url:string = PageBlock;
//@description A video @video Video file; may be null @caption Video caption @need_autoplay True, if the video should be played automatically @is_looped True, if the video should be looped //@description A video @video Video file; may be null @caption Video caption @need_autoplay True, if the video should be played automatically @is_looped True, if the video should be looped
pageBlockVideo video:video caption:pageBlockCaption need_autoplay:Bool is_looped:Bool = PageBlock; pageBlockVideo video:video caption:pageBlockCaption need_autoplay:Bool is_looped:Bool = PageBlock;

BIN
td/generate/scheme/td_api.tlo
View File

Binary file not shown.

2
td/telegram/Version.h
View File

@ -27,7 +27,7 @@ enum class Version : int32 {
AddTermsOfService, AddTermsOfService,
AddContactVcard, AddContactVcard,
AddMessageUnsupportedVersion, AddMessageUnsupportedVersion,
InstantView2_0Support, SupportInstantView2_0,
Next Next
}; };

29
td/telegram/WebPagesManager.cpp
View File

@ -469,7 +469,7 @@ class WebPagesManager::PageBlockCaption {
void parse(T &parser) { void parse(T &parser) {
using ::td::parse; using ::td::parse;
parse(text, parser); parse(text, parser);
if (parser.version() >= static_cast<int32>(Version::InstantView2_0Support)) { if (parser.version() >= static_cast<int32>(Version::SupportInstantView2_0)) {
parse(credit, parser); parse(credit, parser);
} else { } else {
credit = RichText(); credit = RichText();
@ -1097,10 +1097,13 @@ class WebPagesManager::PageBlockAnimation : public PageBlock {
class WebPagesManager::PageBlockPhoto : public PageBlock { class WebPagesManager::PageBlockPhoto : public PageBlock {
Photo photo; Photo photo;
PageBlockCaption caption; PageBlockCaption caption;
string url;
WebPageId web_page_id;
public: public:
PageBlockPhoto() = default; PageBlockPhoto() = default;
PageBlockPhoto(Photo photo, PageBlockCaption &&caption) : photo(std::move(photo)), caption(std::move(caption)) { PageBlockPhoto(Photo photo, PageBlockCaption &&caption, string &&url, WebPageId web_page_id)
: photo(std::move(photo)), caption(std::move(caption)), url(std::move(url)), web_page_id(web_page_id) {
} }
Type get_type() const override { Type get_type() const override {
@ -1114,7 +1117,7 @@ class WebPagesManager::PageBlockPhoto : public PageBlock {
tl_object_ptr<td_api::PageBlock> get_page_block_object() const override { tl_object_ptr<td_api::PageBlock> get_page_block_object() const override {
return make_tl_object<td_api::pageBlockPhoto>( return make_tl_object<td_api::pageBlockPhoto>(
get_photo_object(G()->td().get_actor_unsafe()->file_manager_.get(), &photo), get_photo_object(G()->td().get_actor_unsafe()->file_manager_.get(), &photo),
get_page_block_caption_object(caption)); get_page_block_caption_object(caption), url);
} }
template <class T> template <class T>
@ -1122,6 +1125,8 @@ class WebPagesManager::PageBlockPhoto : public PageBlock {
using ::td::store; using ::td::store;
store(photo, storer); store(photo, storer);
store(caption, storer); store(caption, storer);
store(url, storer);
store(web_page_id, storer);
} }
template <class T> template <class T>
@ -1129,6 +1134,13 @@ class WebPagesManager::PageBlockPhoto : public PageBlock {
using ::td::parse; using ::td::parse;
parse(photo, parser); parse(photo, parser);
parse(caption, parser); parse(caption, parser);
if (parser.version() >= static_cast<int32>(Version::SupportInstantView2_0)) {
parse(url, parser);
parse(web_page_id, parser);
} else {
url.clear();
web_page_id = WebPageId();
}
} }
}; };
@ -2695,8 +2707,15 @@ unique_ptr<WebPagesManager::PageBlock> WebPagesManager::get_page_block(
} else { } else {
photo = it->second; photo = it->second;
} }
return make_unique<PageBlockPhoto>(std::move(photo), string url;
get_page_block_caption(std::move(page_block->caption_), documents)); WebPageId web_page_id;
if ((page_block->flags_ & telegram_api::pageBlockPhoto::URL_MASK) != 0) {
url = std::move(page_block->url_);
web_page_id = WebPageId(page_block->webpage_id_);
}
return td::make_unique<PageBlockPhoto>(std::move(photo),
get_page_block_caption(std::move(page_block->caption_), documents),
std::move(url), web_page_id);
} }
case telegram_api::pageBlockVideo::ID: { case telegram_api::pageBlockVideo::ID: {
auto page_block = move_tl_object_as<telegram_api::pageBlockVideo>(page_block_ptr); auto page_block = move_tl_object_as<telegram_api::pageBlockVideo>(page_block_ptr);