From 0c906a5e6d61bc9c9650e40f9a22dbe5eee7bf15 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 7 Oct 2021 10:58:24 +0400 Subject: [PATCH] Fix crash in local changelog messages. --- Telegram/SourceFiles/api/api_sending.cpp | 2 +- Telegram/SourceFiles/data/data_session.cpp | 4 +++- .../SourceFiles/settings/settings_privacy_controllers.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp index ad8743b6a6..a000929cd5 100644 --- a/Telegram/SourceFiles/api/api_sending.cpp +++ b/Telegram/SourceFiles/api/api_sending.cpp @@ -439,7 +439,7 @@ void SendConfirmedFile( | (localEntities.v.isEmpty() ? MTPDmessage::Flag() : MTPDmessage::Flag::f_entities)), - MTP_int(newId.msg), + MTP_int(0), // Not used (would've been trimmed to 32 bits). peerToMTP(messageFromId), peerToMTP(file->to.peer), MTPMessageFwdHeader(), diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index e0ae94d6e9..d024de60d6 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -3981,10 +3981,12 @@ void Session::insertCheckedServiceNotification( | MessageFlag::LocalHistoryEntry; auto sending = TextWithEntities(), left = message; while (TextUtilities::CutPart(sending, left, MaxMessageSize)) { + const auto id = nextLocalMessageId(); addNewMessage( + id, MTP_message( MTP_flags(flags), - MTP_int(nextLocalMessageId()), + MTP_int(0), // Not used (would've been trimmed to 32 bits). peerToMTP(PeerData::kServiceNotificationsId), peerToMTP(PeerData::kServiceNotificationsId), MTPMessageFwdHeader(), diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp index c7e32e5173..3753b49ed9 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp @@ -136,7 +136,7 @@ AdminLog::OwnedItem GenerateForwardedItem( const auto flags = Flag::f_from_id | Flag::f_fwd_from; const auto item = MTP_message( MTP_flags(flags), - MTP_int(0), + MTP_int(0), // Not used (would've been trimmed to 32 bits). peerToMTP(history->peer->id), peerToMTP(history->peer->id), MTP_messageFwdHeader(