From 7c284a9453ad8a7f1f11869615de5a23d5a4549c Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 4 Aug 2022 20:55:50 +0300 Subject: [PATCH] Drop custom emoji correctly in message edit preview. --- Telegram/SourceFiles/chat_helpers/message_field.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index 73f1c2d1b..be6d1e401 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/history_widget.h" #include "history/history.h" // History::session #include "history/history_item.h" // HistoryItem::originalText +#include "history/history_message.h" // DropCustomEmoji #include "base/qthelp_regex.h" #include "base/qthelp_url.h" #include "base/event_filter.h" @@ -261,9 +262,14 @@ QString PrepareMentionTag(not_null user) { } TextWithTags PrepareEditText(not_null item) { - const auto original = item->history()->session().supportMode() + auto original = item->history()->session().supportMode() ? StripSupportHashtag(item->originalText()) : item->originalText(); + const auto dropCustomEmoji = !item->history()->session().premium() + && !item->history()->peer->isSelf(); + if (dropCustomEmoji) { + original = DropCustomEmoji(std::move(original)); + } return TextWithTags{ original.text, TextUtilities::ConvertEntitiesToTextTags(original.entities)