From a43dfc567c9ad64c3cadc1fc0993fb4f9dc51f9a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 28 Jun 2018 17:25:50 +0100 Subject: [PATCH] Allow injecting fail handlers in export. Handle CHANNEL_PRIVATE while exporting all channel messages. --- .../SourceFiles/export/export_api_wrap.cpp | 121 +++++++++++++++++- Telegram/SourceFiles/export/export_api_wrap.h | 3 + .../SourceFiles/mtproto/concurrent_sender.h | 22 ++-- 3 files changed, 128 insertions(+), 18 deletions(-) diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp index 060dc6564..d665ecb4d 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.cpp +++ b/Telegram/SourceFiles/export/export_api_wrap.cpp @@ -202,6 +202,8 @@ struct ApiWrap::ChatProcess { Fn handleSlice; FnMut done; + FnMut requestDone; + int localSplitIndex = 0; int32 largestIdPlusOne = 1; @@ -211,6 +213,83 @@ struct ApiWrap::ChatProcess { int fileIndex = -1; }; + +template +class ApiWrap::RequestBuilder { +public: + using Original = MTP::ConcurrentSender::SpecificRequestBuilder; + using Response = typename Request::ResponseType; + + RequestBuilder( + Original &&builder, + FnMut commonFailHandler); + + [[nodiscard]] RequestBuilder &done(FnMut &&handler); + [[nodiscard]] RequestBuilder &done( + FnMut &&handler); + [[nodiscard]] RequestBuilder &fail( + FnMut &&handler); + + mtpRequestId send(); + +private: + Original _builder; + FnMut _commonFailHandler; + +}; + +template +ApiWrap::RequestBuilder::RequestBuilder( + Original &&builder, + FnMut commonFailHandler) +: _builder(std::move(builder)) +, _commonFailHandler(std::move(commonFailHandler)) { +} + +template +auto ApiWrap::RequestBuilder::done( + FnMut &&handler +) -> RequestBuilder& { + if (handler) { + auto &silence_warning = _builder.done(std::move(handler)); + } + return *this; +} + +template +auto ApiWrap::RequestBuilder::done( + FnMut &&handler +) -> RequestBuilder& { + if (handler) { + auto &silence_warning = _builder.done(std::move(handler)); + } + return *this; +} + +template +auto ApiWrap::RequestBuilder::fail( + FnMut &&handler +) -> RequestBuilder& { + if (handler) { + auto &silence_warning = _builder.fail([ + common = base::take(_commonFailHandler), + specific = std::move(handler) + ](RPCError &&error) mutable { + if (!specific(error)) { + common(std::move(error)); + } + }); + } + return *this; +} + +template +mtpRequestId ApiWrap::RequestBuilder::send() { + return _commonFailHandler + ? _builder.fail(base::take(_commonFailHandler)).send() + : _builder.send(); +} + ApiWrap::LoadedFileCache::LoadedFileCache(int limit) : _limit(limit) { Expects(limit >= 0); } @@ -245,12 +324,14 @@ template auto ApiWrap::mainRequest(Request &&request) { Expects(_takeoutId.has_value()); - return std::move(_mtp.request(MTPInvokeWithTakeout( + auto original = std::move(_mtp.request(MTPInvokeWithTakeout( MTP_long(*_takeoutId), std::forward(request) - )).fail([=](RPCError &&result) { - error(std::move(result)); - }).toDC(MTP::ShiftDcId(0, MTP::kExportDcShift))); + )).toDC(MTP::ShiftDcId(0, MTP::kExportDcShift))); + + return RequestBuilder>( + std::move(original), + [=](RPCError &&result) { error(std::move(result)); }); } template @@ -1060,6 +1141,14 @@ void ApiWrap::requestChatMessages( int addOffset, int limit, FnMut done) { + Expects(_chatProcess != nullptr); + + _chatProcess->requestDone = std::move(done); + const auto doneHandler = [=](MTPmessages_Messages &&result) { + Expects(_chatProcess != nullptr); + + base::take(_chatProcess->requestDone)(std::move(result)); + }; if (_chatProcess->info.onlyMyMessages) { splitRequest(splitIndex, MTPmessages_Search( MTP_flags(MTPmessages_Search::Flag::f_from_id), @@ -1075,7 +1164,7 @@ void ApiWrap::requestChatMessages( MTP_int(0), // max_id MTP_int(0), // min_id MTP_int(0) // hash - )).done(std::move(done)).send(); + )).done(doneHandler).send(); } else { splitRequest(splitIndex, MTPmessages_GetHistory( _chatProcess->info.input, @@ -1086,7 +1175,27 @@ void ApiWrap::requestChatMessages( MTP_int(0), // max_id MTP_int(0), // min_id MTP_int(0) // hash - )).done(std::move(done)).send(); + )).fail([=](const RPCError &error) { + Expects(_chatProcess != nullptr); + + if (error.type() == qstr("CHANNEL_PRIVATE")) { + if (_chatProcess->info.input.type() == mtpc_inputPeerChannel + && !_chatProcess->info.onlyMyMessages) { + + // Perhaps we just left / were kicked from channel. + // Just switch to only my messages. + _chatProcess->info.onlyMyMessages = true; + requestChatMessages( + splitIndex, + offsetId, + addOffset, + limit, + base::take(_chatProcess->requestDone)); + return true; + } + } + return false; + }).done(doneHandler).send(); } } diff --git a/Telegram/SourceFiles/export/export_api_wrap.h b/Telegram/SourceFiles/export/export_api_wrap.h index 6b10c1bb0..6362efb9a 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.h +++ b/Telegram/SourceFiles/export/export_api_wrap.h @@ -169,6 +169,9 @@ private: void filePartDone(int offset, const MTPupload_File &result); void filePartUnavailable(); + template + class RequestBuilder; + template [[nodiscard]] auto mainRequest(Request &&request); diff --git a/Telegram/SourceFiles/mtproto/concurrent_sender.h b/Telegram/SourceFiles/mtproto/concurrent_sender.h index aed431a2c..c9e2a7ea3 100644 --- a/Telegram/SourceFiles/mtproto/concurrent_sender.h +++ b/Telegram/SourceFiles/mtproto/concurrent_sender.h @@ -109,21 +109,19 @@ public: #ifndef MTP_SENDER_USE_GENERIC_HANDLERS // Allow code completion to show response type. [[nodiscard]] SpecificRequestBuilder &done(FnMut &&handler); - [[nodiscard]] SpecificRequestBuilder &done(FnMut &&handler); - [[nodiscard]] SpecificRequestBuilder &done(FnMut &&handler); + [[nodiscard]] SpecificRequestBuilder &done( + FnMut &&handler); + [[nodiscard]] SpecificRequestBuilder &done( + FnMut &&handler); [[nodiscard]] SpecificRequestBuilder &done(FnMut &&handler); [[nodiscard]] SpecificRequestBuilder &fail(FnMut &&handler); - [[nodiscard]] SpecificRequestBuilder &fail(FnMut &&handler); - [[nodiscard]] SpecificRequestBuilder &fail(FnMut &&handler); - [[nodiscard]] SpecificRequestBuilder &fail(FnMut &&handler); + [[nodiscard]] SpecificRequestBuilder &fail( + FnMut &&handler); + [[nodiscard]] SpecificRequestBuilder &fail( + FnMut &&handler); + [[nodiscard]] SpecificRequestBuilder &fail( + FnMut &&handler); #else // !MTP_SENDER_USE_GENERIC_HANDLERS template [[nodiscard]] SpecificRequestBuilder &done(Handler &&handler);