procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Display log entry original data in HistoryMessage.

This commit is contained in:
John Preston 2017-06-20 22:48:53 +03:00
parent 4962fdf5ae
commit 839e59075d
14 changed files with 127 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View File

@ -1344,7 +1344,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
"lng_admin_log_signatures_disabled" = "{from} disabled signatures"; "lng_admin_log_signatures_disabled" = "{from} disabled signatures";
"lng_admin_log_pinned_message" = "{from} pinned message:"; "lng_admin_log_pinned_message" = "{from} pinned message:";
"lng_admin_log_edited_caption" = "{from} edited caption:"; "lng_admin_log_edited_caption" = "{from} edited caption:";
"lng_admin_log_removed_caption" = "{from} removed caption:"; "lng_admin_log_removed_caption" = "{from} removed caption";
"lng_admin_log_previous_caption" = "Original caption"; "lng_admin_log_previous_caption" = "Original caption";
"lng_admin_log_edited_message" = "{from} edited message:"; "lng_admin_log_edited_message" = "{from} edited message:";
"lng_admin_log_previous_message" = "Original message"; "lng_admin_log_previous_message" = "Original message";

21
Telegram/SourceFiles/app.cpp
View File

@ -1497,11 +1497,18 @@ namespace {
} }
WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert) { WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert) {
return App::webPageSet(webpage.vid.v, convert, webpage.has_type() ? qs(webpage.vtype) : qsl("article"), qs(webpage.vurl), qs(webpage.vdisplay_url), webpage.has_site_name() ? qs(webpage.vsite_name) : QString(), webpage.has_title() ? qs(webpage.vtitle) : QString(), webpage.has_description() ? qs(webpage.vdescription) : QString(), webpage.has_photo() ? App::feedPhoto(webpage.vphoto) : 0, webpage.has_document() ? App::feedDocument(webpage.vdocument) : 0, webpage.has_duration() ? webpage.vduration.v : 0, webpage.has_author() ? qs(webpage.vauthor) : QString(), 0); auto description = TextWithEntities { webpage.has_description() ? textClean(qs(webpage.vdescription)) : QString() };
auto siteName = webpage.has_site_name() ? qs(webpage.vsite_name) : QString();
auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
if (siteName == qstr("Twitter") || siteName == qstr("Instagram")) {
parseFlags |= TextParseHashtags | TextParseMentions;
}
textParseEntities(description.text, parseFlags, &description.entities);
return App::webPageSet(webpage.vid.v, convert, webpage.has_type() ? qs(webpage.vtype) : qsl("article"), qs(webpage.vurl), qs(webpage.vdisplay_url), siteName, webpage.has_title() ? qs(webpage.vtitle) : QString(), description, webpage.has_photo() ? App::feedPhoto(webpage.vphoto) : nullptr, webpage.has_document() ? App::feedDocument(webpage.vdocument) : nullptr, webpage.has_duration() ? webpage.vduration.v : 0, webpage.has_author() ? qs(webpage.vauthor) : QString(), 0);
} }
WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert) { WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert) {
return App::webPageSet(webpage.vid.v, convert, QString(), QString(), QString(), QString(), QString(), QString(), 0, 0, 0, QString(), webpage.vdate.v); return App::webPageSet(webpage.vid.v, convert, QString(), QString(), QString(), QString(), QString(), TextWithEntities(), nullptr, nullptr, 0, QString(), webpage.vdate.v);
} }
WebPageData *feedWebPage(const MTPWebPage &webpage) { WebPageData *feedWebPage(const MTPWebPage &webpage) {
@ -1518,6 +1525,10 @@ namespace {
return nullptr; return nullptr;
} }
WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content) {
return App::webPageSet(webPageId, nullptr, qsl("article"), QString(), QString(), siteName, QString(), content, nullptr, nullptr, 0, QString(), 0);
}
GameData *feedGame(const MTPDgame &game, GameData *convert) { GameData *feedGame(const MTPDgame &game, GameData *convert) {
return App::gameSet(game.vid.v, convert, game.vaccess_hash.v, qs(game.vshort_name), qs(game.vtitle), qs(game.vdescription), App::feedPhoto(game.vphoto), game.has_document() ? App::feedDocument(game.vdocument) : nullptr); return App::gameSet(game.vid.v, convert, game.vaccess_hash.v, qs(game.vshort_name), qs(game.vtitle), qs(game.vdescription), App::feedPhoto(game.vphoto), game.has_document() ? App::feedDocument(game.vdocument) : nullptr);
} }
@ -1778,7 +1789,7 @@ namespace {
return i.value(); return i.value();
} }
WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, PhotoData *photo, DocumentData *document, int32 duration, const QString &author, int32 pendingTill) { WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, PhotoData *photo, DocumentData *document, int32 duration, const QString &author, int32 pendingTill) {
if (convert) { if (convert) {
if (convert->id != webPage) { if (convert->id != webPage) {
auto i = webPagesData.find(convert->id); auto i = webPagesData.find(convert->id);
@ -1793,7 +1804,7 @@ namespace {
convert->displayUrl = textClean(displayUrl); convert->displayUrl = textClean(displayUrl);
convert->siteName = textClean(siteName); convert->siteName = textClean(siteName);
convert->title = textOneLine(textClean(title)); convert->title = textOneLine(textClean(title));
convert->description = textClean(description); convert->description = description;
convert->photo = photo; convert->photo = photo;
convert->document = document; convert->document = document;
convert->duration = duration; convert->duration = duration;
@ -1824,7 +1835,7 @@ namespace {
result->displayUrl = textClean(displayUrl); result->displayUrl = textClean(displayUrl);
result->siteName = textClean(siteName); result->siteName = textClean(siteName);
result->title = textOneLine(textClean(title)); result->title = textOneLine(textClean(title));
result->description = textClean(description); result->description = description;
result->photo = photo; result->photo = photo;
result->document = document; result->document = document;
result->duration = duration; result->duration = duration;

3
Telegram/SourceFiles/app.h
View File

@ -104,6 +104,7 @@ namespace App {
WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert = nullptr); WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert = nullptr);
WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert = nullptr); WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert = nullptr);
WebPageData *feedWebPage(const MTPWebPage &webpage); WebPageData *feedWebPage(const MTPWebPage &webpage);
WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content);
GameData *feedGame(const MTPDgame &game, GameData *convert = nullptr); GameData *feedGame(const MTPDgame &game, GameData *convert = nullptr);
PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded); PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded);
@ -156,7 +157,7 @@ namespace App {
DocumentData *document(const DocumentId &document); DocumentData *document(const DocumentId &document);
DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 version, int32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size, const StorageImageLocation &thumbLocation); DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 version, int32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size, const StorageImageLocation &thumbLocation);
WebPageData *webPage(const WebPageId &webPage); WebPageData *webPage(const WebPageId &webPage);
WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, PhotoData *photo, DocumentData *doc, int32 duration, const QString &author, int32 pendingTill); WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, PhotoData *photo, DocumentData *doc, int32 duration, const QString &author, int32 pendingTill);
GameData *game(const GameId &game); GameData *game(const GameId &game);
GameData *gameSet(const GameId &game, GameData *convert, const uint64 &accessHash, const QString &shortName, const QString &title, const QString &description, PhotoData *photo, DocumentData *doc); GameData *gameSet(const GameId &game, GameData *convert, const uint64 &accessHash, const QString &shortName, const QString &title, const QString &description, PhotoData *photo, DocumentData *doc);
LocationData *location(const LocationCoords &coords); LocationData *location(const LocationCoords &coords);

