From 1473c146688ab5523264296dafaedafd5ae94e0f Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 6 Dec 2017 17:56:40 +0400 Subject: [PATCH] Forward messages to Saved Messages instantly. --- Telegram/SourceFiles/apiwrap.cpp | 106 ++++++++++++++++++ Telegram/SourceFiles/apiwrap.h | 16 +++ .../SourceFiles/history/history_widget.cpp | 7 +- Telegram/SourceFiles/mainwidget.cpp | 57 +--------- .../SourceFiles/window/window_peer_menu.cpp | 9 +- 5 files changed, 141 insertions(+), 54 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 9346d6c92..dc6c4ceb9 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -2387,4 +2387,110 @@ void ApiWrap::userPhotosDone( )); } +void ApiWrap::forwardMessages( + HistoryItemsList &&items, + const SendOptions &options, + base::lambda_once &&successCallback) { + Expects(!items.empty()); + + struct SharedCallback { + int requestsLeft = 0; + base::lambda_once callback; + }; + const auto shared = successCallback + ? std::make_shared() + : std::shared_ptr(); + if (successCallback) { + shared->callback = std::move(successCallback); + } + + const auto count = int(items.size()); + const auto genClientSideMessage = options.generateLocal && (count < 2); + const auto history = options.history; + + App::main()->readServerHistory(history); + + const auto channelPost = history->peer->isChannel() + && !history->peer->isMegagroup(); + const auto silentPost = channelPost && options.silent; + + auto flags = MTPDmessage::Flags(0); + auto sendFlags = MTPmessages_ForwardMessages::Flags(0); + if (channelPost) { + flags |= MTPDmessage::Flag::f_views; + flags |= MTPDmessage::Flag::f_post; + } + if (!channelPost) { + flags |= MTPDmessage::Flag::f_from_id; + } else if (history->peer->asChannel()->addsSignature()) { + flags |= MTPDmessage::Flag::f_post_author; + } + if (silentPost) { + sendFlags |= MTPmessages_ForwardMessages::Flag::f_silent; + } + + auto forwardFrom = items.front()->history()->peer; + auto ids = QVector(); + auto randomIds = QVector(); + + const auto sendAccumulated = [&] { + if (shared) { + ++shared->requestsLeft; + } + history->sendRequestId = request(MTPmessages_ForwardMessages( + MTP_flags(sendFlags), + forwardFrom->input, + MTP_vector(ids), + MTP_vector(randomIds), + history->peer->input + )).done([=, callback = std::move(successCallback)]( + const MTPUpdates &updates) { + applyUpdates(updates); + if (shared && !--shared->requestsLeft) { + shared->callback(); + } + }).after( + history->sendRequestId + ).send(); + + ids.resize(0); + randomIds.resize(0); + }; + + ids.reserve(count); + randomIds.reserve(count); + for (const auto item : items) { + auto randomId = rand_value(); + if (genClientSideMessage) { + if (auto message = item->toHistoryMessage()) { + const auto newId = FullMsgId( + peerToChannel(history->peer->id), + clientMsgId()); + const auto self = Auth().user(); + const auto messageFromId = channelPost + ? UserId(0) + : peerToUser(self->id); + const auto messagePostAuthor = channelPost + ? (self->firstName + ' ' + self->lastName) + : QString(); + history->addNewForwarded( + newId.msg, + flags, + date(MTP_int(unixtime())), + messageFromId, + messagePostAuthor, + message); + App::historyRegRandom(randomId, newId); + } + } + if (forwardFrom != item->history()->peer) { + sendAccumulated(); + forwardFrom = item->history()->peer; + } + ids.push_back(MTP_int(item->id)); + randomIds.push_back(MTP_long(randomId)); + } + sendAccumulated(); +} + ApiWrap::~ApiWrap() = default; diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index da58dc28a..afdb77350 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -159,6 +159,22 @@ public: const QVector &list)> callbackList, base::lambda callbackNotModified = nullptr); + struct SendOptions { + SendOptions(not_null history) : history(history) { + } + + not_null history; + MsgId replyTo = 0; + bool silent = false; + WebPageId webPageId = 0; + bool clearDraft = true; + bool generateLocal = true; + }; + void forwardMessages( + HistoryItemsList &&items, + const SendOptions &options, + base::lambda_once &&successCallback = nullptr); + ~ApiWrap(); private: diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 928999071..f5ebcb7bb 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -6168,7 +6168,12 @@ void HistoryWidget::handlePeerUpdate() { void HistoryWidget::onForwardSelected() { if (!_list) return; - Window::ShowForwardMessagesBox(getSelectedItems()); + auto weak = make_weak(this); + Window::ShowForwardMessagesBox(getSelectedItems(), [=] { + if (weak) { + weak->onClearSelected(); + } + }); } void HistoryWidget::confirmDeleteContextItem() { diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 51c410a63..dfb8ebf8d 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -662,7 +662,6 @@ bool MainWidget::setForwardDraft(PeerId peerId, MessageIdsList &&items) { if (_history->peer() == peer) { _history->cancelReply(); } - _history->onClearSelected(); Ui::showPeerHistory(peer, ShowAtUnreadMsgId); return true; } @@ -724,61 +723,15 @@ void MainWidget::cancelForwarding(History *history) { void MainWidget::finishForwarding(History *history, bool silent) { if (!history) return; - const auto toForward = history->validateForwardDraft(); - if (const auto count = int(toForward.size())) { - auto genClientSideMessage = (count < 2); - PeerData *forwardFrom = 0; - App::main()->readServerHistory(history); - - auto flags = MTPDmessage::Flags(0); - auto sendFlags = MTPmessages_ForwardMessages::Flags(0); - bool channelPost = history->peer->isChannel() && !history->peer->isMegagroup(); - bool silentPost = channelPost && silent; - if (channelPost) { - flags |= MTPDmessage::Flag::f_views; - flags |= MTPDmessage::Flag::f_post; - } - if (!channelPost) { - flags |= MTPDmessage::Flag::f_from_id; - } else if (history->peer->asChannel()->addsSignature()) { - flags |= MTPDmessage::Flag::f_post_author; - } - if (silentPost) { - sendFlags |= MTPmessages_ForwardMessages::Flag::f_silent; - } - - QVector ids; - QVector randomIds; - ids.reserve(count); - randomIds.reserve(count); - for (const auto item : toForward) { - auto randomId = rand_value(); - if (genClientSideMessage) { - if (auto message = item->toHistoryMessage()) { - auto newId = FullMsgId(peerToChannel(history->peer->id), clientMsgId()); - auto messageFromId = channelPost ? 0 : Auth().userId(); - auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString(); - history->addNewForwarded(newId.msg, flags, date(MTP_int(unixtime())), messageFromId, messagePostAuthor, message); - App::historyRegRandom(randomId, newId); - } - } - if (forwardFrom != item->history()->peer) { - if (forwardFrom) { - history->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector(ids), MTP_vector(randomIds), history->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId); - ids.resize(0); - randomIds.resize(0); - } - forwardFrom = item->history()->peer; - } - ids.push_back(MTP_int(item->id)); - randomIds.push_back(MTP_long(randomId)); - } - history->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector(ids), MTP_vector(randomIds), history->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId); + auto toForward = history->validateForwardDraft(); + if (!toForward.empty()) { + auto options = ApiWrap::SendOptions(history); + options.silent = silent; + Auth().api().forwardMessages(std::move(toForward), options); if (_history->peer() == history->peer) { _history->peerMessagesUpdated(); } - cancelForwarding(history); } diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index f20deaaac..e4f67a386 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -503,7 +503,14 @@ void ShowForwardMessagesBox( weak ](not_null peer) mutable { if (peer->isSelf()) { - Ui::Toast::Show(lang(lng_share_done)); + auto items = Auth().data().idsToItems(ids); + if (!items.empty()) { + auto options = ApiWrap::SendOptions(App::history(peer)); + options.generateLocal = false; + Auth().api().forwardMessages(std::move(items), options, [] { + Ui::Toast::Show(lang(lng_share_done)); + }); + } } else { App::main()->setForwardDraft(peer->id, std::move(ids)); }