From 3b2c9f94c29ac20497315e9de392ad264945f87f Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Tue, 6 Apr 2021 03:05:17 +0300 Subject: [PATCH] Remove unused variable in unquoted forward --- Telegram/SourceFiles/apiwrap.cpp | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 1f3bb5058..ac9bc8759 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -3796,7 +3796,6 @@ void ApiWrap::forwardMessagesUnquoted( auto lastGroup = LastGroupType::None; auto ids = QVector(); auto randomIds = QVector(); - auto localIds = std::shared_ptr>(); auto fromIter = items.begin(); auto toIter = items.begin(); auto messageGroupCount = 0; @@ -3865,18 +3864,8 @@ void ApiWrap::forwardMessagesUnquoted( shared->callback(); } finish(); - }).fail([=, ids = localIds](const MTP::Error &error) { - auto found = false; - for (const auto &[randomId, itemId] : *ids) { - if (currentRandomId == MTP_long(randomId)) { - sendMessageFail(error, peer, randomId, itemId); - found = true; - break; - } - } - if (!found) { - sendMessageFail(error, peer); - } + }).fail([=](const MTP::Error &error) { + sendMessageFail(error, peer); finish(); }).afterRequest( history->sendRequestId @@ -3931,7 +3920,7 @@ void ApiWrap::forwardMessagesUnquoted( : MTPmessages_SendMultiMedia::Flag(0)); const auto requestType = Data::Histories::RequestType::Send; - auto performRequest = [=, &mediaRefs, &histories, &localIds](const auto &repeatRequest) -> void { + auto performRequest = [=, &mediaRefs, &histories](const auto &repeatRequest) -> void { mediaRefs.clear(); for (auto i = fromIter, e = toIter; i != e; i++) { const auto item = *i; @@ -3984,10 +3973,6 @@ void ApiWrap::forwardMessagesUnquoted( }); index++; } - } else if (localIds) { - for (const auto &[randomId, itemId] : *localIds) { - sendMessageFail(error, peer, randomId, itemId); - } } else { sendMessageFail(error, peer); } @@ -4142,7 +4127,6 @@ void ApiWrap::forwardMessagesUnquoted( ids.resize(0); randomIds.resize(0); - localIds = nullptr; }; ids.reserve(count);