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

moved forwarded to an interface, testing required

This commit is contained in:
John Preston 2016-02-18 22:12:50 +03:00
parent 803d1a429d
commit c3845ead85
9 changed files with 316 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/app.cpp
View File

@ -951,7 +951,7 @@ namespace App {
} }
void checkSavedGif(HistoryItem *item) { void checkSavedGif(HistoryItem *item) {
if (!item->toHistoryForwarded() && (item->out() || item->history()->peer == App::self())) { if (!item->Is<HistoryMessageForwarded>() && (item->out() || item->history()->peer == App::self())) {
if (HistoryMedia *media = item->getMedia()) { if (HistoryMedia *media = item->getMedia()) {
if (DocumentData *doc = media->getDocument()) { if (DocumentData *doc = media->getDocument()) {
if (doc->isGifv()) { if (doc->isGifv()) {

491
Telegram/SourceFiles/history.cpp
View File

@ -81,12 +81,6 @@ namespace {
inline const HistoryReply *toHistoryReply(const HistoryItem *item) { inline const HistoryReply *toHistoryReply(const HistoryItem *item) {
return item ? item->toHistoryReply() : 0; return item ? item->toHistoryReply() : 0;
} }
inline HistoryForwarded *toHistoryForwarded(HistoryItem *item) {
return item ? item->toHistoryForwarded() : 0;
}
inline const HistoryForwarded *toHistoryForwarded(const HistoryItem *item) {
return item ? item->toHistoryForwarded() : 0;
}
inline const TextParseOptions &itemTextOptions(HistoryItem *item) { inline const TextParseOptions &itemTextOptions(HistoryItem *item) {
return itemTextOptions(item->history(), item->author()); return itemTextOptions(item->history(), item->author());
} }
@ -1385,13 +1379,11 @@ HistoryItem *History::createItem(HistoryBlock *block, const MTPMessage &msg, boo
QString text(lng_message_unsupported(lt_link, qsl("https://desktop.telegram.org"))); QString text(lng_message_unsupported(lt_link, qsl("https://desktop.telegram.org")));
EntitiesInText entities = textParseEntities(text, _historyTextNoMonoOptions.flags); EntitiesInText entities = textParseEntities(text, _historyTextNoMonoOptions.flags);
entities.push_front(EntityInText(EntityInTextItalic, 0, text.size())); entities.push_front(EntityInText(EntityInTextItalic, 0, text.size()));
result = new HistoryMessage(this, block, m.vid.v, m.vflags.v, m.vvia_bot_id.v, date(m.vdate), m.vfrom_id.v, text, entities, -1, 0); result = new HistoryMessage(this, block, m.vid.v, m.vflags.v, m.vvia_bot_id.v, date(m.vdate), m.vfrom_id.v, text, entities);
} else if (badMedia) { } else if (badMedia) {
result = new HistoryServiceMsg(this, block, m.vid.v, date(m.vdate), lang(lng_message_empty), m.vflags.v, 0, m.has_from_id() ? m.vfrom_id.v : 0); result = new HistoryServiceMsg(this, block, m.vid.v, date(m.vdate), lang(lng_message_empty), m.vflags.v, 0, m.has_from_id() ? m.vfrom_id.v : 0);
} else { } else {
if (m.has_fwd_from() && m.vfwd_from.type() == mtpc_messageFwdHeader) { if (m.has_reply_to_msg_id() && m.vreply_to_msg_id.v > 0) {
result = new HistoryForwarded(this, block, m, m.vfwd_from.c_messageFwdHeader());
} else if (m.has_reply_to_msg_id() && m.vreply_to_msg_id.v > 0) {
result = new HistoryReply(this, block, m); result = new HistoryReply(this, block, m);
} else { } else {
result = new HistoryMessage(this, block, m); result = new HistoryMessage(this, block, m);
@ -1533,7 +1525,7 @@ HistoryItem *History::createItem(HistoryBlock *block, const MTPMessage &msg, boo
} }
HistoryItem *History::createItemForwarded(HistoryBlock *block, MsgId id, int32 flags, QDateTime date, int32 from, HistoryMessage *msg) { HistoryItem *History::createItemForwarded(HistoryBlock *block, MsgId id, int32 flags, QDateTime date, int32 from, HistoryMessage *msg) {
return regItem(new HistoryForwarded(this, block, id, flags, date, from, msg)); return regItem(new HistoryMessage(this, block, id, flags, date, from, msg));
} }
HistoryItem *History::createItemDocument(HistoryBlock *block, MsgId id, int32 flags, int32 viaBotId, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc, const QString &caption) { HistoryItem *History::createItemDocument(HistoryBlock *block, MsgId id, int32 flags, int32 viaBotId, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc, const QString &caption) {
@ -5781,7 +5773,7 @@ void HistoryImageLink::initDimensions(const HistoryItem *parent) {
_minh += st::mediaPadding.top() + st::mediaPadding.bottom(); _minh += st::mediaPadding.top() + st::mediaPadding.bottom();
if (!_title.isEmpty() || !_description.isEmpty()) { if (!_title.isEmpty() || !_description.isEmpty()) {
_minh += st::webPagePhotoSkip; _minh += st::webPagePhotoSkip;
if (!parent->toHistoryForwarded() && !parent->toHistoryReply()) { if (!parent->Is<HistoryMessageForwarded>() && !parent->toHistoryReply()) {
_minh += st::msgPadding.top(); _minh += st::msgPadding.top();
} }
} }
@ -5821,7 +5813,7 @@ int32 HistoryImageLink::resize(int32 width, const HistoryItem *parent) {
} }
if (!_title.isEmpty() || !_description.isEmpty()) { if (!_title.isEmpty() || !_description.isEmpty()) {
_height += st::webPagePhotoSkip; _height += st::webPagePhotoSkip;
if (!parent->toHistoryForwarded() && !parent->toHistoryReply()) { if (!parent->Is<HistoryMessageForwarded>() && !parent->toHistoryReply()) {
_height += st::msgPadding.top(); _height += st::msgPadding.top();
} }
} }
@ -5840,7 +5832,7 @@ void HistoryImageLink::draw(Painter &p, const HistoryItem *parent, const QRect &
skipy = st::mediaPadding.top(); skipy = st::mediaPadding.top();
if (!_title.isEmpty() || !_description.isEmpty()) { if (!_title.isEmpty() || !_description.isEmpty()) {
if (!parent->toHistoryForwarded() && !parent->toHistoryReply()) { if (!parent->Is<HistoryMessageForwarded>() && !parent->toHistoryReply()) {
skipy += st::msgPadding.top(); skipy += st::msgPadding.top();
} }
} }
@ -5903,7 +5895,7 @@ void HistoryImageLink::getState(TextLinkPtr &lnk, HistoryCursorState &state, int
skipy = st::mediaPadding.top(); skipy = st::mediaPadding.top();
if (!_title.isEmpty() || !_description.isEmpty()) { if (!_title.isEmpty() || !_description.isEmpty()) {
if (!parent->toHistoryForwarded() && !parent->toHistoryReply()) { if (!parent->Is<HistoryMessageForwarded>() && !parent->toHistoryReply()) {
skipy += st::msgPadding.top(); skipy += st::msgPadding.top();
} }
} }
@ -5976,34 +5968,28 @@ void ViaInlineBotLink::onClick(Qt::MouseButton button) const {
} }
HistoryMessageVia::HistoryMessageVia(Interfaces *) HistoryMessageVia::HistoryMessageVia(Interfaces *)
: bot(0) : _bot(0)
, width(0) , _width(0)
, maxWidth(0) { , _maxWidth(0) {
} }
void HistoryMessageVia::create(int32 userId) { void HistoryMessageVia::create(int32 userId) {
bot = App::userLoaded(peerFromUser(userId)); _bot = App::user(peerFromUser(userId));
if (bot) { _maxWidth = st::msgServiceNameFont->width(lng_inline_bot_via(lt_inline_bot, '@' + _bot->username));
maxWidth = st::msgServiceNameFont->width(lng_inline_bot_via(lt_inline_bot, '@' + bot->username)); _lnk.reset(new ViaInlineBotLink(_bot));
lnk.reset(new ViaInlineBotLink(bot));
}
}
bool HistoryMessageVia::isNull() const {
return !bot || bot->username.isEmpty();
} }
void HistoryMessageVia::resize(int32 availw) const { void HistoryMessageVia::resize(int32 availw) const {
if (availw < 0) { if (availw < 0) {
text = QString(); _text = QString();
width = 0; _width = 0;
} else { } else {
text = lng_inline_bot_via(lt_inline_bot, '@' + bot->username); _text = lng_inline_bot_via(lt_inline_bot, '@' + _bot->username);
if (availw < maxWidth) { if (availw < _maxWidth) {
text = st::msgServiceNameFont->elided(text, availw); _text = st::msgServiceNameFont->elided(_text, availw);
width = st::msgServiceNameFont->width(text); _width = st::msgServiceNameFont->width(_text);
} else if (width < maxWidth) { } else if (_width < _maxWidth) {
width = maxWidth; _width = _maxWidth;
} }
} }
} }
@ -6029,29 +6015,66 @@ int32 HistoryMessageSigned::maxWidth() const {
return _signature.maxWidth(); return _signature.maxWidth();
} }
HistoryMessageForwarded::HistoryMessageForwarded(Interfaces *)
: _authorOriginal(0)
, _fromOriginal(0)
, _authorOriginalVersion(0)
, _fromWidth(st::msgServiceFont->width(lang(lng_forwarded_from)) + st::msgServiceFont->spacew) {
}
void HistoryMessageForwarded::authorNameUpdated(bool hasVia) const {
QString name((hasVia && _authorOriginal->isUser()) ? _authorOriginal->asUser()->firstName : App::peerName(_authorOriginal));
_authorOriginalName.setText(st::msgServiceNameFont, name, _textNameOptions);
_authorOriginalVersion = _authorOriginal->nameVersion;
}
HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, const MTPDmessage &msg) :
HistoryItem(history, block, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0) HistoryItem(history, block, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0)
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(0) {
create(msg.has_via_bot_id() ? msg.vvia_bot_id.v : 0, msg.has_views() ? msg.vviews.v : -1); PeerId fwdAuthorId = 0, fwdFromId = 0;
if (msg.has_fwd_from() && msg.vfwd_from.type() == mtpc_messageFwdHeader) {
const MTPDmessageFwdHeader &f(msg.vfwd_from.c_messageFwdHeader());
if (f.has_from_id() || f.has_channel_id()) {
fwdAuthorId = f.has_channel_id() ? peerFromChannel(f.vchannel_id) : peerFromUser(f.vfrom_id);
fwdFromId = f.has_from_id() ? peerFromUser(f.vfrom_id) : peerFromChannel(f.vchannel_id);
}
}
create(msg.has_via_bot_id() ? msg.vvia_bot_id.v : 0, msg.has_views() ? msg.vviews.v : -1, fwdAuthorId, fwdFromId);
QString text(textClean(qs(msg.vmessage))); QString text(textClean(qs(msg.vmessage)));
initMedia(msg.has_media() ? (&msg.vmedia) : 0, text); initMedia(msg.has_media() ? (&msg.vmedia) : 0, text);
setText(text, msg.has_entities() ? entitiesFromMTP(msg.ventities.c_vector().v) : EntitiesInText()); setText(text, msg.has_entities() ? entitiesFromMTP(msg.ventities.c_vector().v) : EntitiesInText());
} }
HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, const QString &msg, const EntitiesInText &entities, int32 fromViews, HistoryMedia *fromMedia) : HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId id, int32 flags, QDateTime date, int32 from, HistoryMessage *fwd)
HistoryItem(history, block, msgId, flags, date, (flags & MTPDmessage::flag_from_id) ? from : 0) : HistoryItem(history, block, id, newForwardedFlags(history->peer, from, fwd) | flags, date, from)
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(0) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, (fromViews > 0) ? fromViews : (isPost() ? 1 : -1)); UserData *fwdViaBot = fwd->viaBot();
if (fromMedia) { int32 viaBotId = fwdViaBot ? peerToUser(fwdViaBot->id) : 0;
_media = fromMedia->clone(); int32 fwdViewsCount = fwd->viewsCount(), views = (fwdViewsCount > 0) ? fwdViewsCount : (isPost() ? 1 : -1);
create(viaBotId, views, fwd->authorOriginal()->id, fwd->fromOriginal()->id);
if (HistoryMedia *mediaOriginal = fwd->getMedia()) {
_media = mediaOriginal->clone();
_media->regItem(this); _media->regItem(this);
} }
setText(fwd->originalText(), fwd->originalEntities());
}
HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId id, int32 flags, int32 viaBotId, QDateTime date, int32 from, const QString &msg, const EntitiesInText &entities)
: HistoryItem(history, block, id, flags, date, (flags & MTPDmessage::flag_from_id) ? from : 0)
, _text(st::msgMinWidth)
, _textWidth(0)
, _textHeight(0)
, _media(0) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1, 0, 0);
setText(msg, entities); setText(msg, entities);
} }
@ -6061,7 +6084,8 @@ HistoryItem(history, block, msgId, flags, date, (flags & MTPDmessage::flag_from_
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(0) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1); create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1, 0, 0);
initMediaFromDocument(doc, caption); initMediaFromDocument(doc, caption);
setText(QString(), EntitiesInText()); setText(QString(), EntitiesInText());
} }
@ -6072,13 +6096,14 @@ HistoryItem(history, block, msgId, flags, date, (flags & MTPDmessage::flag_from_
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(0) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1); create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1, 0, 0);
_media = new HistoryPhoto(photo, caption, this); _media = new HistoryPhoto(photo, caption, this);
_media->regItem(this); _media->regItem(this);
setText(QString(), EntitiesInText()); setText(QString(), EntitiesInText());
} }
void HistoryMessage::create(int32 viaBotId, int32 viewsCount) { void HistoryMessage::create(int32 viaBotId, int32 viewsCount, const PeerId &authorIdOriginal, const PeerId &fromIdOriginal) {
uint64 mask = 0; uint64 mask = 0;
if (viaBotId) { if (viaBotId) {
mask |= HistoryMessageVia::Bit(); mask |= HistoryMessageVia::Bit();
@ -6089,6 +6114,12 @@ void HistoryMessage::create(int32 viaBotId, int32 viewsCount) {
if (isPost() && _from->isUser()) { if (isPost() && _from->isUser()) {
mask |= HistoryMessageSigned::Bit(); mask |= HistoryMessageSigned::Bit();
} }
if (authorIdOriginal && fromIdOriginal) {
mask |= HistoryMessageForwarded::Bit();
if (authorIdOriginal != fromIdOriginal) {
mask |= HistoryMessageSigned::Bit();
}
}
UpdateInterfaces(mask); UpdateInterfaces(mask);
if (HistoryMessageVia *via = Get<HistoryMessageVia>()) { if (HistoryMessageVia *via = Get<HistoryMessageVia>()) {
via->create(viaBotId); via->create(viaBotId);
@ -6099,6 +6130,10 @@ void HistoryMessage::create(int32 viaBotId, int32 viewsCount) {
if (HistoryMessageSigned *msgsigned = Get<HistoryMessageSigned>()) { if (HistoryMessageSigned *msgsigned = Get<HistoryMessageSigned>()) {
msgsigned->create(_from->asUser(), date); msgsigned->create(_from->asUser(), date);
} }
if (HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>()) {
fwd->_authorOriginal = App::peer(authorIdOriginal);
fwd->_fromOriginal = App::peer(fromIdOriginal);
}
initTime(); initTime();
} }
@ -6201,6 +6236,12 @@ int32 HistoryMessage::plainMaxWidth() const {
void HistoryMessage::initDimensions() { void HistoryMessage::initDimensions() {
if (drawBubble()) { if (drawBubble()) {
HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
HistoryMessageVia *via = Get<HistoryMessageVia>();
if (fwd) {
fwd->authorNameUpdated(via != 0);
}
if (_media) { if (_media) {
_media->initDimensions(this); _media->initDimensions(this);
if (_media->isDisplayed()) { if (_media->isDisplayed()) {
@ -6230,15 +6271,22 @@ void HistoryMessage::initDimensions() {
if (!_media) { if (!_media) {
if (displayFromName()) { if (displayFromName()) {
int32 namew = st::msgPadding.left() + author()->nameText.maxWidth() + st::msgPadding.right(); int32 namew = st::msgPadding.left() + author()->nameText.maxWidth() + st::msgPadding.right();
if (via() && !toHistoryForwarded()) { if (via && !fwd) {
namew += st::msgServiceFont->spacew + via()->maxWidth; namew += st::msgServiceFont->spacew + via->_maxWidth;
} }
if (namew > _maxw) _maxw = namew; if (namew > _maxw) _maxw = namew;
} else if (via() && !toHistoryForwarded()) { } else if (via && !fwd) {
if (st::msgPadding.left() + via()->maxWidth + st::msgPadding.right() > _maxw) { if (st::msgPadding.left() + via->_maxWidth + st::msgPadding.right() > _maxw) {
_maxw = st::msgPadding.left() + via()->maxWidth + st::msgPadding.right(); _maxw = st::msgPadding.left() + via->_maxWidth + st::msgPadding.right();
} }
} }
if (fwd) {
int32 _namew = st::msgPadding.left() + fwd->_fromWidth + fwd->_authorOriginalName.maxWidth() + st::msgPadding.right();
if (via) {
_namew += st::msgServiceFont->spacew + via->_maxWidth;
}
if (_namew > _maxw) _maxw = _namew;
}
} }
} else { } else {
_media->initDimensions(this); _media->initDimensions(this);
@ -6275,9 +6323,9 @@ void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const {
void HistoryMessage::fromNameUpdated(int32 width) const { void HistoryMessage::fromNameUpdated(int32 width) const {
_authorNameVersion = author()->nameVersion; _authorNameVersion = author()->nameVersion;
if (drawBubble() && displayFromName()) { if (!Is<HistoryMessageForwarded>()) {
if (via() && !toHistoryForwarded()) { if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) {
via()->resize(width - st::msgPadding.left() - st::msgPadding.right() - author()->nameText.maxWidth() - st::msgServiceFont->spacew); via->resize(width - st::msgPadding.left() - st::msgPadding.right() - author()->nameText.maxWidth() - st::msgServiceFont->spacew);
} }
} }
} }
@ -6315,13 +6363,24 @@ void HistoryMessage::eraseFromOverview() {
} }
QString HistoryMessage::selectedText(uint32 selection) const { QString HistoryMessage::selectedText(uint32 selection) const {
QString result;
if (_media && selection == FullSelection) { if (_media && selection == FullSelection) {
QString text = _text.original(0, 0xFFFF, Text::ExpandLinksAll), mediaText = _media->inHistoryText(); QString text = _text.original(0, 0xFFFF, Text::ExpandLinksAll), mediaText = _media->inHistoryText();
return text.isEmpty() ? mediaText : (mediaText.isEmpty() ? text : (text + ' ' + mediaText)); result = text.isEmpty() ? mediaText : (mediaText.isEmpty() ? text : (text + ' ' + mediaText));
} else {
uint16 selectedFrom = (selection == FullSelection) ? 0 : ((selection >> 16) & 0xFFFF);
uint16 selectedTo = (selection == FullSelection) ? 0xFFFF : (selection & 0xFFFF);
result = _text.original(selectedFrom, selectedTo, Text::ExpandLinksAll);
} }
uint16 selectedFrom = (selection == FullSelection) ? 0 : ((selection >> 16) & 0xFFFF); if (const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>()) {
uint16 selectedTo = (selection == FullSelection) ? 0xFFFF : (selection & 0xFFFF); if (selection == FullSelection) {
return _text.original(selectedFrom, selectedTo, Text::ExpandLinksAll); QString wrapped;
wrapped.reserve(lang(lng_forwarded_from).size() + fwd->_authorOriginal->name.size() + 4 + result.size());
wrapped.append('[').append(lang(lng_forwarded_from)).append(' ').append(fwd->_authorOriginal->name).append(qsl("]\n")).append(result);
result = wrapped;
}
}
return result;
} }
QString HistoryMessage::inDialogsText() const { QString HistoryMessage::inDialogsText() const {
@ -6520,9 +6579,6 @@ void HistoryMessage::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
int32 left = 0, width = 0; int32 left = 0, width = 0;
countPositionAndSize(left, width); countPositionAndSize(left, width);
if (author()->nameVersion > _authorNameVersion) {
fromNameUpdated(width);
}
if (displayFromPhoto()) { if (displayFromPhoto()) {
int32 photoleft = left + ((outbg && !Adaptive::Wide()) ? (width + (st::msgPhotoSkip - st::msgPhotoSize)) : (-st::msgPhotoSkip)); int32 photoleft = left + ((outbg && !Adaptive::Wide()) ? (width + (st::msgPhotoSkip - st::msgPhotoSize)) : (-st::msgPhotoSkip));
@ -6531,6 +6587,18 @@ void HistoryMessage::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
if (width < 1) return; if (width < 1) return;
if (bubble) { if (bubble) {
const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
const HistoryMessageVia *via = Get<HistoryMessageVia>();
if (displayFromName() && author()->nameVersion > _authorNameVersion) {
fromNameUpdated(width);
}
if (fwd && fwd->_authorOriginal->nameVersion > fwd->_authorOriginalVersion) {
fwd->authorNameUpdated(via != 0);
if (via) {
via->resize(width - st::msgPadding.left() - st::msgPadding.right() - fwd->_fromWidth - fwd->_authorOriginalName.maxWidth() - st::msgServiceFont->spacew);
}
}
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom()); QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
style::color bg(selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg)); style::color bg(selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg));
@ -6546,9 +6614,9 @@ void HistoryMessage::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
p.setPen(author()->color); p.setPen(author()->color);
} }
author()->nameText.drawElided(p, r.left() + st::msgPadding.left(), r.top() + st::msgPadding.top(), width - st::msgPadding.left() - st::msgPadding.right()); author()->nameText.drawElided(p, r.left() + st::msgPadding.left(), r.top() + st::msgPadding.top(), width - st::msgPadding.left() - st::msgPadding.right());
if (via() && !toHistoryForwarded() && width > st::msgPadding.left() + st::msgPadding.right() + author()->nameText.maxWidth() + st::msgServiceFont->spacew) { if (via && !fwd && width > st::msgPadding.left() + st::msgPadding.right() + author()->nameText.maxWidth() + st::msgServiceFont->spacew) {
p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg)); p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
p.drawText(r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew, r.top() + st::msgPadding.top() + st::msgServiceFont->ascent, via()->text); p.drawText(r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew, r.top() + st::msgPadding.top() + st::msgServiceFont->ascent, via->_text);
} }
r.setTop(r.top() + st::msgNameFont->height); r.setTop(r.top() + st::msgNameFont->height);
} }
@ -6580,14 +6648,21 @@ void HistoryMessage::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
} }
void HistoryMessage::drawMessageText(Painter &p, QRect trect, uint32 selection) const { void HistoryMessage::drawMessageText(Painter &p, QRect trect, uint32 selection) const {
bool outbg = out() && !isPost(), selected = (selection == FullSelection); if (displayForwardedFrom()) {
if (!displayFromName() && via() && !toHistoryForwarded()) { paintForwardedInfo(p, trect.x(), trect.y(), trect.width(), (selection == FullSelection));
p.setFont(st::msgServiceNameFont);
p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
p.drawTextLeft(trect.left(), trect.top(), _history->width, via()->text);
trect.setY(trect.y() + st::msgServiceNameFont->height); trect.setY(trect.y() + st::msgServiceNameFont->height);
} }
bool outbg = out() && !isPost(), selected = (selection == FullSelection);
if (!displayFromName() && !Is<HistoryMessageForwarded>()) {
if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) {
p.setFont(st::msgServiceNameFont);
p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
p.drawTextLeft(trect.left(), trect.top(), _history->width, via->_text);
trect.setY(trect.y() + st::msgServiceNameFont->height);
}
}
p.setPen(st::msgColor); p.setPen(st::msgColor);
p.setFont(st::msgFont); p.setFont(st::msgFont);
uint16 selectedFrom = (selection == FullSelection) ? 0 : (selection >> 16) & 0xFFFF; uint16 selectedFrom = (selection == FullSelection) ? 0 : (selection >> 16) & 0xFFFF;
@ -6610,6 +6685,9 @@ int32 HistoryMessage::resize(int32 width) {
width = st::msgMaxWidth; width = st::msgMaxWidth;
} }
if (drawBubble()) { if (drawBubble()) {
HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
HistoryMessageVia *via = Get<HistoryMessageVia>();
bool media = (_media && _media->isDisplayed()); bool media = (_media && _media->isDisplayed());
if (width >= _maxw) { if (width >= _maxw) {
_height = _minh; _height = _minh;
@ -6639,16 +6717,29 @@ int32 HistoryMessage::resize(int32 width) {
int32 l = 0, w = 0; int32 l = 0, w = 0;
countPositionAndSize(l, w); countPositionAndSize(l, w);
fromNameUpdated(w); fromNameUpdated(w);
} else if (via() && !toHistoryForwarded()) { } else if (via && !fwd) {
int32 l = 0, w = 0; int32 l = 0, w = 0;
countPositionAndSize(l, w); countPositionAndSize(l, w);
via()->resize(w - st::msgPadding.left() - st::msgPadding.right()); via->resize(w - st::msgPadding.left() - st::msgPadding.right());
if (emptyText() && !displayFromName()) { if (emptyText() && !displayFromName()) {
_height += st::msgPadding.top() + st::msgNameFont->height + st::mediaHeaderSkip; _height += st::msgPadding.top() + st::msgNameFont->height + st::mediaHeaderSkip;
} else { } else {
_height += st::msgNameFont->height; _height += st::msgNameFont->height;
} }
} }
if (displayForwardedFrom()) {
if (emptyText() && !displayFromName()) {
_height += st::msgPadding.top() + st::msgServiceNameFont->height + st::mediaHeaderSkip;
} else {
_height += st::msgServiceNameFont->height;
}
if (via) {
int32 l = 0, w = 0;
countPositionAndSize(l, w);
via->resize(w - st::msgPadding.left() - st::msgPadding.right() - fwd->_fromWidth - fwd->_authorOriginalName.maxWidth() - st::msgServiceFont->spacew);
}
}
} else { } else {
_height = _media->resize(width, this); _height = _media->resize(width, this);
} }
@ -6662,6 +6753,10 @@ bool HistoryMessage::hasPoint(int32 x, int32 y) const {
if (width < 1) return false; if (width < 1) return false;
if (drawBubble()) { if (drawBubble()) {
if (displayForwardedFrom()) {
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
return r.contains(x, y);
}
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom()); QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
return r.contains(x, y); return r.contains(x, y);
} else { } else {
@ -6687,11 +6782,12 @@ bool HistoryMessage::pointInTime(int32 right, int32 bottom, int32 x, int32 y, In
} }
void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const { void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const {
state = HistoryDefaultCursorState;
lnk = TextLinkPtr(); lnk = TextLinkPtr();
state = HistoryDefaultCursorState;
int32 left = 0, width = 0; int32 left = 0, width = 0;
countPositionAndSize(left, width); countPositionAndSize(left, width);
if (displayFromPhoto()) { if (displayFromPhoto()) {
int32 photoleft = left + ((!isPost() && out() && !Adaptive::Wide()) ? (width + (st::msgPhotoSkip - st::msgPhotoSize)) : (-st::msgPhotoSkip)); int32 photoleft = left + ((!isPost() && out() && !Adaptive::Wide()) ? (width + (st::msgPhotoSkip - st::msgPhotoSize)) : (-st::msgPhotoSkip));
if (x >= photoleft && x < photoleft + st::msgPhotoSize && y >= _height - st::msgMargin.bottom() - st::msgPhotoSize && y < _height - st::msgMargin.bottom()) { if (x >= photoleft && x < photoleft + st::msgPhotoSize && y >= _height - st::msgMargin.bottom() - st::msgPhotoSize && y < _height - st::msgMargin.bottom()) {
@ -6702,6 +6798,9 @@ void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
if (width < 1) return; if (width < 1) return;
if (drawBubble()) { if (drawBubble()) {
const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
const HistoryMessageVia *via = Get<HistoryMessageVia>();
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom()); QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
if (displayFromName()) { // from user left name if (displayFromName()) { // from user left name
if (y >= r.top() + st::msgPadding.top() && y < r.top() + st::msgPadding.top() + st::msgNameFont->height) { if (y >= r.top() + st::msgPadding.top() && y < r.top() + st::msgPadding.top() + st::msgNameFont->height) {
@ -6709,13 +6808,28 @@ void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
lnk = author()->lnk; lnk = author()->lnk;
return; return;
} }
if (via() && !toHistoryForwarded() && x >= r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew && x < r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew + via()->width) { if (via && !fwd && x >= r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew && x < r.left() + st::msgPadding.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew + via->_width) {
lnk = via()->lnk; lnk = via->_lnk;
return; return;
} }
} }
r.setTop(r.top() + st::msgNameFont->height); r.setTop(r.top() + st::msgNameFont->height);
} }
if (displayForwardedFrom()) {
QRect trect(r.marginsAdded(-st::msgPadding));
if (y >= trect.top() && y < trect.top() + st::msgServiceNameFont->height) {
if (x >= trect.left() + fwd->_fromWidth && x < trect.right() && x < trect.left() + fwd->_fromWidth + fwd->_authorOriginalName.maxWidth()) {
lnk = fwd->_authorOriginal->lnk;
} else if (via && x >= trect.left() + fwd->_fromWidth + fwd->_authorOriginalName.maxWidth() + st::msgServiceFont->spacew && x < trect.right() && x < trect.left() + fwd->_fromWidth + fwd->_authorOriginalName.maxWidth() + st::msgServiceFont->spacew + via->_maxWidth) {
lnk = via->_lnk;
} else {
lnk = TextLinkPtr();
}
return;
}
y -= st::msgServiceNameFont->height;
r.setHeight(r.height() - st::msgServiceNameFont->height);
}
getStateFromMessageText(lnk, state, x, y, r); getStateFromMessageText(lnk, state, x, y, r);
} else { } else {
_media->getState(lnk, state, x - left, y - st::msgMargin.top(), this); _media->getState(lnk, state, x - left, y - st::msgMargin.top(), this);
@ -6727,12 +6841,15 @@ void HistoryMessage::getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorStat
QRect trect(r.marginsAdded(-st::msgPadding)); QRect trect(r.marginsAdded(-st::msgPadding));
if (!displayFromName() && via() && !toHistoryForwarded()) { const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
if (x >= trect.left() && y >= trect.top() && y < trect.top() + st::msgNameFont->height && x < trect.left() + via()->width) { if (!displayFromName() && !fwd) {
lnk = via()->lnk; if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) {
return; if (x >= trect.left() && y >= trect.top() && y < trect.top() + st::msgNameFont->height && x < trect.left() + via->_width) {
lnk = via->_lnk;
return;
}
trect.setTop(trect.top() + st::msgNameFont->height);
} }
trect.setTop(trect.top() + st::msgNameFont->height);
} }
TextLinkPtr medialnk; TextLinkPtr medialnk;
@ -6773,12 +6890,19 @@ void HistoryMessage::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x,
countPositionAndSize(left, width); countPositionAndSize(left, width);
if (width < 1) return; if (width < 1) return;
const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
const HistoryMessageVia *via = Get<HistoryMessageVia>();
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom()); QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
if (displayFromName()) { // from user left name if (displayFromName()) { // from user left name
r.setTop(r.top() + st::msgNameFont->height); r.setTop(r.top() + st::msgNameFont->height);
} else if (via() && !toHistoryForwarded()) { } else if (via && !fwd) {
r.setTop(r.top() + st::msgNameFont->height); r.setTop(r.top() + st::msgNameFont->height);
} }
if (displayForwardedFrom()) {
y -= st::msgServiceNameFont->height;
r.setHeight(r.height() - st::msgServiceNameFont->height);
}
QRect trect(r.marginsAdded(-st::msgPadding)); QRect trect(r.marginsAdded(-st::msgPadding));
if (_media && _media->isDisplayed()) { if (_media && _media->isDisplayed()) {
trect.setBottom(trect.bottom() - _media->height()); trect.setBottom(trect.bottom() - _media->height());
@ -6832,201 +6956,32 @@ HistoryMessage::~HistoryMessage() {
} }
} }
HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg, const MTPDmessageFwdHeader &f) void HistoryMessage::paintForwardedInfo(Painter &p, int32 x, int32 y, int32 w, bool selected) const {
: HistoryMessage(history, block, msg)
, _fwdDate(::date(f.vdate))
, _fwdAuthor(App::peer(f.has_channel_id() ? peerFromChannel(f.vchannel_id) : peerFromUser(f.vfrom_id)))
, _fwdFrom(App::peer(f.has_from_id() ? peerFromUser(f.vfrom_id) : peerFromChannel(f.vchannel_id)))
, _fromWidth(st::msgServiceFont->width(lang(lng_forwarded_from)) + st::msgServiceFont->spacew) {
}
HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, MsgId id, int32 flags, QDateTime date, int32 from, HistoryMessage *msg)
: HistoryMessage(history, block, id, newForwardedFlags(history->peer, from, msg) | flags, msg->via() ? peerToUser(msg->viaBot()->id) : 0, date, from, msg->HistoryMessage::originalText(), msg->HistoryMessage::originalEntities(), msg->HistoryMessage::viewsCount(), msg->getMedia())
, _fwdDate(msg->fwdDate())
, _fwdAuthor(msg->fwdAuthor())
, _fwdFrom(msg->fwdFrom())
, _fwdAuthorVersion(_fwdAuthor->nameVersion)
, _fromWidth(st::msgServiceFont->width(lang(lng_forwarded_from)) + st::msgServiceFont->spacew) {
}
QString HistoryForwarded::selectedText(uint32 selection) const {
if (selection != FullSelection) return HistoryMessage::selectedText(selection);
QString result, original = HistoryMessage::selectedText(selection);
result.reserve(lang(lng_forwarded_from).size() + _fwdAuthor->name.size() + 4 + original.size());
result.append('[').append(lang(lng_forwarded_from)).append(' ').append(_fwdAuthor->name).append(qsl("]\n")).append(original);
return result;
}
void HistoryForwarded::initDimensions() {
fwdNameUpdated();
HistoryMessage::initDimensions();
if (!_media) {
int32 _namew = st::msgPadding.left() + _fromWidth + _fwdAuthorName.maxWidth() + st::msgPadding.right();
if (via()) {
_namew += st::msgServiceFont->spacew + via()->maxWidth;
}
if (_namew > _maxw) _maxw = _namew;
}
}
void HistoryForwarded::fwdNameUpdated() const {
QString fwdName((via() && _fwdAuthor->isUser()) ? _fwdAuthor->asUser()->firstName : App::peerName(_fwdAuthor));
_fwdAuthorName.setText(st::msgServiceNameFont, fwdName, _textNameOptions);
if (via()) {
int32 l = 0, w = 0;
countPositionAndSize(l, w);
via()->resize(w - st::msgPadding.left() - st::msgPadding.right() - _fromWidth - _fwdAuthorName.maxWidth() - st::msgServiceFont->spacew);
}
}
void HistoryForwarded::draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const {
if (drawBubble() && _fwdAuthor->nameVersion > _fwdAuthorVersion) {
fwdNameUpdated();
_fwdAuthorVersion = _fwdAuthor->nameVersion;
}
HistoryMessage::draw(p, r, selection, ms);
}
void HistoryForwarded::drawForwardedFrom(Painter &p, int32 x, int32 y, int32 w, bool selected) const {
style::font serviceFont(st::msgServiceFont), serviceName(st::msgServiceNameFont); style::font serviceFont(st::msgServiceFont), serviceName(st::msgServiceNameFont);
bool outbg = out() && !isPost(); bool outbg = out() && !isPost();
p.setPen((selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg))->p); p.setPen((selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg))->p);
p.setFont(serviceFont); p.setFont(serviceFont);
if (via() && w > _fromWidth + _fwdAuthorName.maxWidth() + serviceFont->spacew) { const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>();
const HistoryMessageVia *via = Get<HistoryMessageVia>();
if (via && w > fwd->_fromWidth + fwd->_authorOriginalName.maxWidth() + serviceFont->spacew) {
p.drawText(x, y + serviceFont->ascent, lang(lng_forwarded_from)); p.drawText(x, y + serviceFont->ascent, lang(lng_forwarded_from));
p.setFont(serviceName); p.setFont(serviceName);
_fwdAuthorName.draw(p, x + _fromWidth, y, w - _fromWidth); fwd->_authorOriginalName.draw(p, x + fwd->_fromWidth, y, w - fwd->_fromWidth);
p.drawText(x + _fromWidth + _fwdAuthorName.maxWidth() + serviceFont->spacew, y + serviceFont->ascent, via()->text); p.drawText(x + fwd->_fromWidth + fwd->_authorOriginalName.maxWidth() + serviceFont->spacew, y + serviceFont->ascent, via->_text);
} else if (w > _fromWidth) { } else if (w > fwd->_fromWidth) {
p.drawText(x, y + serviceFont->ascent, lang(lng_forwarded_from)); p.drawText(x, y + serviceFont->ascent, lang(lng_forwarded_from));
p.setFont(serviceName); p.setFont(serviceName);
_fwdAuthorName.drawElided(p, x + _fromWidth, y, w - _fromWidth); fwd->_authorOriginalName.drawElided(p, x + fwd->_fromWidth, y, w - fwd->_fromWidth);
} else { } else {
p.drawText(x, y + serviceFont->ascent, serviceFont->elided(lang(lng_forwarded_from), w)); p.drawText(x, y + serviceFont->ascent, serviceFont->elided(lang(lng_forwarded_from), w));
} }
} }
void HistoryForwarded::drawMessageText(Painter &p, QRect trect, uint32 selection) const {
if (displayForwardedFrom()) {
drawForwardedFrom(p, trect.x(), trect.y(), trect.width(), (selection == FullSelection));
trect.setY(trect.y() + st::msgServiceNameFont->height);
}
HistoryMessage::drawMessageText(p, trect, selection);
}
int32 HistoryForwarded::resize(int32 width) {
HistoryMessage::resize(width);
if (drawBubble()) {
if (displayForwardedFrom()) {
if (emptyText() && !displayFromName()) {
_height += st::msgPadding.top() + st::msgServiceNameFont->height + st::mediaHeaderSkip;
} else {
_height += st::msgServiceNameFont->height;
}
if (via()) {
int32 l = 0, w = 0;
countPositionAndSize(l, w);
via()->resize(w - st::msgPadding.left() - st::msgPadding.right() - _fromWidth - _fwdAuthorName.maxWidth() - st::msgServiceFont->spacew);
}
}
}
return _height;
}
bool HistoryForwarded::hasPoint(int32 x, int32 y) const {
if (drawBubble() && displayForwardedFrom()) {
int32 left = 0, width = 0;
countPositionAndSize(left, width);
if (width < 1) return false;
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
return r.contains(x, y);
}
return HistoryMessage::hasPoint(x, y);
}
void HistoryForwarded::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const {
lnk = TextLinkPtr();
state = HistoryDefaultCursorState;
if (drawBubble() && displayForwardedFrom()) {
int32 left = 0, width = 0;
countPositionAndSize(left, width);
if (displayFromPhoto()) {
int32 photoleft = left + ((!isPost() && out() && !Adaptive::Wide()) ? (width + (st::msgPhotoSkip - st::msgPhotoSize)) : (-st::msgPhotoSkip));
if (x >= photoleft && x < photoleft + st::msgPhotoSize) {
return HistoryMessage::getState(lnk, state, x, y);
}
}
if (width < 1) return;
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
if (displayFromName()) {
style::font nameFont(st::msgNameFont);
if (y >= r.top() + st::msgPadding.top() && y < r.top() + st::msgPadding.top() + nameFont->height) {
return HistoryMessage::getState(lnk, state, x, y);
}
r.setTop(r.top() + nameFont->height);
}
QRect trect(r.marginsAdded(-st::msgPadding));
if (y >= trect.top() && y < trect.top() + st::msgServiceNameFont->height) {
return getForwardedState(lnk, state, x - trect.left(), trect.right() - trect.left());
}
y -= st::msgServiceNameFont->height;
}
return HistoryMessage::getState(lnk, state, x, y);
}
void HistoryForwarded::getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const {
QRect realr(r);
if (drawBubble() && displayForwardedFrom()) {
realr.setHeight(r.height() - st::msgServiceNameFont->height);
}
HistoryMessage::getStateFromMessageText(lnk, state, x, y, realr);
}
void HistoryForwarded::getForwardedState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 w) const {
state = HistoryDefaultCursorState;
if (x >= _fromWidth && x < w && x < _fromWidth + _fwdAuthorName.maxWidth()) {
lnk = _fwdAuthor->lnk;
} else if (via() && x >= _fromWidth + _fwdAuthorName.maxWidth() + st::msgServiceFont->spacew && x < w && x < _fromWidth + _fwdAuthorName.maxWidth() + st::msgServiceFont->spacew + via()->maxWidth) {
lnk = via()->lnk;
} else {
lnk = TextLinkPtr();
}
}
void HistoryForwarded::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const {
symbol = 0;
after = false;
upon = false;
if (drawBubble() && displayForwardedFrom()) {
int32 left = 0, width = 0;
countPositionAndSize(left, width);
if (width < 1) return;
QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
if (displayFromName()) {
style::font nameFont(st::msgNameFont);
if (y >= r.top() + st::msgPadding.top() && y < r.top() + st::msgPadding.top() + nameFont->height) {
return HistoryMessage::getSymbol(symbol, after, upon, x, y);
}
r.setTop(r.top() + nameFont->height);
}
QRect trect(r.marginsAdded(-st::msgPadding));
y -= st::msgServiceNameFont->height;
}
return HistoryMessage::getSymbol(symbol, after, upon, x, y);
}
HistoryReply::HistoryReply(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg) HistoryReply::HistoryReply(History *history, HistoryBlock *block, const MTPDmessage &msg) : HistoryMessage(history, block, msg)
, replyToMsgId(msg.vreply_to_msg_id.v) , replyToMsgId(msg.vreply_to_msg_id.v)
, replyToMsg(0) , replyToMsg(0)
@ -7076,8 +7031,8 @@ void HistoryReply::initDimensions() {
HistoryMessage::initDimensions(); HistoryMessage::initDimensions();
if (!_media) { if (!_media) {
int32 replyw = st::msgPadding.left() + _maxReplyWidth - st::msgReplyPadding.left() - st::msgReplyPadding.right() + st::msgPadding.right(); int32 replyw = st::msgPadding.left() + _maxReplyWidth - st::msgReplyPadding.left() - st::msgReplyPadding.right() + st::msgPadding.right();
if (replyToVia()) { if (_replyToVia) {
replyw += st::msgServiceFont->spacew + replyToVia()->maxWidth; replyw += st::msgServiceFont->spacew + _replyToVia->_maxWidth;
} }
if (replyw > _maxw) _maxw = replyw; if (replyw > _maxw) _maxw = replyw;
} }
@ -7094,7 +7049,7 @@ bool HistoryReply::updateReplyTo(bool force) {
replyToNameUpdated(); replyToNameUpdated();
replyToLnk = TextLinkPtr(new MessageLink(replyToMsg->history()->peer->id, replyToMsg->id)); replyToLnk = TextLinkPtr(new MessageLink(replyToMsg->history()->peer->id, replyToMsg->id));
if (!replyToMsg->toHistoryForwarded()) { if (!replyToMsg->Is<HistoryMessageForwarded>()) {
if (UserData *bot = replyToMsg->viaBot()) { if (UserData *bot = replyToMsg->viaBot()) {
_replyToVia = new HistoryMessageVia(0); _replyToVia = new HistoryMessageVia(0);
_replyToVia->create(peerToUser(bot->id)); _replyToVia->create(peerToUser(bot->id));
@ -7112,14 +7067,14 @@ bool HistoryReply::updateReplyTo(bool force) {
void HistoryReply::replyToNameUpdated() const { void HistoryReply::replyToNameUpdated() const {
if (replyToMsg) { if (replyToMsg) {
QString name = (replyToVia() && replyToMsg->author()->isUser()) ? replyToMsg->author()->asUser()->firstName : App::peerName(replyToMsg->author()); QString name = (_replyToVia && replyToMsg->author()->isUser()) ? replyToMsg->author()->asUser()->firstName : App::peerName(replyToMsg->author());
replyToName.setText(st::msgServiceNameFont, name, _textNameOptions); replyToName.setText(st::msgServiceNameFont, name, _textNameOptions);
replyToVersion = replyToMsg->author()->nameVersion; replyToVersion = replyToMsg->author()->nameVersion;
bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false; bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false;
int32 previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0; int32 previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
int32 w = replyToName.maxWidth(); int32 w = replyToName.maxWidth();
if (replyToVia()) { if (_replyToVia) {
w += st::msgServiceFont->spacew + replyToVia()->maxWidth; w += st::msgServiceFont->spacew + _replyToVia->_maxWidth;
} }
_maxReplyWidth = previewSkip + qMax(w, qMin(replyToText.maxWidth(), int32(st::maxSignatureSize))); _maxReplyWidth = previewSkip + qMax(w, qMin(replyToText.maxWidth(), int32(st::maxSignatureSize)));
@ -7153,7 +7108,7 @@ void HistoryReply::replyToReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
if (!newItem) { if (!newItem) {
replyToMsgId = 0; replyToMsgId = 0;
initDimensions(); initDimensions();
} else if (!replyToMsg->toHistoryForwarded()) { } else if (!replyToMsg->Is<HistoryMessageForwarded>()) {
if (UserData *bot = replyToMsg->viaBot()) { if (UserData *bot = replyToMsg->viaBot()) {
_replyToVia = new HistoryMessageVia(0); _replyToVia = new HistoryMessageVia(0);
_replyToVia->create(peerToUser(bot->id)); _replyToVia->create(peerToUser(bot->id));
@ -7202,9 +7157,9 @@ void HistoryReply::drawReplyTo(Painter &p, int32 x, int32 y, int32 w, bool selec
p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg)); p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
} }
replyToName.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top(), w - st::msgReplyBarSkip - previewSkip, w + 2 * x); replyToName.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top(), w - st::msgReplyBarSkip - previewSkip, w + 2 * x);
if (replyToVia() && w > st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew) { if (_replyToVia && w > st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew) {
p.setFont(st::msgServiceFont); p.setFont(st::msgServiceFont);
p.drawText(x + st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew, y + st::msgReplyPadding.top() + st::msgServiceFont->ascent, replyToVia()->text); p.drawText(x + st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew, y + st::msgReplyPadding.top() + st::msgServiceFont->ascent, _replyToVia->_text);
} }
HistoryMessage *replyToAsMsg = replyToMsg->toHistoryMessage(); HistoryMessage *replyToAsMsg = replyToMsg->toHistoryMessage();
@ -7239,26 +7194,26 @@ int32 HistoryReply::resize(int32 width) {
HistoryMessage::resize(width); HistoryMessage::resize(width);
if (drawBubble()) { if (drawBubble()) {
if (emptyText() && !displayFromName() && !via()) { if (emptyText() && !displayFromName() && !Is<HistoryMessageVia>()) {
_height += st::msgPadding.top() + st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom() + st::mediaHeaderSkip; _height += st::msgPadding.top() + st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom() + st::mediaHeaderSkip;
} else { } else {
_height += st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom(); _height += st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
} }
if (replyToVia()) { if (_replyToVia) {
bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false; bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false;
int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0; int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
replyToVia()->resize(width - st::msgPadding.left() - st::msgPadding.right() - st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew); _replyToVia->resize(width - st::msgPadding.left() - st::msgPadding.right() - st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew);
} }
} }
return _height; return _height;
} }
void HistoryReply::resizeVia(int32 w) const { void HistoryReply::resizeVia(int32 w) const {
if (!replyToVia()) return; if (!_replyToVia) return;
bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false; bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false;
int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0; int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
replyToVia()->resize(w - st::msgReplyBarSkip - previewSkip - replyToName.maxWidth() - st::msgServiceFont->spacew); _replyToVia->resize(w - st::msgReplyBarSkip - previewSkip - replyToName.maxWidth() - st::msgServiceFont->spacew);
} }
bool HistoryReply::hasPoint(int32 x, int32 y) const { bool HistoryReply::hasPoint(int32 x, int32 y) const {

185
Telegram/SourceFiles/history.h
View File

@ -765,7 +765,6 @@ protected:
class HistoryReply; // dynamic_cast optimize class HistoryReply; // dynamic_cast optimize
class HistoryMessage; // dynamic_cast optimize class HistoryMessage; // dynamic_cast optimize
class HistoryForwarded; // dynamic_cast optimize
enum HistoryCursorState { enum HistoryCursorState {
HistoryDefaultCursorState, HistoryDefaultCursorState,
@ -791,8 +790,46 @@ enum HistoryItemType {
HistoryItemJoined HistoryItemJoined
}; };
struct HistoryMessageVia : public BasicInterface<HistoryMessageVia> {
HistoryMessageVia(Interfaces *);
void create(int32 userId);
void resize(int32 availw) const;
UserData *_bot;
mutable QString _text;
mutable int32 _width, _maxWidth;
TextLinkPtr _lnk;
};
struct HistoryMessageViews : public BasicInterface<HistoryMessageViews> {
HistoryMessageViews(Interfaces *);
QString _viewsText;
int32 _views, _viewsWidth;
};
struct HistoryMessageSigned : public BasicInterface<HistoryMessageSigned> {
HistoryMessageSigned(Interfaces *);
void create(UserData *from, const QDateTime &date);
int32 maxWidth() const;
Text _signature;
};
struct HistoryMessageForwarded : public BasicInterface<HistoryMessageForwarded> {
HistoryMessageForwarded(Interfaces *);
void authorNameUpdated(bool hasVia) const;
bool display(bool hasVia) const;
PeerData *_authorOriginal, *_fromOriginal;
mutable Text _authorOriginalName;
mutable int32 _authorOriginalVersion;
int32 _fromWidth;
};
class HistoryMedia; class HistoryMedia;
class HistoryItem : public HistoryElem { class HistoryItem : public HistoryElem, public Interfaces {
public: public:
HistoryItem(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime msgDate, int32 from); HistoryItem(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime msgDate, int32 from);
@ -1005,12 +1042,6 @@ public:
virtual const HistoryMessage *toHistoryMessage() const { // dynamic_cast optimize virtual const HistoryMessage *toHistoryMessage() const { // dynamic_cast optimize
return 0; return 0;
} }
virtual HistoryForwarded *toHistoryForwarded() { // dynamic_cast optimize
return 0;
}
virtual const HistoryForwarded *toHistoryForwarded() const { // dynamic_cast optimize
return 0;
}
virtual HistoryReply *toHistoryReply() { // dynamic_cast optimize virtual HistoryReply *toHistoryReply() { // dynamic_cast optimize
return 0; return 0;
} }
@ -1026,13 +1057,16 @@ public:
} }
bool displayFromPhoto() const; bool displayFromPhoto() const;
virtual QDateTime fwdDate() const { // dynamic_cast optimize PeerData *fromOriginal() const {
return date; if (const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>()) {
} return fwd->_fromOriginal;
virtual PeerData *fwdFrom() const { // dynamic_cast optimize }
return from(); return from();
} }
virtual PeerData *fwdAuthor() const { // dynamic_cast optimize PeerData *authorOriginal() const {
if (const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>()) {
return fwd->_authorOriginal;
}
return author(); return author();
} }
@ -1042,6 +1076,9 @@ public:
protected: protected:
HistoryItem(const HistoryItem &);
HistoryItem &operator=(const HistoryItem &);
PeerData *_from; PeerData *_from;
History *_history; History *_history;
HistoryBlock *_block; HistoryBlock *_block;
@ -1337,7 +1374,7 @@ public:
return _caption.original(); return _caption.original();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const {
return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const {
return _caption.isEmpty(); return _caption.isEmpty();
@ -1403,7 +1440,7 @@ public:
ImagePtr replyPreview(); ImagePtr replyPreview();
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const {
return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const {
return _caption.isEmpty(); return _caption.isEmpty();
@ -1605,7 +1642,7 @@ public:
return _caption.original(); return _caption.original();
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const {
return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot(); return !_caption.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const {
return _caption.isEmpty(); return _caption.isEmpty();
@ -1916,7 +1953,7 @@ public:
} }
bool needsBubble(const HistoryItem *parent) const { bool needsBubble(const HistoryItem *parent) const {
return !_title.isEmpty() || !_description.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot(); return !_title.isEmpty() || !_description.isEmpty() || parent->Is<HistoryMessageForwarded>() || parent->toHistoryReply() || parent->viaBot();
} }
bool customInfoLayout() const { bool customInfoLayout() const {
return true; return true;
@ -1945,40 +1982,12 @@ private:
}; };
struct HistoryMessageVia : public BasicInterface<HistoryMessageVia> { class HistoryMessage : public HistoryItem {
HistoryMessageVia(Interfaces *);
void create(int32 userId);
bool isNull() const;
void resize(int32 availw) const;
UserData *bot;
mutable QString text;
mutable int32 width, maxWidth;
TextLinkPtr lnk;
};
struct HistoryMessageViews : public BasicInterface<HistoryMessageViews> {
HistoryMessageViews(Interfaces *);
QString _viewsText;
int32 _views, _viewsWidth;
};
struct HistoryMessageSigned : public BasicInterface<HistoryMessageSigned> {
HistoryMessageSigned(Interfaces *);
void create(UserData *from, const QDateTime &date);
int32 maxWidth() const;
Text _signature;
};
class HistoryMessage : public HistoryItem, public Interfaces {
public: public:
HistoryMessage(History *history, HistoryBlock *block, const MTPDmessage &msg); HistoryMessage(History *history, HistoryBlock *block, const MTPDmessage &msg);
HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, const QString &msg, const EntitiesInText &entities, int32 fromViews, HistoryMedia *fromMedia); // local forwarded HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, QDateTime date, int32 from, HistoryMessage *fwd); // local forwarded
HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, const QString &msg, const EntitiesInText &entities); // local message
HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, DocumentData *doc, const QString &caption); // local document HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, DocumentData *doc, const QString &caption); // local document
HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, PhotoData *photo, const QString &caption); // local photo HistoryMessage(History *history, HistoryBlock *block, MsgId msgId, int32 flags, int32 viaBotId, QDateTime date, int32 from, PhotoData *photo, const QString &caption); // local photo
@ -1988,12 +1997,11 @@ public:
void initDimensions(); void initDimensions();
void fromNameUpdated(int32 width) const; void fromNameUpdated(int32 width) const;
const HistoryMessageVia *via() const {
const HistoryMessageVia *result = Get<HistoryMessageVia>();
return (result && !result->isNull()) ? result : 0;
}
virtual UserData *viaBot() const { virtual UserData *viaBot() const {
return via() ? via()->bot : 0; if (const HistoryMessageVia *via = Get<HistoryMessageVia>()) {
return via->_bot;
}
return 0;
} }
int32 plainMaxWidth() const; int32 plainMaxWidth() const;
@ -2009,7 +2017,7 @@ public:
return drawBubble(); return drawBubble();
} }
bool displayFromName() const { bool displayFromName() const {
return hasFromName() && (!emptyText() || !_media || !_media->isDisplayed() || toHistoryReply() || toHistoryForwarded() || viaBot() || !_media->hideFromName()); return hasFromName() && (!emptyText() || !_media || !_media->isDisplayed() || toHistoryReply() || Is<HistoryMessageForwarded>() || viaBot() || !_media->hideFromName());
} }
bool uploading() const { bool uploading() const {
return _media && _media->uploading(); return _media && _media->uploading();
@ -2108,7 +2116,15 @@ public:
protected: protected:
void create(int32 viaBotId, int32 viewsCount); void create(int32 viaBotId, int32 viewsCount, const PeerId &authorIdOriginal, const PeerId &fromIdOriginal);
bool displayForwardedFrom() const {
if (const HistoryMessageForwarded *fwd = Get<HistoryMessageForwarded>()) {
return Is<HistoryMessageVia>() || !_media || !_media->isDisplayed() || fwd->_authorOriginal->isChannel() || !_media->hideForwardedFrom();
}
return false;
}
void paintForwardedInfo(Painter &p, int32 x, int32 y, int32 w, bool selected) const;
Text _text; Text _text;
@ -2120,56 +2136,6 @@ protected:
}; };
class HistoryForwarded : public HistoryMessage {
public:
HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg, const MTPDmessageFwdHeader &f);
HistoryForwarded(History *history, HistoryBlock *block, MsgId id, int32 flags, QDateTime date, int32 from, HistoryMessage *msg);
void initDimensions();
void fwdNameUpdated() const;
void draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const;
void drawForwardedFrom(Painter &p, int32 x, int32 y, int32 w, bool selected) const;
void drawMessageText(Painter &p, QRect trect, uint32 selection) const;
int32 resize(int32 width);
bool hasPoint(int32 x, int32 y) const;
void getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const;
void getStateFromMessageText(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const QRect &r) const;
void getForwardedState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 w) const;
void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const;
QDateTime fwdDate() const {
return _fwdDate;
}
PeerData *fwdAuthor() const {
return _fwdAuthor;
}
PeerData *fwdFrom() const {
return _fwdFrom;
}
QString selectedText(uint32 selection) const;
bool displayForwardedFrom() const {
return via() || !_media || !_media->isDisplayed() || _fwdAuthor->isChannel() || !_media->hideForwardedFrom();
}
HistoryForwarded *toHistoryForwarded() {
return this;
}
const HistoryForwarded *toHistoryForwarded() const {
return this;
}
protected:
QDateTime _fwdDate;
PeerData *_fwdAuthor, *_fwdFrom;
mutable Text _fwdAuthorName;
mutable int32 _fwdAuthorVersion;
int32 _fromWidth;
};
class HistoryReply : public HistoryMessage { class HistoryReply : public HistoryMessage {
public: public:
@ -2222,9 +2188,6 @@ protected:
mutable int32 replyToVersion; mutable int32 replyToVersion;
mutable int32 _maxReplyWidth; mutable int32 _maxReplyWidth;
HistoryMessageVia *_replyToVia; HistoryMessageVia *_replyToVia;
HistoryMessageVia *replyToVia() const {
return (_replyToVia && !_replyToVia->isNull()) ? _replyToVia : 0;
}
int32 toWidth; int32 toWidth;
}; };
@ -2232,13 +2195,13 @@ protected:
inline int32 newMessageFlags(PeerData *p) { inline int32 newMessageFlags(PeerData *p) {
return p->isSelf() ? 0 : (((p->isChat() || (p->isUser() && !p->asUser()->botInfo)) ? MTPDmessage::flag_unread : 0) | MTPDmessage::flag_out); return p->isSelf() ? 0 : (((p->isChat() || (p->isUser() && !p->asUser()->botInfo)) ? MTPDmessage::flag_unread : 0) | MTPDmessage::flag_out);
} }
inline int32 newForwardedFlags(PeerData *p, int32 from, HistoryMessage *msg) { inline int32 newForwardedFlags(PeerData *p, int32 from, HistoryMessage *fwd) {
int32 result = newMessageFlags(p) | (from ? MTPDmessage::flag_from_id : 0); int32 result = newMessageFlags(p) | (from ? MTPDmessage::flag_from_id : 0);
if (msg->via()) { if (fwd->Is<HistoryMessageVia>()) {
result |= MTPDmessage::flag_via_bot_id; result |= MTPDmessage::flag_via_bot_id;
} }
if (!p->isChannel()) { if (!p->isChannel()) {
if (HistoryMedia *media = msg->getMedia()) { if (HistoryMedia *media = fwd->getMedia()) {
if (media->type() == MediaTypeVoiceFile) { if (media->type() == MediaTypeVoiceFile) {
result |= MTPDmessage::flag_media_unread; result |= MTPDmessage::flag_media_unread;
// } else if (media->type() == MediaTypeVideo) { // } else if (media->type() == MediaTypeVideo) {

4
Telegram/SourceFiles/historywidget.cpp
View File

@ -4894,7 +4894,7 @@ void HistoryWidget::sendBotCommand(const QString &cmd, MsgId replyTo) { // reply
bool lastKeyboardUsed = (_keyboard.forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard.forMsgId() == FullMsgId(_channel, replyTo)); bool lastKeyboardUsed = (_keyboard.forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard.forMsgId() == FullMsgId(_channel, replyTo));
QString toSend = cmd; QString toSend = cmd;
PeerData *bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->toHistoryForwarded()->fwdFrom() : 0); PeerData *bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->fromOriginal() : 0);
if (bot && (!bot->isUser() || !bot->asUser()->botInfo)) bot = 0; if (bot && (!bot->isUser() || !bot->asUser()->botInfo)) bot = 0;
QString username = bot ? bot->asUser()->username : QString(); QString username = bot ? bot->asUser()->username : QString();
int32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1); int32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
@ -4919,7 +4919,7 @@ bool HistoryWidget::insertBotCommand(const QString &cmd, bool specialGif) {
QString toInsert = cmd; QString toInsert = cmd;
if (!toInsert.isEmpty() && toInsert.at(0) != '@') { if (!toInsert.isEmpty() && toInsert.at(0) != '@') {
PeerData *bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->toHistoryForwarded()->fwdFrom() : 0); PeerData *bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->fromOriginal() : 0);
if (!bot->isUser() || !bot->asUser()->botInfo) bot = 0; if (!bot->isUser() || !bot->asUser()->botInfo) bot = 0;
QString username = bot ? bot->asUser()->username : QString(); QString username = bot ? bot->asUser()->username : QString();
int32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1); int32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);

10
Telegram/SourceFiles/layout.cpp
View File

@ -581,8 +581,7 @@ void LayoutOverviewVoice::paint(Painter &p, const QRect &clip, uint32 selection,
} }
} }
bool showPause = updateStatusText(); bool showPause = updateStatusText();
int32 nameVersion = _parent->from()->nameVersion; int32 nameVersion = _parent->fromOriginal()->nameVersion;
if (HistoryForwarded *fwd = _parent->toHistoryForwarded()) nameVersion = fwd->fwdFrom()->nameVersion;
if (nameVersion > _nameVersion) { if (nameVersion > _nameVersion) {
updateName(); updateName();
} }
@ -700,13 +699,12 @@ void LayoutOverviewVoice::getState(TextLinkPtr &link, HistoryCursorState &cursor
void LayoutOverviewVoice::updateName() const { void LayoutOverviewVoice::updateName() const {
int32 version = 0; int32 version = 0;
if (HistoryForwarded *fwd = _parent->toHistoryForwarded()) { if (const HistoryMessageForwarded *fwd = _parent->Get<HistoryMessageForwarded>()) {
_name.setText(st::semiboldFont, lang(lng_forwarded_from) + ' ' + App::peerName(fwd->fwdFrom()), _textNameOptions); _name.setText(st::semiboldFont, lang(lng_forwarded_from) + ' ' + App::peerName(_parent->fromOriginal()), _textNameOptions);
version = fwd->fwdFrom()->nameVersion;
} else { } else {
_name.setText(st::semiboldFont, App::peerName(_parent->from()), _textNameOptions); _name.setText(st::semiboldFont, App::peerName(_parent->from()), _textNameOptions);
version = _parent->from()->nameVersion;
} }
version = _parent->fromOriginal()->nameVersion;
_nameVersion = version; _nameVersion = version;
} }

4
Telegram/SourceFiles/mainwidget.cpp
View File

@ -537,7 +537,7 @@ void MainWidget::fillForwardingInfo(Text *&from, Text *&text, bool &serviceColor
if (_toForward.isEmpty()) return; if (_toForward.isEmpty()) return;
int32 version = 0; int32 version = 0;
for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) { for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) {
version += i.value()->fwdAuthor()->nameVersion; version += i.value()->authorOriginal()->nameVersion;
} }
if (version != _toForwardNameVersion) { if (version != _toForwardNameVersion) {
updateForwardingTexts(); updateForwardingTexts();
@ -558,7 +558,7 @@ void MainWidget::updateForwardingTexts() {
QVector<PeerData*> fromUsers; QVector<PeerData*> fromUsers;
fromUsers.reserve(_toForward.size()); fromUsers.reserve(_toForward.size());
for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) { for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) {
PeerData *from = i.value()->fwdAuthor(); PeerData *from = i.value()->authorOriginal();
if (!fromUsersMap.contains(from)) { if (!fromUsersMap.contains(from)) {
fromUsersMap.insert(from, true); fromUsersMap.insert(from, true);
fromUsers.push_back(from); fromUsers.push_back(from);

4
Telegram/SourceFiles/mediaview.cpp
View File

@ -909,7 +909,7 @@ void MediaView::displayPhoto(PhotoData *photo, HistoryItem *item) {
_y = (height() - _h) / 2; _y = (height() - _h) / 2;
_width = _w; _width = _w;
if (_msgid && item) { if (_msgid && item) {
_from = item->fwdAuthor(); _from = item->authorOriginal();
} else { } else {
_from = _user; _from = _user;
} }
@ -1058,7 +1058,7 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
} }
_x = (width() - _w) / 2; _x = (width() - _w) / 2;
_y = (height() - _h) / 2; _y = (height() - _h) / 2;
_from = item->fwdAuthor(); _from = item->authorOriginal();
_full = 1; _full = 1;
updateControls(); updateControls();
if (isHidden()) { if (isHidden()) {

4
Telegram/SourceFiles/types.h
View File

@ -725,6 +725,10 @@ public:
const Type *Get() const { const Type *Get() const {
return static_cast<const Type*>(_dataptr(_meta()->offsets[Type::Index()])); return static_cast<const Type*>(_dataptr(_meta()->offsets[Type::Index()]));
} }
template <typename Type>
bool Is() const {
return (_meta()->offsets[Type::Index()] >= 0);
}
private: private:
static const InterfacesMetadata *ZeroInterfacesMetadata; static const InterfacesMetadata *ZeroInterfacesMetadata;

9
Telegram/SourceFiles/window.cpp
View File

@ -1379,8 +1379,7 @@ void Window::notifySchedule(History *history, HistoryItem *item) {
App::wnd()->getNotifySetting(MTP_inputNotifyPeer(history->peer->input)); App::wnd()->getNotifySetting(MTP_inputNotifyPeer(history->peer->input));
} }
HistoryForwarded *fwd = item->toHistoryForwarded(); int delay = item->Is<HistoryMessageForwarded>() ? 500 : 100, t = unixtime();
int delay = fwd ? 500 : 100, t = unixtime();
uint64 ms = getms(true); uint64 ms = getms(true);
bool isOnline = main->lastWasOnline(), otherNotOld = ((cOtherOnline() * uint64(1000)) + Global::OnlineCloudTimeout() > t * uint64(1000)); bool isOnline = main->lastWasOnline(), otherNotOld = ((cOtherOnline() * uint64(1000)) + Global::OnlineCloudTimeout() > t * uint64(1000));
bool otherLaterThanMe = (cOtherOnline() * uint64(1000) + (ms - main->lastSetOnline()) > t * uint64(1000)); bool otherLaterThanMe = (cOtherOnline() * uint64(1000) + (ms - main->lastSetOnline()) > t * uint64(1000));
@ -1581,7 +1580,7 @@ void Window::notifyShowNext(NotifyWindow *remove) {
notifyWaitTimer.start(next - ms); notifyWaitTimer.start(next - ms);
break; break;
} else { } else {
HistoryForwarded *fwd = notifyItem->toHistoryForwarded(); // forwarded notify grouping HistoryItem *fwd = notifyItem->Is<HistoryMessageForwarded>() ? notifyItem : 0; // forwarded notify grouping
int32 fwdCount = 1; int32 fwdCount = 1;
uint64 ms = getms(true); uint64 ms = getms(true);
@ -1609,8 +1608,8 @@ void Window::notifyShowNext(NotifyWindow *remove) {
} while (history->hasNotification()); } while (history->hasNotification());
if (nextNotify) { if (nextNotify) {
if (fwd) { if (fwd) {
HistoryForwarded *nextFwd = nextNotify->toHistoryForwarded(); HistoryItem *nextFwd = nextNotify->Is<HistoryMessageForwarded>() ? nextNotify : 0;
if (nextFwd && fwd->from() == nextFwd->from() && qAbs(int64(nextFwd->date.toTime_t()) - int64(fwd->date.toTime_t())) < 2) { if (nextFwd && fwd->author() == nextFwd->author() && qAbs(int64(nextFwd->date.toTime_t()) - int64(fwd->date.toTime_t())) < 2) {
fwd = nextFwd; fwd = nextFwd;
++fwdCount; ++fwdCount;
} else { } else {