feat: merge

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/telegramdesktop/libtgvoip
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
-	url = https://github.com/Microsoft/GSL.git
+	url = https://github.com/desktop-app/GSL.git
 [submodule "Telegram/ThirdParty/xxHash"]
 	path = Telegram/ThirdParty/xxHash
 	url = https://github.com/Cyan4973/xxHash.git

Telegram/CMakeLists.txt

@@ -392,6 +392,7 @@ PRIVATE
     calls/calls_video_bubble.h
     calls/calls_video_incoming.cpp
     calls/calls_video_incoming.h
+    chat_helpers/compose/compose_features.h
     chat_helpers/compose/compose_show.cpp
     chat_helpers/compose/compose_show.h
     chat_helpers/bot_command.cpp
@@ -592,6 +593,12 @@ PRIVATE
     data/data_sparse_ids.h
     data/data_sponsored_messages.cpp
     data/data_sponsored_messages.h
+    data/data_stories.cpp
+    data/data_stories.h
+    data/data_stories_ids.cpp
+    data/data_stories_ids.h
+    data/data_story.cpp
+    data/data_story.h
     data/data_streaming.cpp
     data/data_streaming.h
     data/data_thread.cpp
@@ -632,6 +639,8 @@ PRIVATE
     dialogs/ui/dialogs_layout.h
     dialogs/ui/dialogs_message_view.cpp
     dialogs/ui/dialogs_message_view.h
+    dialogs/ui/dialogs_stories_content.cpp
+    dialogs/ui/dialogs_stories_content.h
     dialogs/ui/dialogs_topics_view.cpp
     dialogs/ui/dialogs_topics_view.h
     dialogs/ui/dialogs_video_userpic.cpp
@@ -735,6 +744,8 @@ PRIVATE
     history/view/media/history_view_sticker_player.cpp
     history/view/media/history_view_sticker_player.h
     history/view/media/history_view_sticker_player_abstract.h
+    history/view/media/history_view_story_mention.cpp
+    history/view/media/history_view_story_mention.h
     history/view/media/history_view_theme_document.cpp
     history/view/media/history_view_theme_document.h
     history/view/media/history_view_userpic_suggestion.cpp
@@ -910,6 +921,12 @@ PRIVATE
     info/profile/info_profile_widget.h
     info/settings/info_settings_widget.cpp
     info/settings/info_settings_widget.h
+    info/stories/info_stories_inner_widget.cpp
+    info/stories/info_stories_inner_widget.h
+    info/stories/info_stories_provider.cpp
+    info/stories/info_stories_provider.h
+    info/stories/info_stories_widget.cpp
+    info/stories/info_stories_widget.h
     info/userpic/info_userpic_colors_editor.cpp
     info/userpic/info_userpic_colors_editor.h
     info/userpic/info_userpic_emoji_builder.cpp
@@ -980,8 +997,6 @@ PRIVATE
     main/session/send_as_peers.h
     main/session/session_show.cpp
     main/session/session_show.h
-    media/system_media_controls_manager.h
-    media/system_media_controls_manager.cpp
     media/audio/media_audio.cpp
     media/audio/media_audio.h
     media/audio/media_audio_capture.cpp
@@ -1006,6 +1021,28 @@ PRIVATE
     media/player/media_player_volume_controller.h
     media/player/media_player_widget.cpp
     media/player/media_player_widget.h
+    media/stories/media_stories_caption_full_view.cpp
+    media/stories/media_stories_caption_full_view.h
+    media/stories/media_stories_controller.cpp
+    media/stories/media_stories_controller.h
+    media/stories/media_stories_delegate.cpp
+    media/stories/media_stories_delegate.h
+    media/stories/media_stories_header.cpp
+    media/stories/media_stories_header.h
+    media/stories/media_stories_reactions.cpp
+    media/stories/media_stories_reactions.h
+    media/stories/media_stories_recent_views.cpp
+    media/stories/media_stories_recent_views.h
+    media/stories/media_stories_reply.cpp
+    media/stories/media_stories_reply.h
+    media/stories/media_stories_share.cpp
+    media/stories/media_stories_share.h
+    media/stories/media_stories_sibling.cpp
+    media/stories/media_stories_sibling.h
+    media/stories/media_stories_slider.cpp
+    media/stories/media_stories_slider.h
+    media/stories/media_stories_view.cpp
+    media/stories/media_stories_view.h
     media/streaming/media_streaming_audio_track.cpp
     media/streaming/media_streaming_audio_track.h
     media/streaming/media_streaming_common.h
@@ -1051,6 +1088,8 @@ PRIVATE
     media/view/media_view_playback_progress.cpp
     media/view/media_view_playback_progress.h
     media/view/media_view_open_common.h