8
Telegram/SourceFiles/history/history_admin_log_item.cpp
View File

@ -49,7 +49,7 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, MsgId newId, int32 newDa
} break; } break;
case mtpc_message: { case mtpc_message: {
auto &data = message.c_message(); auto &data = message.c_message();
auto flags = data.vflags.v & ~(MTPDmessage::Flag::f_out | MTPDmessage::Flag::f_post | MTPDmessage::Flag::f_reply_to_msg_id); auto flags = data.vflags.v & ~(MTPDmessage::Flag::f_out | MTPDmessage::Flag::f_post | MTPDmessage::Flag::f_reply_to_msg_id | MTPDmessage::Flag::f_edit_date);
return MTP_message(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vfwd_from, data.vvia_bot_id, data.vreply_to_msg_id, MTP_int(newDate), data.vmessage, data.vmedia, data.vreply_markup, data.ventities, data.vviews, data.vedit_date); return MTP_message(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vfwd_from, data.vvia_bot_id, data.vreply_to_msg_id, MTP_int(newDate), data.vmessage, data.vmedia, data.vreply_markup, data.ventities, data.vviews, data.vedit_date);
} break; } break;
} }
@ -273,7 +273,7 @@ Item::Item(gsl::not_null<History*> history, LocalIdManager &idManager, const MTP
auto body = HistoryMessage::create(_history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(_from->id), newDescription); auto body = HistoryMessage::create(_history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(_from->id), newDescription);
if (!oldValue.isEmpty()) { if (!oldValue.isEmpty()) {
auto oldDescription = PrepareText(oldValue, QString()); auto oldDescription = PrepareText(oldValue, QString());
body->addLogEntryOriginal(lang(lng_admin_log_previous_description), oldDescription); body->addLogEntryOriginal(_id, lang(lng_admin_log_previous_description), oldDescription);
} }
addPart(body); addPart(body);
}; };
@ -294,7 +294,7 @@ Item::Item(gsl::not_null<History*> history, LocalIdManager &idManager, const MTP
auto body = HistoryMessage::create(_history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(_from->id), newLink); auto body = HistoryMessage::create(_history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(_from->id), newLink);
if (!oldValue.isEmpty()) { if (!oldValue.isEmpty()) {
auto oldLink = PrepareText(Messenger::Instance().createInternalLinkFull(oldValue), QString()); auto oldLink = PrepareText(Messenger::Instance().createInternalLinkFull(oldValue), QString());
body->addLogEntryOriginal(lang(lng_admin_log_previous_link), oldLink); body->addLogEntryOriginal(_id, lang(lng_admin_log_previous_link), oldLink);
} }
addPart(body); addPart(body);
}; };
@ -342,7 +342,7 @@ Item::Item(gsl::not_null<History*> history, LocalIdManager &idManager, const MTP
auto detachExistingItem = false; auto detachExistingItem = false;
auto body = _history->createItem(PrepareLogMessage(action.vnew_message, idManager.next(), date.v), applyServiceAction, detachExistingItem); auto body = _history->createItem(PrepareLogMessage(action.vnew_message, idManager.next(), date.v), applyServiceAction, detachExistingItem);
if (!oldValue.text.isEmpty()) { if (!oldValue.text.isEmpty()) {
body->addLogEntryOriginal(lang(canHaveCaption ? lng_admin_log_previous_caption : lng_admin_log_previous_description), oldValue); body->addLogEntryOriginal(_id, lang(canHaveCaption ? lng_admin_log_previous_caption : lng_admin_log_previous_message), oldValue);
} }
addPart(body); addPart(body);
}; };

