From 859636ff9c0dfa2b5ce2073dd61e7b1bff4ac7ff Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 23 Jun 2023 18:46:06 +0400 Subject: [PATCH] Show "Expired story" in the reply bar. --- Telegram/Resources/langs/lang.strings | 1 + Telegram/SourceFiles/data/data_media_types.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index a562c678a..281718c8f 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1980,6 +1980,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_in_dlg_sticker_emoji" = "{emoji} Sticker"; "lng_in_dlg_poll" = "Poll"; "lng_in_dlg_story" = "Story"; +"lng_in_dlg_story_expired" = "Expired story"; "lng_in_dlg_media_count#one" = "{count} media"; "lng_in_dlg_media_count#other" = "{count} media"; "lng_in_dlg_photo_count#one" = "{count} photo"; diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp index 9e55643b0..1a80583c8 100644 --- a/Telegram/SourceFiles/data/data_media_types.cpp +++ b/Telegram/SourceFiles/data/data_media_types.cpp @@ -2016,7 +2016,11 @@ TextWithEntities MediaStory::notificationText() const { const auto stories = &parent()->history()->owner().stories(); const auto maybeStory = stories->lookup(_storyId); return WithCaptionNotificationText( - tr::lng_in_dlg_story(tr::now), + ((_expired + || (!maybeStory + && maybeStory.error() == Data::NoStory::Deleted)) + ? tr::lng_in_dlg_story_expired + : tr::lng_in_dlg_story)(tr::now), (maybeStory ? (*maybeStory)->caption() : TextWithEntities())); @@ -2028,7 +2032,9 @@ QString MediaStory::pinnedTextSubstring() const { TextForMimeData MediaStory::clipboardText() const { return WithCaptionClipboardText( - tr::lng_in_dlg_story(tr::now), + (_expired + ? tr::lng_in_dlg_story_expired + : tr::lng_in_dlg_story)(tr::now), parent()->clipboardText()); }