mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Handle fwd_from without a link to the account.

Browse Source
This commit is contained in:
John Preston
2019-03-15 19:15:56 +04:00
parent 6d1193a751
commit a34e998c42
36 changed files with 503 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Telegram/SourceFiles/history/history_widget.cpp
View File

@@ -2753,7 +2753,7 @@ void HistoryWidget::saveEditMsg() {
MTP_int(_editMsgId),
MTP_string(sending.text),
MTPInputMedia(),
MTPnullMarkup,
MTPReplyMarkup(),
sentEntities),
rpcDone(&HistoryWidget::saveEditMsgDone, _history),
rpcFail(&HistoryWidget::saveEditMsgFail, _history));
@@ -4268,13 +4268,13 @@ void HistoryWidget::sendFileConfirmed(
MTP_int(newId.msg),
MTP_int(messageFromId),
peerToMTP(file->to.peer),
MTPnullFwdHeader,
MTPMessageFwdHeader(),
MTPint(),
MTP_int(file->to.replyTo),
MTP_int(unixtime()),
MTP_string(caption.text),
photo,
MTPnullMarkup,
MTPReplyMarkup(),
localEntities,
MTP_int(1),
MTPint(),
@@ -4293,13 +4293,13 @@ void HistoryWidget::sendFileConfirmed(
MTP_int(newId.msg),
MTP_int(messageFromId),
peerToMTP(file->to.peer),
MTPnullFwdHeader,
MTPMessageFwdHeader(),
MTPint(),
MTP_int(file->to.replyTo),
MTP_int(unixtime()),
MTP_string(caption.text),
document,
MTPnullMarkup,
MTPReplyMarkup(),
localEntities,
MTP_int(1),
MTPint(),
@@ -4321,13 +4321,13 @@ void HistoryWidget::sendFileConfirmed(
MTP_int(newId.msg),
MTP_int(messageFromId),
peerToMTP(file->to.peer),
MTPnullFwdHeader,
MTPMessageFwdHeader(),
MTPint(),
MTP_int(file->to.replyTo),
MTP_int(unixtime()),
MTP_string(caption.text),
document,
MTPnullMarkup,
MTPReplyMarkup(),
localEntities,
MTP_int(1),
MTPint(),
@@ -5476,7 +5476,7 @@ bool HistoryWidget::sendExistingPhoto(
messagePostAuthor,
photo,
caption,
MTPnullMarkup);
MTPReplyMarkup());
_history->sendRequestId = MTP::send(
MTPmessages_SendMedia(
@@ -5489,7 +5489,7 @@ bool HistoryWidget::sendExistingPhoto(
MTPint()),
MTP_string(caption.text),
MTP_long(randomId),
MTPnullMarkup,
MTPReplyMarkup(),
sentEntities),
App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
App::main()->rpcFail(&MainWidget::sendMessageFail),
@@ -6229,23 +6229,36 @@ void HistoryWidget::updateForwardingTexts() {
int32 version = 0;
QString from, text;
if (const auto count = int(_toForward.size())) {
QMap<PeerData*, bool> fromUsersMap;
QVector<PeerData*> fromUsers;
fromUsers.reserve(_toForward.size());
auto insertedPeers = base::flat_set<not_null<PeerData*>>();
auto insertedNames = base::flat_set<QString>();
auto fullname = QString();
auto names = std::vector<QString>();
names.reserve(_toForward.size());
for (const auto item : _toForward) {
const auto from = item->senderOriginal();
if (!fromUsersMap.contains(from)) {
fromUsersMap.insert(from, true);
fromUsers.push_back(from);
if (const auto from = item->senderOriginal()) {
if (!insertedPeers.contains(from)) {
insertedPeers.emplace(from);
names.push_back(from->shortName());
fullname = App::peerName(from);
}
version += from->nameVersion;
} else if (const auto info = item->hiddenForwardedInfo()) {
if (!insertedNames.contains(info->name)) {
insertedNames.emplace(info->name);
names.push_back(info->firstName);
fullname = info->name;
}
++version;
} else {
Unexpected("Corrupt forwarded information in message.");
}
version += from->nameVersion;
}
if (fromUsers.size() > 2) {
from = lng_forwarding_from(lt_count, fromUsers.size() - 1, lt_user, fromUsers.at(0)->shortName());
} else if (fromUsers.size() < 2) {
from = fromUsers.at(0)->name;
if (names.size() > 2) {
from = lng_forwarding_from(lt_count, names.size() - 1, lt_user, names[0]);
} else if (names.size() < 2) {
from = fullname;
} else {
from = lng_forwarding_from_two(lt_user, fromUsers.at(0)->shortName(), lt_second_user, fromUsers.at(1)->shortName());
from = lng_forwarding_from_two(lt_user, names[0], lt_second_user, names[1]);
}
if (count < 2) {
@@ -6266,7 +6279,13 @@ void HistoryWidget::checkForwardingInfo() {
if (!_toForward.empty()) {
auto version = 0;
for (const auto item : _toForward) {
version += item->senderOriginal()->nameVersion;
if (const auto from = item->senderOriginal()) {
version += from->nameVersion;
} else if (const auto info = item->hiddenForwardedInfo()) {
++version;
} else {
Unexpected("Corrupt forwarded information in message.");
}
}
if (version != _toForwardNameVersion) {
updateForwardingTexts();