diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp index f00431f648..dfba1d930a 100644 --- a/Telegram/SourceFiles/api/api_sending.cpp +++ b/Telegram/SourceFiles/api/api_sending.cpp @@ -469,11 +469,11 @@ void SendConfirmedFile( auto edition = HistoryMessageEdition(); edition.isEditHide = (flags & MessageFlag::HideEdited); edition.editDate = 0; - edition.views = 0; - edition.forwards = 0; edition.ttl = 0; edition.mtpMedia = &media; edition.textWithEntities = caption; + edition.useSameViews = true; + edition.useSameForwards = true; edition.useSameMarkup = true; edition.useSameReplies = true; edition.useSameReactions = true; diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index e9ebb96cf7..388f14d148 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -1421,8 +1421,12 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) { if (!edition.useSameReactions) { updateReactions(edition.mtpReactions); } - changeViewsCount(edition.views); - setForwardsCount(edition.forwards); + if (!edition.useSameViews) { + changeViewsCount(edition.views); + } + if (!edition.useSameForwards) { + setForwardsCount(edition.forwards); + } setText(_media ? edition.textWithEntities : EnsureNonEmpty(edition.textWithEntities)); diff --git a/Telegram/SourceFiles/history/history_item_edition.h b/Telegram/SourceFiles/history/history_item_edition.h index 10afd3fa39..2ca37c71a6 100644 --- a/Telegram/SourceFiles/history/history_item_edition.h +++ b/Telegram/SourceFiles/history/history_item_edition.h @@ -24,6 +24,8 @@ struct HistoryMessageEdition { int views = -1; int forwards = -1; int ttl = 0; + bool useSameViews = false; + bool useSameForwards = false; bool useSameReplies = false; bool useSameMarkup = false; bool useSameReactions = false;