+    media/system_media_controls_manager.h
+    media/system_media_controls_manager.cpp
     menu/menu_antispam_validator.cpp
     menu/menu_antispam_validator.h
     menu/menu_item_download_files.cpp

Telegram/Resources/export_html/css/style.css

@@ -111,6 +111,11 @@ pre {
     border-radius: 50%;
     overflow: hidden;
 }
+.story {
+    display: block;
+    border-radius: 4px;
+    overflow: hidden;
+}
 .userpic .initials {
     display: block;
     color: #fff;
@@ -194,6 +199,10 @@ a.block_link:hover {
     text-decoration: none !important;
     background-color: #f5f7f8;
 }
+a.expanded {
+    padding: 2px 8px;
+    margin: -2px -8px;
+}
 .sections {
     padding: 11px 0;
 }
@@ -428,6 +437,9 @@ div.toast_shown {
 .section.sessions {
     background-image: url(../images/section_sessions.png);
 }
+.section.stories {
+    background-image: url(../images/section_stories.png);
+}
 .section.web {
     background-image: url(../images/section_web.png);
 }
@@ -489,6 +501,9 @@ div.toast_shown {
 .section.sessions {
     background-image: url(../images/section_sessions@2x.png);
 }
+.section.stories {
+    background-image: url(../images/section_stories@2x.png);
+}
 .section.web {
     background-image: url(../images/section_web@2x.png);
 }

Telegram/Resources/langs/lang.strings

@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_activate" = "Activate";
 "lng_menu_set_status" = "Set Emoji Status";
 "lng_menu_change_status" = "Change Emoji Status";
+"lng_menu_my_stories" = "My Stories";
 
 "lng_disable_notifications_from_tray" = "Disable notifications";
 "lng_enable_notifications_from_tray" = "Enable notifications";
@@ -285,6 +286,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_message_text" = "New message text...";
 "lng_deleted" = "Deleted Account";
 "lng_deleted_message" = "Deleted message";
+"lng_deleted_story" = "Deleted story";
 "lng_pinned_message" = "Pinned message";
 "lng_pinned_previous" = "Previous message";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
@@ -583,6 +585,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_forwards_privacy" = "Forwarded messages";
 "lng_settings_profile_photo_privacy" = "Profile photo";
 "lng_settings_voices_privacy" = "Voice messages";
+"lng_settings_bio_privacy" = "Bio";
 "lng_settings_privacy_premium" = "Only subscribers of {link} can restrict receiving voice messages.";
 "lng_settings_privacy_premium_link" = "Telegram Premium";
 "lng_settings_passcode_disable" = "Disable Passcode";
@@ -754,6 +757,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_background_apply2" = "Enjoy the view.";
 "lng_background_apply_button" = "Apply For This Chat";
 "lng_background_dimming" = "Background dimming";
+"lng_background_sure_reset_default" = "Are you sure you want to reset the wallpaper?";
+"lng_background_reset_default" = "Reset";
 
 "lng_download_path_ask" = "Ask download path for each file";
 "lng_download_path" = "Download path";
@@ -961,6 +966,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_edit_privacy_everyone" = "Everybody";
 "lng_edit_privacy_contacts" = "My contacts";
+"lng_edit_privacy_close_friends" = "Close friends";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_exceptions" = "Add exceptions";
 
@@ -997,6 +1003,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_groups_always_title" = "Always allow";
 "lng_edit_privacy_groups_never_title" = "Never allow";
 
+"lng_edit_privacy_about_title" = "Bio privacy settings";
+"lng_edit_privacy_about_header" = "Who can see my bio";
+"lng_edit_privacy_about_always_empty" = "Always allow";
+"lng_edit_privacy_about_never_empty" = "Never allow";
+"lng_edit_privacy_about_exceptions" = "These users will or will not be able to see your profile bio regardless of the settings above.";
+"lng_edit_privacy_about_always_title" = "Always allow";
+"lng_edit_privacy_about_never_title" = "Never allow";
+
 "lng_edit_privacy_calls_title" = "Voice calls privacy";
 "lng_edit_privacy_calls_header" = "Who can call you";
 "lng_edit_privacy_calls_always_empty" = "Always allow";
@@ -1111,6 +1125,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_sure_kick_channel" = "Remove {user} from the channel?";
 "lng_profile_sure_remove_admin" = "Remove {user} from admins?";
 "lng_profile_loading" = "Loading...";
+"lng_profile_saved_stories#one" = "{count} saved story";
+"lng_profile_saved_stories#other" = "{count} saved stories";
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_gifs#one" = "{count} GIF";
@@ -1334,6 +1350,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_report_group_video_title" = "Report group video";
 "lng_report_channel_photo_title" = "Report channel photo";
 "lng_report_channel_video_title" = "Report channel video";
+"lng_report_story" = "Report story";
 "lng_report_please_select_messages" = "Please select messages to report.";
 "lng_report_select_messages" = "Select messages";
 "lng_report_messages_none" = "Select Messages";
@@ -1491,6 +1508,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_pinned_media_sticker" = "a sticker";
 "lng_action_pinned_media_emoji_sticker" = "a {emoji} sticker";
 "lng_action_pinned_media_game" = "the game «{game}»";
+"lng_action_pinned_media_story" = "a story";
 "lng_action_game_score#one" = "{from} scored {count} in {game}";
 "lng_action_game_score#other" = "{from} scored {count} in {game}";
 "lng_action_game_you_scored#one" = "You scored {count} in {game}";
@@ -1556,6 +1574,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_topic_icon_changed" = "{from} changed the {link} icon to {emoji}";
 "lng_action_topic_icon_removed" = "{from} removed the {link} icon";
 "lng_action_shared_chat_with_bot" = "You shared {chat} with {bot}";
+"lng_action_story_mention_me" = "You mentioned {user} in a story";
+"lng_action_story_mention" = "{user} mentioned you in a story";
+"lng_action_story_mention_button" = "View Story";
+"lng_action_story_mention_me_unavailable" = "The story where you mentioned {user} is no longer available.";
+"lng_action_story_mention_unavailable" = "The story where {user} mentioned you is no longer available.";
 
 "lng_premium_gift_duration_months#one" = "for {count} month";
 "lng_premium_gift_duration_months#other" = "for {count} months";
@@ -1686,6 +1709,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_about_private_link" = "This link will only work for members of this chat.";
 
 "lng_forwarded" = "Forwarded from {user}";
+"lng_forwarded_story" = "Story from {user}";
 "lng_forwarded_date" = "Original: {date}";
 "lng_forwarded_channel" = "Forwarded from {channel}";
 "lng_forwarded_psa_default" = "Forwarded from {channel}";
@@ -1960,6 +1984,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_sticker" = "Sticker";
 "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";
@@ -2018,6 +2044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_ph" = "Broadcast a message...";
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
+"lng_story_reply_ph" = "Reply privately...";
 "lng_send_text_no" = "Text not allowed.";
 "lng_send_text_no_about" = "The admins of this group only allow sending {types}.";
 "lng_send_text_type_and_last" = "{types} and {last}";
@@ -2035,6 +2062,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_as_premium_required" = "Subscribe to {link} to be able to comment on behalf of your channels in group chats.";
 "lng_send_as_premium_required_link" = "Telegram Premium";
 "lng_record_cancel" = "Release outside this field to cancel";
+"lng_record_cancel_stories" = "Release outside to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
 "lng_record_listen_cancel_sure" = "Are you sure you want to discard your recorded voice message?";
 "lng_record_lock_discard" = "Discard";
@@ -2381,6 +2409,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_add_contact" = "Create";
 "lng_add_contact_button" = "New contact";
 "lng_contacts_header" = "Contacts";
+"lng_contacts_hidden_stories" = "Hidden Stories";
+"lng_contacts_stories_status#one" = "{count} story";
+"lng_contacts_stories_status#other" = "{count} stories";
+"lng_contacts_stories_status_new#one" = "{count} new story";
+"lng_contacts_stories_status_new#other" = "{count} new stories";
 "lng_contact_not_joined" = "Unfortunately {name} has not joined Telegram yet, but you can send them an invitation.\n\nWe will notify you about any of your contacts who join Telegram.";
 "lng_try_other_contact" = "Try someone else";
 "lng_create_group_link" = "Link";
@@ -2451,6 +2484,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_copy" = "Copy";
 "lng_mediaview_forward" = "Forward";
 "lng_mediaview_delete" = "Delete";
+"lng_mediaview_save_to_profile" = "Save to Profile";
+"lng_mediaview_archive_story" = "Archive Story";
 "lng_mediaview_photos_all" = "View all photos";
 "lng_mediaview_files_all" = "View all files";
 "lng_mediaview_single_photo" = "Single Photo";
@@ -2464,6 +2499,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_doc_image" = "File";
 "lng_mediaview_today" = "today at {time}";
 "lng_mediaview_yesterday" = "yesterday at {time}";
+"lng_mediaview_just_now" = "just now";
+"lng_mediaview_minutes_ago#one" = "{count} minute ago";
+"lng_mediaview_minutes_ago#other" = "{count} minutes ago";
+"lng_mediaview_hours_ago#one" = "{count} hour ago";
+"lng_mediaview_hours_ago#other" = "{count} hours ago";
 "lng_mediaview_date_time" = "{date} at {time}";
 "lng_mediaview_set_userpic" = "Set as Main";
 "lng_mediaview_report_profile_photo" = "Report";
@@ -2471,6 +2511,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_title" = "Media viewer";
 "lng_mediaview_saved_to" = "Image was saved to your {downloads} folder";
 "lng_mediaview_saved_images_to" = "Images were saved to your {downloads} folder";
+"lng_mediaview_video_saved_to" = "Video file was saved to your {downloads} folder";
 "lng_mediaview_downloads" = "Downloads";
 "lng_mediaview_playback_speed" = "Playback speed: {speed}";
 "lng_mediaview_rotate_video" = "Rotate video";
@@ -3389,6 +3430,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_export_option_info_about" = "Your chosen screen name, username, phone number and profile pictures.";
 "lng_export_option_contacts" = "Contacts list";
 "lng_export_option_contacts_about" = "If you allow access, contacts are continuously synced with Telegram. You can adjust this in Settings > Privacy & Security on mobile devices.";
+"lng_export_option_stories" = "Stories archive";
+"lng_export_option_stories_about" = "All stories you posted from Telegram mobile apps.";
 "lng_export_option_sessions" = "Active sessions";
 "lng_export_option_sessions_about" = "We store this to display your connected devices in Settings > Privacy & Security > Active Sessions.";
 "lng_export_header_other" = "Other";
@@ -3675,9 +3718,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_background" = "View background";
 "lng_view_button_theme" = "View theme";
 "lng_view_button_message" = "View message";
+"lng_view_button_story" = "View story";
 "lng_view_button_voice_chat" = "Voice chat";
 "lng_view_button_voice_chat_channel" = "Live stream";
 "lng_view_button_request_join" = "Request to Join";
+"lng_view_button_external_link" = "Open link";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
@@ -3777,6 +3822,44 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_color_subtitle" = "Choose background";
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
+"lng_stories_my_name" = "My Story";
+"lng_stories_archive" = "Hide Stories";
+"lng_stories_unarchive" = "Unhide Stories";
+"lng_stories_row_count#one" = "{count} Story";
+"lng_stories_row_count#other" = "{count} Stories";
+"lng_stories_views#one" = "{count} view";
+"lng_stories_views#other" = "{count} views";
+"lng_stories_no_views" = "No views";
+"lng_stories_unsupported" = "This story is not supported\nby your version of Telegram.";
+"lng_stories_cant_reply" = "You can't reply to this story.";
+
+"lng_stories_my_title" = "Saved Stories";
+"lng_stories_archive_button" = "Stories Archive";
+"lng_stories_recent_button" = "Recent Stories";
+"lng_stories_archive_title" = "Stories Archive";
+"lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
+"lng_stories_reply_sent" = "Message Sent";
+"lng_stories_hidden_to_contacts" = "Stories from {user} will now be shown in **Archived Chats**.";
+"lng_stories_shown_in_chats" = "Stories from {user} will now be shown in the **Chats List**.";
+"lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
+"lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
+"lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
+"lng_stories_save_sure" = "Do you want to save this story to your profile?";
+"lng_stories_save_sure_many#one" = "Do you want to save {count} story to your profile?";
+"lng_stories_save_sure_many#other" = "Do you want to save {count} stories to your profile?";
+"lng_stories_save_done" = "This story is saved to your profile.";
+"lng_stories_save_done_many#one" = "{count} story is saved to your profile.";
+"lng_stories_save_done_many#other" = "{count} stories are saved to your profile.";
+"lng_stories_save_done_about" = "Saved stories can be viewed by others on your profile until you remove them.";
+"lng_stories_archive_sure" = "Do you want to hide this story from your profile?";
+"lng_stories_archive_sure_many#one" = "Do you want to hide {count} story from your profile?";
+"lng_stories_archive_sure_many#other" = "Do you want to hide {count} stories from your profile?";
+"lng_stories_archive_done" = "This story is hidden from your profile.";
+"lng_stories_archive_done_many#one" = "{count} story is hidden from your profile.";
+"lng_stories_archive_done_many#other" = "{count} stories are hidden from your profile.";
+
+"lng_stories_link_invalid" = "This link is broken or has expired.";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";

Telegram/Resources/qrc/telegram/export.qrc

@@ -37,6 +37,8 @@
     <file alias="images/section_photos@2x.png">../../export_html/images/section_photos@2x.png</file>
     <file alias="images/section_sessions.png">../../export_html/images/section_sessions.png</file>
     <file alias="images/section_sessions@2x.png">../../export_html/images/section_sessions@2x.png</file>
+    <file alias="images/section_stories.png">../../export_html/images/section_stories.png</file>
+    <file alias="images/section_stories@2x.png">../../export_html/images/section_stories@2x.png</file>
     <file alias="images/section_web.png">../../export_html/images/section_web.png</file>
     <file alias="images/section_web@2x.png">../../export_html/images/section_web@2x.png</file>
     <file alias="js/script.js">../../export_html/js/script.js</file>