19
Telegram/SourceFiles/history/history_item.cpp
View File

@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "history/history_service_layout.h" #include "history/history_service_layout.h"
#include "history/history_media_types.h"
#include "media/media_clip_reader.h" #include "media/media_clip_reader.h"
#include "styles/style_dialogs.h" #include "styles/style_dialogs.h"
#include "styles/style_history.h" #include "styles/style_history.h"
@ -543,9 +544,18 @@ void HistoryMessageDate::paint(Painter &p, int y, int w) const {
HistoryLayout::ServiceMessagePainter::paintDate(p, _text, _width, y, w); HistoryLayout::ServiceMessagePainter::paintDate(p, _text, _width, y, w);
} }
HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal() : _text(st::msgMinWidth - st::webPageLeft) { HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal() = default;
HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal(HistoryMessageLogEntryOriginal &&other) : _page(std::move(other._page)) {
} }
HistoryMessageLogEntryOriginal &HistoryMessageLogEntryOriginal::operator=(HistoryMessageLogEntryOriginal &&other) {
_page = std::move(other._page);
return *this;
}
HistoryMessageLogEntryOriginal::~HistoryMessageLogEntryOriginal() = default;
HistoryMediaPtr::HistoryMediaPtr(std::unique_ptr<HistoryMedia> pointer) : _pointer(std::move(pointer)) { HistoryMediaPtr::HistoryMediaPtr(std::unique_ptr<HistoryMedia> pointer) : _pointer(std::move(pointer)) {
if (_pointer) { if (_pointer) {
_pointer->attachToParent(); _pointer->attachToParent();
@ -659,13 +669,12 @@ void HistoryItem::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pres
Ui::repaintHistoryItem(this); Ui::repaintHistoryItem(this);
} }
void HistoryItem::addLogEntryOriginal(const QString &label, const TextWithEntities &content) { void HistoryItem::addLogEntryOriginal(WebPageId localId, const QString &label, const TextWithEntities &content) {
Expects(isLogEntry()); Expects(isLogEntry());
AddComponents(HistoryMessageLogEntryOriginal::Bit()); AddComponents(HistoryMessageLogEntryOriginal::Bit());
auto original = Get<HistoryMessageLogEntryOriginal>(); auto original = Get<HistoryMessageLogEntryOriginal>();
original->_label = label; auto webpage = App::feedWebPage(localId, label, content);
original->_labelWidth = st::webPageTitleFont->width(label); original->_page = std::make_unique<HistoryWebPage>(this, webpage);
original->_text.setMarkedText(st::webPageDescriptionStyle, content);
} }
void HistoryItem::destroy() { void HistoryItem::destroy() {

16
Telegram/SourceFiles/history/history_item.h
View File

@ -414,16 +414,16 @@ struct HistoryMessageUnreadBar : public RuntimeComponent<HistoryMessageUnreadBar
}; };
class HistoryWebPage;
// Special type of Component for the channel actions log. // Special type of Component for the channel actions log.
struct HistoryMessageLogEntryOriginal : public RuntimeComponent<HistoryMessageLogEntryOriginal> { struct HistoryMessageLogEntryOriginal : public RuntimeComponent<HistoryMessageLogEntryOriginal> {
HistoryMessageLogEntryOriginal(); HistoryMessageLogEntryOriginal();
HistoryMessageLogEntryOriginal(HistoryMessageLogEntryOriginal &&other);
HistoryMessageLogEntryOriginal &operator=(HistoryMessageLogEntryOriginal &&other);
~HistoryMessageLogEntryOriginal();
void paint(Painter &p, int y, int w) const; std::unique_ptr<HistoryWebPage> _page;
HistoryTextState getState(int x, int y, HistoryStateRequest request) const;
QString _label;
int _labelWidth = 0;
Text _text;
}; };
@ -520,7 +520,7 @@ public:
bool isLogEntry() const { bool isLogEntry() const {
return (id > ServerMaxMsgId); return (id > ServerMaxMsgId);
} }
void addLogEntryOriginal(const QString &label, const TextWithEntities &content); void addLogEntryOriginal(WebPageId localId, const QString &label, const TextWithEntities &content);
History *history() const { History *history() const {
return _history; return _history;
@ -868,7 +868,7 @@ public:
} }
bool isEmpty() const { bool isEmpty() const {
return _text.isEmpty() && !_media; return _text.isEmpty() && !_media && !Has<HistoryMessageLogEntryOriginal>();
} }
void clipCallback(Media::Clip::Notification notification); void clipCallback(Media::Clip::Notification notification);

14
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -3090,7 +3090,7 @@ int unitedLineHeight() {
} // namespace } // namespace
HistoryWebPage::HistoryWebPage(gsl::not_null<HistoryItem*> parent, WebPageData *data) : HistoryMedia(parent) HistoryWebPage::HistoryWebPage(gsl::not_null<HistoryItem*> parent, gsl::not_null<WebPageData*> data) : HistoryMedia(parent)
, _data(data) , _data(data)
, _title(st::msgMinWidth - st::webPageLeft) , _title(st::msgMinWidth - st::webPageLeft)
, _description(st::msgMinWidth - st::webPageLeft) { , _description(st::msgMinWidth - st::webPageLeft) {
@ -3121,7 +3121,7 @@ void HistoryWebPage::initDimensions() {
// init layout // init layout
auto title = textOneLine(_data->title.isEmpty() ? _data->author : _data->title); auto title = textOneLine(_data->title.isEmpty() ? _data->author : _data->title);
if (!_data->description.isEmpty() && title.isEmpty() && _data->siteName.isEmpty() && !_data->url.isEmpty()) { if (!_data->description.text.isEmpty() && title.isEmpty() && _data->siteName.isEmpty() && !_data->url.isEmpty()) {
_data->siteName = siteNameFromUrl(_data->url); _data->siteName = siteNameFromUrl(_data->url);
} }
if (!_data->document && _data->photo && _data->type != WebPagePhoto && _data->type != WebPageVideo) { if (!_data->document && _data->photo && _data->type != WebPagePhoto && _data->type != WebPageVideo) {
@ -3132,7 +3132,7 @@ void HistoryWebPage::initDimensions() {
} else { } else {
_asArticle = true; _asArticle = true;
} }
if (_asArticle && _data->description.isEmpty() && title.isEmpty() && _data->siteName.isEmpty()) { if (_asArticle && _data->description.text.isEmpty() && title.isEmpty() && _data->siteName.isEmpty()) {
_asArticle = false; _asArticle = false;
} }
} else { } else {
@ -3157,19 +3157,19 @@ void HistoryWebPage::initDimensions() {
} }
// init strings // init strings
if (_description.isEmpty() && !_data->description.isEmpty()) { if (_description.isEmpty() && !_data->description.text.isEmpty()) {
auto text = _data->description; auto text = _data->description;
if (!_asArticle && !_attach) { if (!_asArticle && !_attach) {
text += _parent->skipBlock(); text.text += _parent->skipBlock();
} }
const TextParseOptions *opts = &_webpageDescriptionOptions; auto opts = &_webpageDescriptionOptions;
if (_data->siteName == qstr("Twitter")) { if (_data->siteName == qstr("Twitter")) {
opts = &_twitterDescriptionOptions; opts = &_twitterDescriptionOptions;
} else if (_data->siteName == qstr("Instagram")) { } else if (_data->siteName == qstr("Instagram")) {
opts = &_instagramDescriptionOptions; opts = &_instagramDescriptionOptions;
} }
_description.setText(st::webPageDescriptionStyle, text, *opts); _description.setMarkedText(st::webPageDescriptionStyle, text, *opts);
} }
if (_title.isEmpty() && !title.isEmpty()) { if (_title.isEmpty() && !title.isEmpty()) {
if (!_asArticle && !_attach && _description.isEmpty()) { if (!_asArticle && !_attach && _description.isEmpty()) {

12
Telegram/SourceFiles/history/history_media_types.h
View File

@ -788,7 +788,7 @@ private:
class HistoryWebPage : public HistoryMedia { class HistoryWebPage : public HistoryMedia {
public: public:
HistoryWebPage(gsl::not_null<HistoryItem*> parent, WebPageData *data); HistoryWebPage(gsl::not_null<HistoryItem*> parent, gsl::not_null<WebPageData*> data);
HistoryWebPage(gsl::not_null<HistoryItem*> parent, const HistoryWebPage &other); HistoryWebPage(gsl::not_null<HistoryItem*> parent, const HistoryWebPage &other);
HistoryMediaType type() const override { HistoryMediaType type() const override {
return MediaTypeWebPage; return MediaTypeWebPage;
@ -821,13 +821,13 @@ public:
void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override; void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
bool isDisplayed() const override { bool isDisplayed() const override {
return !_data->pendingTill; return !_data->pendingTill && !_parent->Has<HistoryMessageLogEntryOriginal>();
} }
DocumentData *getDocument() override { DocumentData *getDocument() override {
return _attach ? _attach->getDocument() : 0; return _attach ? _attach->getDocument() : nullptr;
} }
Media::Clip::Reader *getClipReader() override { Media::Clip::Reader *getClipReader() override {
return _attach ? _attach->getClipReader() : 0; return _attach ? _attach->getClipReader() : nullptr;
} }
bool playInline(bool autoplay) override { bool playInline(bool autoplay) override {
return _attach ? _attach->playInline(autoplay) : false; return _attach ? _attach->playInline(autoplay) : false;
@ -842,7 +842,7 @@ public:
bool hasReplyPreview() const override; bool hasReplyPreview() const override;
ImagePtr replyPreview() override; ImagePtr replyPreview() override;
WebPageData *webpage() { gsl::not_null<WebPageData*> webpage() {
return _data; return _data;
} }
@ -867,7 +867,7 @@ private:
QMargins inBubblePadding() const; QMargins inBubblePadding() const;
int bottomInfoPadding() const; int bottomInfoPadding() const;
WebPageData *_data; gsl::not_null<WebPageData*> _data;
ClickHandlerPtr _openl; ClickHandlerPtr _openl;
std::unique_ptr<HistoryMedia> _attach; std::unique_ptr<HistoryMedia> _attach;

66
Telegram/SourceFiles/history/history_message.cpp
View File

@ -539,6 +539,17 @@ void HistoryMessage::createComponentsHelper(MTPDmessage::Flags flags, MsgId repl
} }
void HistoryMessage::updateMediaInBubbleState() { void HistoryMessage::updateMediaInBubbleState() {
auto mediaHasSomethingBelow = false;
auto mediaHasSomethingAbove = false;
auto getMediaHasSomethingAbove = [this] {
return displayFromName() || displayForwardedFrom() || Has<HistoryMessageReply>() || Has<HistoryMessageVia>();
};
if (auto entry = Get<HistoryMessageLogEntryOriginal>()) {
mediaHasSomethingBelow = true;
mediaHasSomethingAbove = getMediaHasSomethingAbove();
auto entryState = (mediaHasSomethingAbove || !emptyText() || (_media && _media->isDisplayed())) ? MediaInBubbleState::Bottom : MediaInBubbleState::None;
entry->_page->setInBubbleState(entryState);
}
if (!_media) { if (!_media) {
return; return;
} }
@ -548,22 +559,20 @@ void HistoryMessage::updateMediaInBubbleState() {
return; return;
} }
bool hasSomethingAbove = displayFromName() || displayForwardedFrom() || Has<HistoryMessageReply>() || Has<HistoryMessageVia>();
bool hasSomethingBelow = false;
if (!emptyText()) { if (!emptyText()) {
if (_media->isAboveMessage()) { if (_media->isAboveMessage()) {
hasSomethingBelow = true; mediaHasSomethingBelow = true;
} else { } else {
hasSomethingAbove = true; mediaHasSomethingAbove = true;
} }
} }
auto computeState = [hasSomethingAbove, hasSomethingBelow] { auto computeState = [mediaHasSomethingAbove, mediaHasSomethingBelow] {
if (hasSomethingAbove) { if (mediaHasSomethingAbove) {
if (hasSomethingBelow) { if (mediaHasSomethingBelow) {
return MediaInBubbleState::Middle; return MediaInBubbleState::Middle;
} }
return MediaInBubbleState::Bottom; return MediaInBubbleState::Bottom;
} else if (hasSomethingBelow) { } else if (mediaHasSomethingBelow) {
return MediaInBubbleState::Top; return MediaInBubbleState::Top;
} }
return MediaInBubbleState::None; return MediaInBubbleState::None;
@ -811,6 +820,10 @@ void HistoryMessage::initDimensions() {
_textHeight = 0; _textHeight = 0;
} }
} }
auto entry = Get<HistoryMessageLogEntryOriginal>();
if (entry) {
entry->_page->initDimensions();
}
_maxw = plainMaxWidth(); _maxw = plainMaxWidth();
_minh = emptyText() ? 0 : _text.minHeight(); _minh = emptyText() ? 0 : _text.minHeight();
@ -844,6 +857,12 @@ void HistoryMessage::initDimensions() {
} }
if (_namew > _maxw) _maxw = _namew; if (_namew > _maxw) _maxw = _namew;
} }
if (entry) {
accumulate_max(_maxw, entry->_page->maxWidth());
}
}
if (entry) {
_minh += entry->_page->minHeight();
} }
} else if (_media) { } else if (_media) {
_media->initDimensions(); _media->initDimensions();
@ -873,6 +892,13 @@ void HistoryMessage::initDimensions() {
} }
} }
bool HistoryMessage::drawBubble() const {
if (Has<HistoryMessageLogEntryOriginal>()) {
return true;
}
return _media ? (!emptyText() || _media->needsBubble()) : !isEmpty();
}
void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const { void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const {
int32 maxwidth = qMin(int(st::msgMaxWidth), _maxw), hwidth = _history->width; int32 maxwidth = qMin(int(st::msgMaxWidth), _maxw), hwidth = _history->width;
if (_media && _media->currentWidth() < maxwidth) { if (_media && _media->currentWidth() < maxwidth) {
@ -1348,6 +1374,7 @@ void HistoryMessage::draw(Painter &p, const QRect &r, TextSelection selection, T
fromNameUpdated(width); fromNameUpdated(width);
} }
auto entry = Get<HistoryMessageLogEntryOriginal>();
auto mediaDisplayed = _media && _media->isDisplayed(); auto mediaDisplayed = _media && _media->isDisplayed();
auto top = marginTop(); auto top = marginTop();
auto r = QRect(left, top, width, height - top - marginBottom()); auto r = QRect(left, top, width, height - top - marginBottom());
@ -1356,7 +1383,7 @@ void HistoryMessage::draw(Painter &p, const QRect &r, TextSelection selection, T
auto displayTail = skipTail ? RectPart::None : (outbg && !Adaptive::ChatWide()) ? RectPart::Right : RectPart::Left; auto displayTail = skipTail ? RectPart::None : (outbg && !Adaptive::ChatWide()) ? RectPart::Right : RectPart::Left;
HistoryLayout::paintBubble(p, r, _history->width, selected, outbg, displayTail); HistoryLayout::paintBubble(p, r, _history->width, selected, outbg, displayTail);
QRect trect(r.marginsAdded(-st::msgPadding)); auto trect = r.marginsAdded(-st::msgPadding);
if (mediaDisplayed && _media->isBubbleTop()) { if (mediaDisplayed && _media->isBubbleTop()) {
trect.setY(trect.y() - st::msgPadding.top()); trect.setY(trect.y() - st::msgPadding.top());
} else { } else {
@ -1368,6 +1395,9 @@ void HistoryMessage::draw(Painter &p, const QRect &r, TextSelection selection, T
if (mediaDisplayed && _media->isBubbleBottom()) { if (mediaDisplayed && _media->isBubbleBottom()) {
trect.setHeight(trect.height() + st::msgPadding.bottom()); trect.setHeight(trect.height() + st::msgPadding.bottom());
} }
if (entry) {
trect.setHeight(trect.height() - entry->_page->height());
}
auto needDrawInfo = true; auto needDrawInfo = true;
if (mediaDisplayed) { if (mediaDisplayed) {
auto mediaAboveText = _media->isAboveMessage(); auto mediaAboveText = _media->isAboveMessage();
@ -1390,6 +1420,13 @@ void HistoryMessage::draw(Painter &p, const QRect &r, TextSelection selection, T
} else { } else {
paintText(p, trect, selection); paintText(p, trect, selection);
} }
if (entry) {
auto entryLeft = r.x();
auto entryTop = trect.y() + trect.height();
p.translate(entryLeft, entryTop);
entry->_page->draw(p, r.translated(-entryLeft, -entryTop), TextSelection(), ms);
p.translate(-entryLeft, -entryTop);
}
if (needDrawInfo) { if (needDrawInfo) {
HistoryMessage::drawInfo(p, r.x() + r.width(), r.y() + r.height(), 2 * r.x() + r.width(), selected, InfoDisplayDefault); HistoryMessage::drawInfo(p, r.x() + r.width(), r.y() + r.height(), 2 * r.x() + r.width(), selected, InfoDisplayDefault);
} }
@ -1520,6 +1557,7 @@ int HistoryMessage::performResizeGetHeight(int width) {
auto forwarded = Get<HistoryMessageForwarded>(); auto forwarded = Get<HistoryMessageForwarded>();
auto reply = Get<HistoryMessageReply>(); auto reply = Get<HistoryMessageReply>();
auto via = Get<HistoryMessageVia>(); auto via = Get<HistoryMessageVia>();
auto entry = Get<HistoryMessageLogEntryOriginal>();
auto mediaDisplayed = false; auto mediaDisplayed = false;
auto mediaInBubbleState = MediaInBubbleState::None; auto mediaInBubbleState = MediaInBubbleState::None;
@ -1529,7 +1567,12 @@ int HistoryMessage::performResizeGetHeight(int width) {
} }
if (width >= _maxw) { if (width >= _maxw) {
_height = _minh; _height = _minh;
if (mediaDisplayed) _media->resizeGetHeight(_maxw); if (mediaDisplayed) {
_media->resizeGetHeight(_maxw);
}
if (entry) {
entry->_page->resizeGetHeight(_maxw);
}
} else { } else {
if (emptyText()) { if (emptyText()) {
_height = 0; _height = 0;
@ -1552,6 +1595,9 @@ int HistoryMessage::performResizeGetHeight(int width) {
} else { } else {
_height += st::msgPadding.top() + st::msgPadding.bottom(); _height += st::msgPadding.top() + st::msgPadding.bottom();
} }
if (entry) {
_height += entry->_page->resizeGetHeight(width);
}
} }
if (displayFromName()) { if (displayFromName()) {

4
Telegram/SourceFiles/history/history_message.h
View File

@ -54,9 +54,7 @@ public:
int32 plainMaxWidth() const; int32 plainMaxWidth() const;
void countPositionAndSize(int32 &left, int32 &width) const; void countPositionAndSize(int32 &left, int32 &width) const;
bool drawBubble() const { bool drawBubble() const;
return _media ? (!emptyText() || _media->needsBubble()) : !isEmpty();
}
bool hasBubble() const override { bool hasBubble() const override {
return drawBubble(); return drawBubble();
} }

8
Telegram/SourceFiles/historywidget.cpp
View File

@ -6030,20 +6030,20 @@ void HistoryWidget::updatePreview() {
QString title, desc; QString title, desc;
if (_previewData->siteName.isEmpty()) { if (_previewData->siteName.isEmpty()) {
if (_previewData->title.isEmpty()) { if (_previewData->title.isEmpty()) {
if (_previewData->description.isEmpty()) { if (_previewData->description.text.isEmpty()) {
title = _previewData->author; title = _previewData->author;
desc = ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url); desc = ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url);
} else { } else {
title = _previewData->description; title = _previewData->description.text;
desc = _previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author; desc = _previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author;
} }
} else { } else {
title = _previewData->title; title = _previewData->title;
desc = _previewData->description.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description; desc = _previewData->description.text.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description.text;
} }
} else { } else {
title = _previewData->siteName; title = _previewData->siteName;
desc = _previewData->title.isEmpty() ? (_previewData->description.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description) : _previewData->title; desc = _previewData->title.isEmpty() ? (_previewData->description.text.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description.text) : _previewData->title;
} }
if (title.isEmpty()) { if (title.isEmpty()) {
if (_previewData->document) { if (_previewData->document) {

8
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -1014,16 +1014,16 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
} }
} }
_page = (media && media->type() == MediaTypeWebPage) ? static_cast<HistoryWebPage*>(media)->webpage() : 0; _page = (media && media->type() == MediaTypeWebPage) ? static_cast<HistoryWebPage*>(media)->webpage().get() : nullptr;
if (_page) { if (_page) {
mainUrl = _page->url; mainUrl = _page->url;
if (_page->document) { if (_page->document) {
_photol.reset(new DocumentOpenClickHandler(_page->document)); _photol = MakeShared<DocumentOpenClickHandler>(_page->document);
} else if (_page->photo) { } else if (_page->photo) {
if (_page->type == WebPageProfile || _page->type == WebPageVideo) { if (_page->type == WebPageProfile || _page->type == WebPageVideo) {
_photol = MakeShared<UrlClickHandler>(_page->url); _photol = MakeShared<UrlClickHandler>(_page->url);
} else if (_page->type == WebPagePhoto || _page->siteName == qstr("Twitter") || _page->siteName == qstr("Facebook")) { } else if (_page->type == WebPagePhoto || _page->siteName == qstr("Twitter") || _page->siteName == qstr("Facebook")) {
_photol.reset(new PhotoOpenClickHandler(_page->photo)); _photol = MakeShared<PhotoOpenClickHandler>(_page->photo);
} else { } else {
_photol = MakeShared<UrlClickHandler>(_page->url); _photol = MakeShared<UrlClickHandler>(_page->url);
} }
@ -1034,7 +1034,7 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
_photol = MakeShared<UrlClickHandler>(mainUrl); _photol = MakeShared<UrlClickHandler>(mainUrl);
} }
if (from >= till && _page) { if (from >= till && _page) {
text = _page->description; text = _page->description.text;
from = 0; from = 0;
till = text.size(); till = text.size();
} }

2
Telegram/SourceFiles/structs.cpp
View File

@ -2083,7 +2083,7 @@ QString DocumentData::composeNameString(const QString &filename, const QString &
return songPerformer + QString::fromUtf8(" \xe2\x80\x93 ") + trackTitle; return songPerformer + QString::fromUtf8(" \xe2\x80\x93 ") + trackTitle;
} }
WebPageData::WebPageData(const WebPageId &id, WebPageType type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const QString &description, DocumentData *document, PhotoData *photo, int32 duration, const QString &author, int32 pendingTill) : id(id) WebPageData::WebPageData(const WebPageId &id, WebPageType type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, DocumentData *document, PhotoData *photo, int32 duration, const QString &author, int32 pendingTill) : id(id)
, type(type) , type(type)
, url(url) , url(url)
, displayUrl(displayUrl) , displayUrl(displayUrl)

5
Telegram/SourceFiles/structs.h
View File

@ -1537,7 +1537,7 @@ inline WebPageType toWebPageType(const QString &type) {
} }
struct WebPageData { struct WebPageData {
WebPageData(const WebPageId &id, WebPageType type = WebPageArticle, const QString &url = QString(), const QString &displayUrl = QString(), const QString &siteName = QString(), const QString &title = QString(), const QString &description = QString(), DocumentData *doc = nullptr, PhotoData *photo = nullptr, int32 duration = 0, const QString &author = QString(), int32 pendingTill = -1); WebPageData(const WebPageId &id, WebPageType type = WebPageArticle, const QString &url = QString(), const QString &displayUrl = QString(), const QString &siteName = QString(), const QString &title = QString(), const TextWithEntities &description = TextWithEntities(), DocumentData *doc = nullptr, PhotoData *photo = nullptr, int32 duration = 0, const QString &author = QString(), int32 pendingTill = -1);
void forget() { void forget() {
if (document) document->forget(); if (document) document->forget();
@ -1546,7 +1546,8 @@ struct WebPageData {
WebPageId id; WebPageId id;
WebPageType type; WebPageType type;
QString url, displayUrl, siteName, title, description; QString url, displayUrl, siteName, title;
TextWithEntities description;
int32 duration; int32 duration;
QString author; QString author;
PhotoData *photo; PhotoData *photo;