From 146a9c27940367a0ca90e03385964dc71ec9d505 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 15 Dec 2020 18:59:12 +0400 Subject: [PATCH] Don't edit old 'voice chat started' message. --- Telegram/SourceFiles/api/api_updates.cpp | 9 --------- Telegram/SourceFiles/data/data_session.cpp | 8 -------- Telegram/SourceFiles/data/data_session.h | 8 -------- Telegram/SourceFiles/history/history_service.cpp | 9 --------- 4 files changed, 34 deletions(-) diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp index 99fdf520c..2449c4fe3 100644 --- a/Telegram/SourceFiles/api/api_updates.cpp +++ b/Telegram/SourceFiles/api/api_updates.cpp @@ -1842,15 +1842,6 @@ void Updates::feedUpdate(const MTPUpdate &update) { case mtpc_updatePhoneCallSignalingData: case mtpc_updateGroupCallParticipants: case mtpc_updateGroupCall: { - if (update.type() == mtpc_updateGroupCall) { - const auto &data = update.c_updateGroupCall(); - if (data.vcall().type() == mtpc_groupCallDiscarded) { - const auto &call = data.vcall().c_groupCallDiscarded(); - session().data().groupCallDiscarded( - call.vid().v, - call.vduration().v); - } - } Core::App().calls().handleUpdate(&session(), update); } break; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 9b5908639..fa4df7c48 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -814,14 +814,6 @@ void Session::unregisterGroupCall(not_null call) { _groupCalls.remove(call->id()); } -rpl::producer Session::groupCallDiscards() const { - return _groupCallDiscarded.events(); -} - -void Session::groupCallDiscarded(uint64 id, int duration) { - _groupCallDiscarded.fire({ id, duration }); -} - GroupCall *Session::groupCall(uint64 callId) const { const auto i = _groupCalls.find(callId); return (i != end(_groupCalls)) ? i->second.get() : nullptr; diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h index 0fc1c8b66..811e8b8b7 100644 --- a/Telegram/SourceFiles/data/data_session.h +++ b/Telegram/SourceFiles/data/data_session.h @@ -158,13 +158,6 @@ public: void unregisterGroupCall(not_null call); GroupCall *groupCall(uint64 callId) const; - struct GroupCallDiscard { - uint64 id = 0; - int duration = 0; - }; - rpl::producer groupCallDiscards() const; - void groupCallDiscarded(uint64 id, int duration); - [[nodiscard]] auto invitedToCallUsers(uint64 callId) const -> const base::flat_set> &; void registerInvitedToCallUser( @@ -931,7 +924,6 @@ private: base::flat_map> _groupCalls; base::flat_map>> _invitedToCallUsers; - rpl::event_stream _groupCallDiscarded; History *_topPromoted = nullptr; diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp index 2486188b1..55403cdd9 100644 --- a/Telegram/SourceFiles/history/history_service.cpp +++ b/Telegram/SourceFiles/history/history_service.cpp @@ -935,15 +935,6 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) { const auto id = CallIdFromInput(data.vcall()); call->lifetime.destroy(); - history()->owner().groupCallDiscards( - ) | rpl::filter([=](Data::Session::GroupCallDiscard discard) { - return (discard.id == id); - }) | rpl::start_with_next([=]( - Data::Session::GroupCallDiscard discard) { - RemoveComponents(HistoryServiceOngoingCall::Bit()); - updateText(prepareDiscardedCallText(discard.duration)); - }, call->lifetime); - const auto peer = history()->peer; const auto has = PeerHasThisCall(peer, id); if (!has.has_value()) {