fix: update submodule

chore: update Arch Linux packages (#23 )
chore: update README (#22 )
2026-07-26 15:32:08 +00:00 · 2024-11-24 13:39:48 +03:00 · 2024-11-24 13:04:56 +03:00 · 2024-11-24 13:03:51 +03:00 · 2024-11-24 12:10:05 +03:00 · 2024-11-23 12:34:26 +03:00
778 changed files with 51454 additions and 17342 deletions
@@ -42,7 +42,7 @@ jobs:

  windows:
    name: Windows
-    runs-on: windows-2022
+    runs-on: windows-latest

    strategy:
      matrix:
@@ -94,6 +94,14 @@ jobs:
          nuget sources Disable -Name "Microsoft Visual Studio Offline Packages"
          nuget sources Add -Source https://api.nuget.org/v3/index.json & exit 0

+      - name: ThirdParty cache.
+        id: cache-third-party
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.TBUILD }}\ThirdParty
+          key: ${{ runner.OS }}-${{ matrix.arch }}-third-party-${{ env.CACHE_KEY }}
+          restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-third-party-
+
      - name: Libraries cache.
        id: cache-libs
        uses: actions/cache@v4
@@ -51,3 +51,6 @@ stage
 *.*~
 .idea/
 cmake-build-debug/
+
+# Project specific
+Telegram/SourceFiles/_other/packer_private.h
@@ -3,7 +3,7 @@
 	url = https://github.com/telegramdesktop/libtgvoip
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
-	url = https://github.com/desktop-app/GSL.git
+	url = https://github.com/Microsoft/GSL.git
 [submodule "Telegram/ThirdParty/xxHash"]
 	path = Telegram/ThirdParty/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
@@ -24,7 +24,7 @@
 	url = https://github.com/desktop-app/lib_base.git
 [submodule "Telegram/codegen"]
 	path = Telegram/codegen
-	url = https://github.com/desktop-app/codegen.git
+	url = https://github.com/AyuGram/codegen.git
 [submodule "Telegram/lib_ui"]
 	path = Telegram/lib_ui
 	url = https://github.com/AyuGram/lib_ui.git
@@ -0,0 +1,100 @@
+# AyuGram
+
+![AyuGram Лого](.github/AyuGram.png) ![AyuChan](.github/AyuChan.png)
+
+[ [English](README.md)  | Русский ]
+
+## Функции и Фишки
+
+- Полный режим призрака (настраиваемый)
+- История удалений и изменений сообщений
+- Кастомизация шрифта
+- Режим Стримера
+- Локальный телеграм премиум
+- Превью медиа и быстрая реакция при сильном нажатии на тачпад (macOS)
+- Улучшенный вид
+
+И многое другое. Посмотрите нашу [Документацию](https://docs.ayugram.one/desktop/) для более подробной информации.
+
+<h3>
+  <details>
+    <summary>Скриншоты настроек</summary>
+    <img src='.github/demos/demo1.png' width='268'>
+    <img src='.github/demos/demo2.png' width='268'>
+    <img src='.github/demos/demo3.png' width='268'>
+    <img src='.github/demos/demo4.png' width='268'>
+  </details>
+</h3>
+
+## Установка
+
+### Windows
+
+#### Официальный вариант
+
+Вы можете скачать готовый бинарный файл со [вкладки Releases](https://github.com/AyuGram/AyuGramDesktop/releases) или из
+[Телеграм чата](https://t.me/ayugramchat/12788).
+
+#### Winget
+
+```bash
+winget install RadolynLabs.AyuGramDesktop
+```
+
+#### Scoop
+
+```bash
+scoop bucket add extras
+scoop install ayugram
+```
+
+#### Сборка вручную
+
+Следуйте [официальному руководству](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-win-x64.md), если
+вы хотите собрать AyuGram сами.
+
+### Arch Linux
+
+Вы можете установить `ayugram-desktop` или `ayugram-desktop-bin`
+из [AUR](https://aur.archlinux.org/packages?O=0&K=ayugram).
+
+### NixOS
+
+Попробуйте [этот репозиторий](https://github.com/ayugram-port/ayugram-desktop).
+
+### Любой другой Линукс дистрибутив
+
+Следуйте [официальному руководству](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-linux.md).
+
+### Примечания для Windows
+
+Убедитесь что у вас присутствуют эти зависимости:
+
+- C++ MFC latest (x86 & x64)
+- C++ ATL latest (x86 & x64)
+- последний Windows 11 SDK
+
+## Пожертвования
+
+Вам нравится использовать **AyuGram**? Оставьте нам чаевые!
+
+[Здесь доступные варианты.](https://docs.ayugram.one/donate/)
+
+## Использованные материалы
+
+### Телеграм клиенты
+
+- [Telegram Desktop](https://github.com/telegramdesktop/tdesktop)
+- [Kotatogram](https://github.com/kotatogram/kotatogram-desktop)
+- [64Gram](https://github.com/TDesktop-x64/tdesktop)
+- [Forkgram](https://github.com/forkgram/tdesktop)
+
+### Использованные библиотеки
+
+- [JSON for Modern C++](https://github.com/nlohmann/json)
+- [SQLite](https://github.com/sqlite/sqlite)
+- [sqlite_orm](https://github.com/fnc12/sqlite_orm)
+
+### Иконки
+
+- [Solar Icon Set](https://www.figma.com/community/file/1166831539721848736)
@@ -2,6 +2,8 @@

 ![AyuGram Logo](.github/AyuGram.png) ![AyuChan](.github/AyuChan.png)

+[ English  |   [Русский](README-RU.md) ]
+
 ## Features

 - Full ghost mode (flexible)
@@ -10,16 +12,20 @@
 - Font customization
 - Streamer mode
 - Local Telegram Premium
+- Media preview & quick reaction on force click (macOS)
 - Enhanced appearance

 And many more. Check out our [Documentation](https://docs.ayugram.one/desktop/).

-## Preferences screenshots
-
-<img src='.github/demos/demo1.png' width='268'>
-<img src='.github/demos/demo2.png' width='268'>
-<img src='.github/demos/demo3.png' width='268'>
-<img src='.github/demos/demo4.png' width='268'>
+<h3>
+  <details>
+    <summary>Preferences screenshots</summary>
+    <img src='.github/demos/demo1.png' width='268'>
+    <img src='.github/demos/demo2.png' width='268'>
+    <img src='.github/demos/demo3.png' width='268'>
+    <img src='.github/demos/demo4.png' width='268'>
+  </details>
+</h3>

 ## Downloads

@@ -50,11 +56,11 @@ build by yourself.

 ### Arch Linux

-You can install `ayugram-desktop` or `ayugram-desktop-git` from [AUR](https://aur.archlinux.org/packages?O=0&K=ayugram).
+You can install `ayugram-desktop` or `ayugram-desktop-bin` from [AUR](https://aur.archlinux.org/packages?O=0&K=ayugram).

 ### NixOS

-See [this repository](https://github.com/kaeeraa/ayugram-desktop) for installation manual.
+See [this repository](https://github.com/ayugram-port/ayugram-desktop) for installation manual.

 ### Any other Linux distro

@@ -37,6 +37,10 @@ include(cmake/td_scheme.cmake)
 include(cmake/td_ui.cmake)
 include(cmake/generate_appdata_changelog.cmake)

+if (DESKTOP_APP_TEST_APPS)
+    include(cmake/tests.cmake)
+endif()
+
 if (WIN32)
    include(cmake/generate_midl.cmake)
    generate_midl(Telegram ${src_loc}
@@ -132,12 +136,12 @@ set(ayugram_files
        ayu/ui/context_menu/context_menu.h
        ayu/ui/context_menu/menu_item_subtext.cpp
        ayu/ui/context_menu/menu_item_subtext.h
-        ayu/ui/sections/edited/edited_log_inner.cpp
-        ayu/ui/sections/edited/edited_log_inner.h
-        ayu/ui/sections/edited/edited_log_item.cpp
-        ayu/ui/sections/edited/edited_log_item.h
-        ayu/ui/sections/edited/edited_log_section.cpp
-        ayu/ui/sections/edited/edited_log_section.h
+        ayu/ui/message_history/history_inner.cpp
+        ayu/ui/message_history/history_inner.h
+        ayu/ui/message_history/history_item.cpp
+        ayu/ui/message_history/history_item.h
+        ayu/ui/message_history/history_section.cpp
+        ayu/ui/message_history/history_section.h
        ayu/ui/boxes/edit_deleted_mark.cpp
        ayu/ui/boxes/edit_deleted_mark.h
        ayu/ui/boxes/edit_edited_mark.cpp
@@ -188,6 +192,8 @@ PRIVATE
    api/api_bot.h
    api/api_chat_filters.cpp
    api/api_chat_filters.h
+    api/api_chat_filters_remove_manager.cpp
+    api/api_chat_filters_remove_manager.h
    api/api_chat_invite.cpp
    api/api_chat_invite.h
    api/api_chat_links.cpp
@@ -368,6 +374,8 @@ PRIVATE
    boxes/peer_list_box.h
    boxes/peer_list_controllers.cpp
    boxes/peer_list_controllers.h
+    boxes/peer_list_widgets.cpp
+    boxes/peer_list_widgets.h
    boxes/peer_lists_box.cpp
    boxes/peer_lists_box.h
    boxes/passcode_box.cpp
@@ -390,12 +398,16 @@ PRIVATE
    boxes/self_destruction_box.h
    boxes/send_credits_box.cpp
    boxes/send_credits_box.h
+    boxes/send_gif_with_caption_box.cpp
+    boxes/send_gif_with_caption_box.h
    boxes/send_files_box.cpp
    boxes/send_files_box.h
    boxes/sessions_box.cpp
    boxes/sessions_box.h
    boxes/share_box.cpp
    boxes/share_box.h
+    boxes/star_gift_box.cpp
+    boxes/star_gift_box.h
    boxes/sticker_set_box.cpp
    boxes/sticker_set_box.h
    boxes/stickers_box.cpp
@@ -643,6 +655,8 @@ PRIVATE
    data/data_lastseen_status.h
    data/data_location.cpp
    data/data_location.h
+    data/data_media_preload.cpp
+    data/data_media_preload.h
    data/data_media_rotation.cpp
    data/data_media_rotation.h
    data/data_media_types.cpp
@@ -678,6 +692,7 @@ PRIVATE
    data/data_replies_list.h
    data/data_reply_preview.cpp
    data/data_reply_preview.h
+    data/data_report.h
    data/data_saved_messages.cpp
    data/data_saved_messages.h
    data/data_saved_sublist.cpp
@@ -705,6 +720,8 @@ PRIVATE
    data/data_thread.h
    data/data_types.cpp
    data/data_types.h
+    data/data_unread_value.cpp
+    data/data_unread_value.h
    data/data_user.cpp
    data/data_user.h
    data/data_user_photos.cpp
@@ -1021,6 +1038,10 @@ PRIVATE
    info/media/info_media_widget.h
    info/members/info_members_widget.cpp
    info/members/info_members_widget.h
+    info/peer_gifts/info_peer_gifts_common.cpp
+    info/peer_gifts/info_peer_gifts_common.h
+    info/peer_gifts/info_peer_gifts_widget.cpp
+    info/peer_gifts/info_peer_gifts_widget.h
    info/polls/info_polls_results_inner_widget.cpp
    info/polls/info_polls_results_inner_widget.h
    info/polls/info_polls_results_widget.cpp
@@ -1047,6 +1068,10 @@ PRIVATE
    info/profile/info_profile_values.h
    info/profile/info_profile_widget.cpp
    info/profile/info_profile_widget.h
+    info/reactions_list/info_reactions_list_widget.cpp
+    info/reactions_list/info_reactions_list_widget.h
+    info/requests_list/info_requests_list_widget.cpp
+    info/requests_list/info_requests_list_widget.h
    info/saved/info_saved_sublists_widget.cpp
    info/saved/info_saved_sublists_widget.h
    info/settings/info_settings_widget.cpp
@@ -1060,6 +1085,7 @@ PRIVATE
    info/statistics/info_statistics_list_controllers.h
    info/statistics/info_statistics_recent_message.cpp
    info/statistics/info_statistics_recent_message.h
+    info/statistics/info_statistics_tag.h
    info/statistics/info_statistics_widget.cpp
    info/statistics/info_statistics_widget.h
    info/stories/info_stories_inner_widget.cpp
@@ -1096,6 +1122,10 @@ PRIVATE
    info/info_wrap_widget.h
    inline_bots/bot_attach_web_view.cpp
    inline_bots/bot_attach_web_view.h
+    inline_bots/inline_bot_confirm_prepared.cpp
+    inline_bots/inline_bot_confirm_prepared.h
+    inline_bots/inline_bot_downloads.cpp
+    inline_bots/inline_bot_downloads.h
    inline_bots/inline_bot_layout_internal.cpp
    inline_bots/inline_bot_layout_internal.h
    inline_bots/inline_bot_layout_item.cpp
@@ -1227,6 +1257,8 @@ PRIVATE
    media/streaming/media_streaming_player.h
    media/streaming/media_streaming_reader.cpp
    media/streaming/media_streaming_reader.h
+    media/streaming/media_streaming_round_preview.cpp
+    media/streaming/media_streaming_round_preview.h
    media/streaming/media_streaming_utility.cpp
    media/streaming/media_streaming_utility.h
    media/streaming/media_streaming_video_track.cpp
@@ -1556,6 +1588,8 @@ PRIVATE
    support/support_templates.h
    ui/boxes/edit_invite_link_session.cpp
    ui/boxes/edit_invite_link_session.h
+    ui/boxes/peer_qr_box.cpp
+    ui/boxes/peer_qr_box.h
    ui/chat/attach/attach_item_single_file_preview.cpp
    ui/chat/attach/attach_item_single_file_preview.h
    ui/chat/attach/attach_item_single_media_preview.cpp
@@ -1564,6 +1598,10 @@ PRIVATE
    ui/chat/choose_send_as.h
    ui/chat/choose_theme_controller.cpp
    ui/chat/choose_theme_controller.h
+    ui/chat/sponsored_message_bar.cpp
+    ui/chat/sponsored_message_bar.h
+    ui/controls/emoji_button_factory.cpp
+    ui/controls/emoji_button_factory.h
    ui/controls/location_picker.cpp
    ui/controls/location_picker.h
    ui/controls/silent_toggle.cpp
@@ -1589,8 +1627,14 @@ PRIVATE
    ui/image/image_location_factory.h
    ui/text/format_song_document_name.cpp
    ui/text/format_song_document_name.h
+    ui/widgets/expandable_peer_list.cpp
+    ui/widgets/expandable_peer_list.h
    ui/widgets/label_with_custom_emoji.cpp
    ui/widgets/label_with_custom_emoji.h
+    ui/widgets/chat_filters_tabs_strip.cpp
+    ui/widgets/chat_filters_tabs_strip.h
+    ui/widgets/peer_bubble.cpp
+    ui/widgets/peer_bubble.h
    ui/countryinput.cpp
    ui/countryinput.h
    ui/dynamic_thumbnails.cpp
@@ -1910,7 +1954,7 @@ endif()

 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})

-if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+if (MSVC)
    target_link_libraries(Telegram
    PRIVATE
        delayimp
@@ -2007,7 +2051,7 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
            base/platform/win/base_windows_safe_library.h
        )
        target_include_directories(Updater PRIVATE ${lib_base_loc})
-        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+        if (MSVC)
            target_link_libraries(Updater
            PRIVATE
                delayimp
@@ -582,3 +582,55 @@ div.toast_shown {
 .bot_button_column_separator {
    width: 2px
 }
+
+.reactions {
+    margin: 5px 0;
+}
+
+.reactions .reaction {
+    display: inline-flex;
+    height: 20px;
+    border-radius: 15px;
+    background-color: #e8f5fc;
+    color: #168acd;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
+.reactions .reaction.active {
+    background-color: #40a6e2;
+    color: #fff;
+}
+
+.reactions .reaction.paid {
+    background-color: #fdf6e1;
+    color: #c58523;
+}
+
+.reactions .reaction.active.paid {
+    background-color: #ecae0a;
+    color: #fdf6e1;
+}
+
+.reactions .reaction .emoji {
+    line-height: 20px;
+    margin: 0 5px;
+    font-size: 15px;
+}
+
+.reactions .reaction .userpic:not(:first-child) {
+    margin-left: -8px;
+}
+
+.reactions .reaction .userpic {
+    display: inline-block;
+}
+
+.reactions .reaction .userpic .initials {
+    font-size: 8px;
+}
+
+.reactions .reaction .count {
+    margin-right: 8px;
+    line-height: 20px;
+}
@@ -0,0 +1 @@
+<svg width="1000px" height="1000px" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M226.328419,494.722069 C372.088573,431.216685 469.284839,389.350049 517.917216,369.122161 C656.772535,311.36743 685.625481,301.334815 704.431427,301.003532 C708.567621,300.93067 717.815839,301.955743 723.806446,306.816707 C728.864797,310.92121 730.256552,316.46581 730.922551,320.357329 C731.588551,324.248848 732.417879,333.113828 731.758626,340.040666 C724.234007,419.102486 691.675104,610.964674 675.110982,699.515267 C668.10208,736.984342 654.301336,749.547532 640.940618,750.777006 C611.904684,753.448938 589.856115,731.588035 561.733393,713.153237 C517.726886,684.306416 492.866009,666.349181 450.150074,638.200013 C400.78442,605.66878 432.786119,587.789048 460.919462,558.568563 C468.282091,550.921423 596.21508,434.556479 598.691227,424.000355 C599.00091,422.680135 599.288312,417.758981 596.36474,415.160431 C593.441168,412.561881 589.126229,413.450484 586.012448,414.157198 C581.598758,415.158943 511.297793,461.625274 375.109553,553.556189 C355.154858,567.258623 337.080515,573.934908 320.886524,573.585046 C303.033948,573.199351 268.692754,563.490928 243.163606,555.192408 C211.851067,545.013936 186.964484,539.632504 189.131547,522.346309 C190.260287,513.342589 202.659244,504.134509 226.328419,494.722069 Z" id="Path-3" fill="#FFFFFF"></path></g></svg>
@@ -12,6 +12,7 @@ body {
 	margin: 0;
 	background-color: var(--td-window-bg);
 	color: var(--td-window-fg);
+	zoom: var(--td-zoom-percentage);
 }

 html.custom_scroll ::-webkit-scrollbar {
@@ -72,6 +72,9 @@ var IV = {
 		}
 	},
 	frameKeyDown: function (e) {
+		const key0 = (e.key === '0')
+			|| (e.code === 'Key0')
+			|| (e.keyCode === 48);
 		const keyW = (e.key === 'w')
 			|| (e.code === 'KeyW')
 			|| (e.keyCode === 87);
@@ -81,12 +84,12 @@ var IV = {
 		const keyM = (e.key === 'm')
 			|| (e.code === 'KeyM')
 			|| (e.keyCode === 77);
-		if ((e.metaKey || e.ctrlKey) && (keyW || keyQ || keyM)) {
+		if ((e.metaKey || e.ctrlKey) && (keyW || keyQ || keyM || key0)) {
 			e.preventDefault();
 			IV.notify({
 				event: 'keydown',
 				modifier: e.ctrlKey ? 'ctrl' : 'cmd',
-				key: keyW ? 'w' : keyQ ? 'q' : 'm',
+				key: key0 ? '0' : keyW ? 'w' : keyQ ? 'q' : 'm',
 			});
 		} else if (e.key === 'Escape' || e.keyCode === 27) {
 			e.preventDefault();
@@ -28,6 +28,7 @@
    <file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
    <file alias="search.tgs">../../animations/search.tgs</file>
    <file alias="noresults.tgs">../../animations/noresults.tgs</file>
+    <file alias="hello_status.tgs">../../animations/hello_status.tgs</file>

    <file alias="dice_idle.tgs">../../animations/dice/dice_idle.tgs</file>
    <file alias="dart_idle.tgs">../../animations/dice/dart_idle.tgs</file>
@@ -7,6 +7,7 @@
    <file alias="art/logo_256.png">../../art/logo_256.png</file>
    <file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
    <file alias="art/themeimage.jpg">../../art/themeimage.jpg</file>
+    <file alias="art/round_placeholder.jpg">../../art/round_placeholder.jpg</file>
    <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
    <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
    <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>
@@ -31,6 +32,7 @@
    <file alias="topic_icons/gray.svg">../../art/topic_icons/gray.svg</file>
    <file alias="topic_icons/general.svg">../../art/topic_icons/general.svg</file>
    <file alias="links_subscription.svg">../../icons/info/edit/links_subscription.svg</file>
+    <file alias="plane_white.svg">../../icons/plane_white.svg</file>
  </qresource>
  <qresource prefix="/icons">
    <file alias="calls/hands.lottie">../../icons/calls/hands.lottie</file>
@@ -10,7 +10,7 @@
  <Identity Name="TelegramMessengerLLP.TelegramDesktop"
    ProcessorArchitecture="ARCHITECTURE"
    Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.4.1.0" />
+    Version="5.8.3.0" />
  <Properties>
    <DisplayName>Telegram Desktop</DisplayName>
    <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
@@ -16,6 +16,8 @@
  </compatibility>
  <application xmlns="urn:schemas-microsoft-com:asm.v3">
    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
    </windowsSettings>
  </application>
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,4,1,0
- PRODUCTVERSION 5,4,1,0
+ FILEVERSION 5,8,3,0
+ PRODUCTVERSION 5,8,3,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Radolyn Labs"
            VALUE "FileDescription", "AyuGram Desktop"
-            VALUE "FileVersion", "5.4.1.0"
+            VALUE "FileVersion", "5.8.3.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2024"
            VALUE "ProductName", "AyuGram Desktop"
-            VALUE "ProductVersion", "5.4.1.0"
+            VALUE "ProductVersion", "5.8.3.0"
        END
    END
    BLOCK "VarFileInfo"
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,4,1,0
- PRODUCTVERSION 5,4,1,0
+ FILEVERSION 5,8,3,0
+ PRODUCTVERSION 5,8,3,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Radolyn Labs"
            VALUE "FileDescription", "AyuGram Desktop Updater"
-            VALUE "FileVersion", "5.4.1.0"
+            VALUE "FileVersion", "5.8.3.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2024"
            VALUE "ProductName", "AyuGram Desktop"
-            VALUE "ProductVersion", "5.4.1.0"
+            VALUE "ProductVersion", "5.8.3.0"
        END
    END
    BLOCK "VarFileInfo"
@@ -13,9 +13,9 @@ bool OnlyAlphaKey = false;

 const char *PublicKey = "\
 -----BEGIN RSA PUBLIC KEY-----\n\
-MIGJAoGBAMA4ViQrjkPZ9xj0lrer3r23JvxOnrtE8nI69XLGSr+sRERz9YnUptnU\n\
-BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
-+9PKKlb8mmr3BB9A45ZNwLT6G9AK3+qkZLHojeSA+m84/a6GP4svAgMBAAE=\n\
+MIGJAoGBAOIENxe1sfT2t7b+HUMpnT6RnN/sCqY0JjK7/1A/59daDc6i/K4023jw\n\
+Us+187Pa2VSaPh3kDywp9PfLDFgFiPTD9BsBvpaSK9p3zyG8k6an3+GbUTlUgmFv\n\
+eI0pg7vmceIl0Lcy9nndfEx27UQId3Y3dQTMuwwFYGtjJAMHNNq5AgMBAAE=\n\
 -----END RSA PUBLIC KEY-----\
 ";

@@ -29,8 +29,7 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\

 extern const char *PrivateKey;
 extern const char *PrivateBetaKey;
-#include "../../../../DesktopPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing
-#include "../../../../DesktopPrivate/alpha_private.h" // private key for alpha version file generation
+#include "packer_private.h" // RSA PRIVATE KEYS for update signing

 QString countAlphaVersionSignature(quint64 version);

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #import <Cocoa/Cocoa.h>
 #include <sys/xattr.h>

-NSString *appName = @"Telegram.app";
+NSString *appName = @"AyuGram.app";
 NSString *appDir = nil;
 NSString *workDir = nil;

@@ -56,7 +56,7 @@ void RemoveQuarantineAttribute(NSString *path) {

 void RemoveQuarantineFromBundle(NSString *path) {
 	RemoveQuarantineAttribute(path);
-	RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/MacOS/Telegram"]);
+	RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/MacOS/AyuGram"]);
 	RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/Helpers/crashpad_handler"]);
 	RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/Frameworks/Updater"]);
 }
@@ -163,9 +163,9 @@ int main(int argc, const char * argv[]) {

 		writeLog([@"Starting update files iteration, path: " stringByAppendingString: srcEnum]);

-		// Take the Updater (this currently running binary) from the place where it was placed by Telegram
+		// Take the Updater (this currently running binary) from the place where it was placed by AyuGram
 		// and copy it to the folder with the new version of the app (ready),
-		// so it won't be deleted when we will clear the "Telegram.app/Contents" folder.
+		// so it won't be deleted when we will clear the "AyuGram.app/Contents" folder.
 		NSString *oldVersionUpdaterPath = [appDirFull stringByAppendingString: @"/Contents/Frameworks/Updater" ];
 		NSString *newVersionUpdaterPath = [srcEnum stringByAppendingString:[[NSArray arrayWithObjects:@"/", appName, @"/Contents/Frameworks/Updater", nil] componentsJoinedByString:@""]];
 		writeLog([[NSArray arrayWithObjects: @"Copying Updater from old path ", oldVersionUpdaterPath, @" to new path ", newVersionUpdaterPath, nil] componentsJoinedByString:@""]);
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/url_auth_box.h"
 #include "boxes/peers/choose_peer_box.h"
 #include "lang/lang_keys.h"
+#include "chat_helpers/bot_command.h"
 #include "core/core_cloud_password.h"
 #include "core/click_handler_types.h"
 #include "data/data_changes.h"
@@ -38,6 +39,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"

+#include <QtGui/QGuiApplication>
+#include <QtGui/QClipboard>
+
 namespace Api {
 namespace {

@@ -502,11 +506,19 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 			bot->session().attachWebView().open({
 				.bot = bot,
 				.context = { .controller = controller },
-				.button = {.text = button->text, .url = button->data },
+				.button = { .text = button->text, .url = button->data },
 				.source = InlineBots::WebViewSourceButton{ .simple = true },
 			});
 		}
 	} break;
+
+	case ButtonType::CopyText: {
+		const auto text = QString::fromUtf8(button->data);
+		if (!text.isEmpty()) {
+			QGuiApplication::clipboard()->setText(text);
+			controller->showToast(tr::lng_text_copied(tr::now));
+		}
+	} break;
 	}
 }

@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_filters.h"
@@ -26,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/filter_icons.h"
 #include "ui/vertical_list.h"
+#include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
 #include "styles/style_filter_icons.h"
 #include "styles/style_layers.h"
@@ -151,6 +153,7 @@ void InitFilterLinkHeader(
 		.badge = (type == Ui::FilterLinkHeaderType::AddingChats
 			? std::move(count)
 			: rpl::single(0)),
+		.horizontalFilters = Core::App().settings().chatFiltersHorizontal(),
 	});
 	const auto widget = header.widget;
 	widget->resizeToWidth(st::boxWideWidth);
@@ -231,12 +234,12 @@ void ImportInvite(
 		api->request(MTPchatlists_JoinChatlistInvite(
 			MTP_string(slug),
 			MTP_vector<MTPInputPeer>(std::move(inputs))
-		)).done(callback).fail(error).send();
+		)).done(callback).fail(error).handleFloodErrors().send();
 	} else {
 		api->request(MTPchatlists_JoinChatlistUpdates(
 			MTP_inputChatlistDialogFilter(MTP_int(filterId)),
 			MTP_vector<MTPInputPeer>(std::move(inputs))
-		)).done(callback).fail(error).send();
+		)).done(callback).fail(error).handleFloodErrors().send();
 	}
 }

@@ -516,6 +519,8 @@ void ShowImportError(
 	} else {
 		window->showToast((error == u"INVITE_SLUG_EXPIRED"_q)
 			? tr::lng_group_invite_bad_link(tr::now)
+			: error.startsWith(u"FLOOD_WAIT_"_q)
+			? tr::lng_flood_error(tr::now)
 			: error);
 	}
 }
@@ -0,0 +1,128 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_chat_filters_remove_manager.h"
+
+#include "api/api_chat_filters.h"
+#include "apiwrap.h"
+#include "data/data_chat_filters.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/ui_utility.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+
+namespace Api {
+namespace {
+
+void RemoveChatFilter(
+		not_null<Main::Session*> session,
+		FilterId filterId,
+		std::vector<not_null<PeerData*>> leave) {
+	const auto api = &session->api();
+	session->data().chatsFilters().apply(MTP_updateDialogFilter(
+		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
+		MTP_int(filterId),
+		MTPDialogFilter()));
+	if (leave.empty()) {
+		api->request(MTPmessages_UpdateDialogFilter(
+			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
+			MTP_int(filterId),
+			MTPDialogFilter()
+		)).send();
+	} else {
+		api->request(MTPchatlists_LeaveChatlist(
+			MTP_inputChatlistDialogFilter(MTP_int(filterId)),
+			MTP_vector<MTPInputPeer>(ranges::views::all(
+				leave
+			) | ranges::views::transform([](not_null<PeerData*> peer) {
+				return MTPInputPeer(peer->input);
+			}) | ranges::to<QVector<MTPInputPeer>>())
+		)).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+	}
+}
+
+} // namespace
+
+RemoveComplexChatFilter::RemoveComplexChatFilter() = default;
+
+void RemoveComplexChatFilter::request(
+		QPointer<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id) {
+	const auto session = &weak->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
+	const auto has = filter.hasMyLinks();
+	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
+		if (!has && onlyWhenHas) {
+			action();
+			return;
+		}
+		weak->window().show(Ui::MakeConfirmBox({
+			.text = (has
+				? tr::lng_filters_delete_sure()
+				: tr::lng_filters_remove_sure()),
+			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
+			.confirmText = (has
+				? tr::lng_box_delete()
+				: tr::lng_filters_remove_yes()),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	};
+	const auto simple = [=] {
+		confirm([=] { RemoveChatFilter(session, id, {}); });
+	};
+	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
+	if (suggestRemoving.empty()) {
+		simple();
+		return;
+	} else if (_removingRequestId) {
+		if (_removingId == id) {
+			return;
+		}
+		session->api().request(_removingRequestId).cancel();
+	}
+	_removingId = id;
+	_removingRequestId = session->api().request(
+		MTPchatlists_GetLeaveChatlistSuggestions(
+			MTP_inputChatlistDialogFilter(
+				MTP_int(id)))
+	).done(crl::guard(widget, [=, this](const MTPVector<MTPPeer> &result) {
+		_removingRequestId = 0;
+		const auto suggestRemovePeers = ranges::views::all(
+			result.v
+		) | ranges::views::transform([=](const MTPPeer &peer) {
+			return session->data().peer(peerFromMTP(peer));
+		}) | ranges::to_vector;
+		const auto chosen = crl::guard(widget, [=](
+				std::vector<not_null<PeerData*>> peers) {
+			RemoveChatFilter(session, id, std::move(peers));
+		});
+		confirm(crl::guard(widget, [=] {
+			Api::ProcessFilterRemove(
+				weak,
+				filter.title(),
+				filter.iconEmoji(),
+				suggestRemoving,
+				suggestRemovePeers,
+				chosen);
+		}), true);
+	})).fail(crl::guard(widget, [=, this] {
+		_removingRequestId = 0;
+		simple();
+	})).send();
+}
+
+} // namespace Api
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Api {
+
+class RemoveComplexChatFilter final {
+public:
+	RemoveComplexChatFilter();
+
+	void request(
+		QPointer<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id);
+
+private:
+	FilterId _removingId = 0;
+	mtpRequestId _removingRequestId = 0;
+
+};
+
+} // namespace Api
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_chat_invite.h"

 #include "apiwrap.h"
+#include "api/api_credits.h"
 #include "boxes/premium_limits_box.h"
 #include "core/application.h"
 #include "data/components/credits.h"
@@ -25,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/empty_userpic.h"
@@ -129,6 +131,7 @@ void ConfirmSubscriptionBox(
 	struct State final {
 		std::shared_ptr<Data::PhotoMedia> photoMedia;
 		std::unique_ptr<Ui::EmptyUserpic> photoEmpty;
+		QImage frame;

 		std::optional<MTP::Sender> api;
 		Ui::RpWidget* saveButton = nullptr;
@@ -146,25 +149,45 @@ void ConfirmSubscriptionBox(
 	const auto userpic = userpicWrap->entity();
 	const auto photoSize = st::confirmInvitePhotoSize;
 	userpic->resize(Size(photoSize));
+	const auto creditsIconSize = photoSize / 3;
+	const auto creditsIconCallback =
+		Ui::PaintOutlinedColoredCreditsIconCallback(
+			creditsIconSize,
+			1.5);
+	state->frame = QImage(
+		Size(photoSize * style::DevicePixelRatio()),
+		QImage::Format_ARGB32_Premultiplied);
+	state->frame.setDevicePixelRatio(style::DevicePixelRatio());
 	const auto options = Images::Option::RoundCircle;
 	userpic->paintRequest(
 	) | rpl::start_with_next([=, small = Data::PhotoSize::Small] {
-		auto p = QPainter(userpic);
-		if (state->photoMedia) {
-			if (const auto image = state->photoMedia->image(small)) {
-				p.drawPixmap(
+		state->frame.fill(Qt::transparent);
+		{
+			auto p = QPainter(&state->frame);
+			if (state->photoMedia) {
+				if (const auto image = state->photoMedia->image(small)) {
+					p.drawPixmap(
+						0,
+						0,
+						image->pix(Size(photoSize), { .options = options }));
+				}
+			} else if (state->photoEmpty) {
+				state->photoEmpty->paintCircle(
+					p,
 					0,
 					0,
-					image->pix(Size(photoSize), { .options = options }));
+					userpic->width(),
+					photoSize);
+			}
+			if (creditsIconCallback) {
+				p.translate(
+					photoSize - creditsIconSize,
+					photoSize - creditsIconSize);
+				creditsIconCallback(p);
 			}
-		} else if (state->photoEmpty) {
-			state->photoEmpty->paintCircle(
-				p,
-				0,
-				0,
-				userpic->width(),
-				photoSize);
 		}
+		auto p = QPainter(userpic);
+		p.drawImage(0, 0, state->frame);
 	}, userpicWrap->lifetime());
 	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (photo) {
@@ -273,21 +296,39 @@ void ConfirmSubscriptionBox(
 		const auto buttonWidth = state->saveButton
 			? state->saveButton->width()
 			: 0;
+		const auto finish = [=] {
+			state->api = std::nullopt;
+			state->loading.force_assign(false);
+			if (const auto strong = weak.data()) {
+				strong->closeBox();
+			}
+		};
 		state->api->request(
 			MTPpayments_SendStarsForm(
-				MTP_flags(0),
 				MTP_long(formId),
 				MTP_inputInvoiceChatInviteSubscription(MTP_string(hash)))
 		).done([=](const MTPpayments_PaymentResult &result) {
-			state->api = std::nullopt;
-			state->loading.force_assign(false);
 			result.match([&](const MTPDpayments_paymentResult &data) {
 				session->api().applyUpdates(data.vupdates());
 			}, [](const MTPDpayments_paymentVerificationNeeded &data) {
 			});
-			if (weak) {
-				box->closeBox();
+			const auto refill = session->data().activeCreditsSubsRebuilder();
+			const auto strong = weak.data();
+			if (!strong) {
+				return;
 			}
+			if (!refill) {
+				return finish();
+			}
+			const auto api
+				= strong->lifetime().make_state<Api::CreditsHistory>(
+					session->user(),
+					true,
+					true);
+			api->requestSubscriptions({}, [=](Data::CreditsStatusSlice d) {
+				refill->fire(std::move(d));
+				finish();
+			});
 		}).fail([=](const MTP::Error &error) {
 			const auto id = error.type();
 			if (weak) {
@@ -367,12 +408,15 @@ void CheckChatInvite(
 		result.match([=](const MTPDchatInvite &data) {
 			const auto isGroup = !data.is_broadcast();
 			const auto hasPricing = !!data.vsubscription_pricing();
-			if (hasPricing && !data.vsubscription_form_id()) {
+			const auto canRefulfill = data.is_can_refulfill_subscription();
+			if (hasPricing
+				&& !canRefulfill
+				&& !data.vsubscription_form_id()) {
 				strong->uiShow()->showToast(
 					tr::lng_confirm_phone_link_invalid(tr::now));
 				return;
 			}
-			const auto box = hasPricing
+			const auto box = (hasPricing && !canRefulfill)
 				? strong->show(Box(
 					ConfirmSubscriptionBox,
 					session,
@@ -264,14 +264,24 @@ ChatParticipant::ChatParticipant(
 		_rank = qs(data.vrank().value_or_empty());
 		_rights = ChatAdminRightsInfo(data.vadmin_rights());
 		_by = peerToUser(peerFromUser(data.vpromoted_by()));
+		_date = data.vdate().v;
 	}, [&](const MTPDchannelParticipantSelf &data) {
 		_type = Type::Member;
+		_date = data.vdate().v;
 		_by = peerToUser(peerFromUser(data.vinviter_id()));
+		if (data.vsubscription_until_date()) {
+			_subscriptionDate = data.vsubscription_until_date()->v;
+		}
 	}, [&](const MTPDchannelParticipant &data) {
 		_type = Type::Member;
+		_date = data.vdate().v;
+		if (data.vsubscription_until_date()) {
+			_subscriptionDate = data.vsubscription_until_date()->v;
+		}
 	}, [&](const MTPDchannelParticipantBanned &data) {
 		_restrictions = ChatRestrictionsInfo(data.vbanned_rights());
 		_by = peerToUser(peerFromUser(data.vkicked_by()));
+		_date = data.vdate().v;

 		_type = (_restrictions.flags & ChatRestriction::ViewMessages)
 			? Type::Banned
@@ -348,6 +358,24 @@ ChatAdminRightsInfo ChatParticipant::rights() const {
 	return _rights;
 }

+TimeId ChatParticipant::subscriptionDate() const {
+	return _subscriptionDate;
+}
+
+TimeId ChatParticipant::promotedSince() const {
+	return (_type == Type::Admin) ? _date : TimeId(0);
+}
+
+TimeId ChatParticipant::restrictedSince() const {
+	return (_type == Type::Restricted || _type == Type::Banned)
+		? _date
+		: TimeId(0);
+}
+
+TimeId ChatParticipant::memberSince() const {
+	return (_type == Type::Member) ? _date : TimeId(0);
+}
+
 ChatParticipant::Type ChatParticipant::type() const {
 	return _type;
 }
@@ -60,6 +60,11 @@ public:
 	ChatRestrictionsInfo restrictions() const;
 	ChatAdminRightsInfo rights() const;

+	TimeId subscriptionDate() const;
+	TimeId promotedSince() const;
+	TimeId restrictedSince() const;
+	TimeId memberSince() const;
+
 	Type type() const;
 	QString rank() const;

@@ -73,6 +78,8 @@ private:
 	bool _canBeEdited = false;

 	QString _rank;
+	TimeId _subscriptionDate = 0;
+	TimeId _date = 0;

 	ChatRestrictionsInfo _restrictions;
 	ChatAdminRightsInfo _rights;
@@ -12,6 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/core_cloud_password.h"
 #include "passport/passport_encryption.h"

+#include "base/unixtime.h"
+#include "base/call_delayed.h"
+
 namespace Api {
 namespace {

@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_updates.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
+#include "data/components/credits.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_peer.h"
@@ -38,8 +39,8 @@ constexpr auto kTransactionsLimit = 100;
 	if (const auto list = tl.data().vextended_media()) {
 		extended.reserve(list->v.size());
 		for (const auto &media : list->v) {
-			media.match([&](const MTPDmessageMediaPhoto &photo) {
-				if (const auto inner = photo.vphoto()) {
+			media.match([&](const MTPDmessageMediaPhoto &data) {
+				if (const auto inner = data.vphoto()) {
 					const auto photo = owner->processPhoto(*inner);
 					if (!photo->isNull()) {
 						extended.push_back(CreditsHistoryMedia{
@@ -48,9 +49,11 @@ constexpr auto kTransactionsLimit = 100;
 						});
 					}
 				}
-			}, [&](const MTPDmessageMediaDocument &document) {
-				if (const auto inner = document.vdocument()) {
-					const auto document = owner->processDocument(*inner);
+			}, [&](const MTPDmessageMediaDocument &data) {
+				if (const auto inner = data.vdocument()) {
+					const auto document = owner->processDocument(
+						*inner,
+						data.valt_documents());
 					if (document->isAnimation()
 						|| document->isVideoFile()
 						|| document->isGifv()) {
@@ -69,16 +72,26 @@ constexpr auto kTransactionsLimit = 100;
 	}, [](const auto &) {
 		return PeerId(0);
 	}).value;
+	const auto stargift = tl.data().vstargift();
+	const auto reaction = tl.data().is_reaction();
+	const auto incoming = (int64(tl.data().vstars().v) >= 0);
+	const auto saveActorId = (reaction || !extended.empty()) && incoming;
 	return Data::CreditsHistoryEntry{
 		.id = qs(tl.data().vid()),
 		.title = qs(tl.data().vtitle().value_or_empty()),
-		.description = qs(tl.data().vdescription().value_or_empty()),
+		.description = { qs(tl.data().vdescription().value_or_empty()) },
 		.date = base::unixtime::parse(tl.data().vdate().v),
 		.photoId = photo ? photo->id : 0,
 		.extended = std::move(extended),
 		.credits = tl.data().vstars().v,
 		.bareMsgId = uint64(tl.data().vmsg_id().value_or_empty()),
-		.barePeerId = barePeerId,
+		.barePeerId = saveActorId ? peer->id.value : barePeerId,
+		.bareGiveawayMsgId = uint64(
+			tl.data().vgiveaway_post_id().value_or_empty()),
+		.bareGiftStickerId = (stargift
+			? owner->processDocument(stargift->data().vsticker())->id
+			: 0),
+		.bareActorId = saveActorId ? barePeerId : uint64(0),
 		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
 			return Data::CreditsHistoryEntry::PeerType::Peer;
 		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
@@ -93,6 +106,8 @@ constexpr auto kTransactionsLimit = 100;
 			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}, [](const MTPDstarsTransactionPeerAds &) {
 			return Data::CreditsHistoryEntry::PeerType::Ads;
+		}, [](const MTPDstarsTransactionPeerAPI &) {
+			return Data::CreditsHistoryEntry::PeerType::API;
 		}),
 		.subscriptionUntil = tl.data().vsubscription_period()
 			? base::unixtime::parse(base::unixtime::now()
@@ -102,27 +117,42 @@ constexpr auto kTransactionsLimit = 100;
 			? base::unixtime::parse(tl.data().vtransaction_date()->v)
 			: QDateTime(),
 		.successLink = qs(tl.data().vtransaction_url().value_or_empty()),
+		.starsConverted = int(stargift
+			? stargift->data().vconvert_stars().v
+			: 0),
+		.floodSkip = int(tl.data().vfloodskip_number().value_or(0)),
+		.converted = stargift && incoming,
+		.stargift = stargift.has_value(),
 		.reaction = tl.data().is_reaction(),
 		.refunded = tl.data().is_refund(),
 		.pending = tl.data().is_pending(),
 		.failed = tl.data().is_failed(),
-		.in = (int64(tl.data().vstars().v) >= 0),
-		.gift = tl.data().is_gift(),
+		.in = incoming,
+		.gift = tl.data().is_gift() || stargift.has_value(),
 	};
 }

 [[nodiscard]] Data::SubscriptionEntry SubscriptionFromTL(
-		const MTPStarsSubscription &tl) {
+		const MTPStarsSubscription &tl,
+		not_null<PeerData*> peer) {
 	return Data::SubscriptionEntry{
 		.id = qs(tl.data().vid()),
 		.inviteHash = qs(tl.data().vchat_invite_hash().value_or_empty()),
+		.title = qs(tl.data().vtitle().value_or_empty()),
+		.slug = qs(tl.data().vinvoice_slug().value_or_empty()),
 		.until = base::unixtime::parse(tl.data().vuntil_date().v),
 		.subscription = Data::PeerSubscription{
 			.credits = tl.data().vpricing().data().vamount().v,
 			.period = tl.data().vpricing().data().vperiod().v,
 		},
 		.barePeerId = peerFromMTP(tl.data().vpeer()).value,
+		.photoId = (tl.data().vphoto()
+			? peer->owner().photoFromWeb(
+				*tl.data().vphoto(),
+				ImageLocation())->id
+			: 0),
 		.cancelled = tl.data().is_canceled(),
+		.cancelledByBot = tl.data().is_bot_canceled(),
 		.expired = (base::unixtime::now() > tl.data().vuntil_date().v),
 		.canRefulfill = tl.data().is_can_refulfill(),
 	};
@@ -145,7 +175,7 @@ constexpr auto kTransactionsLimit = 100;
 	if (const auto history = data.vsubscriptions()) {
 		subscriptions.reserve(history->v.size());
 		for (const auto &tl : history->v) {
-			subscriptions.push_back(SubscriptionFromTL(tl));
+			subscriptions.push_back(SubscriptionFromTL(tl, peer));
 		}
 	}
 	return Data::CreditsStatusSlice{
@@ -154,7 +184,8 @@ constexpr auto kTransactionsLimit = 100;
 		.balance = status.data().vbalance().v,
 		.subscriptionsMissingBalance
 			= status.data().vsubscriptions_missing_balance().value_or_empty(),
-		.allLoaded = !status.data().vnext_offset().has_value(),
+		.allLoaded = !status.data().vnext_offset().has_value()
+			&& !status.data().vsubscriptions_next_offset().has_value(),
 		.token = qs(status.data().vnext_offset().value_or_empty()),
 		.tokenSubscriptions = qs(
 			status.data().vsubscriptions_next_offset().value_or_empty()),
@@ -215,6 +246,10 @@ rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
 	};
 }

+Data::CreditTopupOptions CreditsTopupOptions::options() const {
+	return _options;
+}
+
 CreditsStatus::CreditsStatus(not_null<PeerData*> peer)
 : _peer(peer)
 , _api(&peer->session().api().instance()) {
@@ -233,6 +268,8 @@ void CreditsStatus::request(
 		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
 	)).done([=](const TLResult &result) {
 		_requestId = 0;
+		const auto balance = result.data().vbalance().v;
+		_peer->session().credits().apply(_peer->id, balance);
 		if (const auto onstack = done) {
 			onstack(StatusFromTL(result, _peer));
 		}
@@ -294,10 +331,6 @@ void CreditsHistory::requestSubscriptions(
 	}).send();
 }

-Data::CreditTopupOptions CreditsTopupOptions::options() const {
-	return _options;
-}
-
 rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 		not_null<Main::Session*> session) {
 	const auto username = session->appConfig().get<QString>(
@@ -385,4 +418,74 @@ Data::CreditsEarnStatistics CreditsEarnStatistics::data() const {
 	return _data;
 }

+CreditsGiveawayOptions::CreditsGiveawayOptions(not_null<PeerData*> peer)
+: _peer(peer)
+, _api(&peer->session().api().instance()) {
+}
+
+rpl::producer<rpl::no_value, QString> CreditsGiveawayOptions::request() {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		using TLOption = MTPStarsGiveawayOption;
+
+		const auto optionsFromTL = [=](const auto &options) {
+			return ranges::views::all(
+				options
+			) | ranges::views::transform([=](const auto &option) {
+				return Data::CreditsGiveawayOption{
+					.winners = ranges::views::all(
+						option.data().vwinners().v
+					) | ranges::views::transform([](const auto &winner) {
+						return Data::CreditsGiveawayOption::Winner{
+							.users = winner.data().vusers().v,
+							.perUserStars = winner.data().vper_user_stars().v,
+							.isDefault = winner.data().is_default(),
+						};
+					}) | ranges::to_vector,
+					.storeProduct = qs(
+						option.data().vstore_product().value_or_empty()),
+					.currency = qs(option.data().vcurrency()),
+					.amount = option.data().vamount().v,
+					.credits = option.data().vstars().v,
+					.yearlyBoosts = option.data().vyearly_boosts().v,
+					.isExtended = option.data().is_extended(),
+					.isDefault = option.data().is_default(),
+				};
+			}) | ranges::to_vector;
+		};
+		const auto fail = [=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		};
+
+		_api.request(MTPpayments_GetStarsGiveawayOptions(
+		)).done([=](const MTPVector<TLOption> &result) {
+			_options = optionsFromTL(result.v);
+			consumer.put_done();
+		}).fail(fail).send();
+
+		return lifetime;
+	};
+}
+
+Data::CreditsGiveawayOptions CreditsGiveawayOptions::options() const {
+	return _options;
+}
+
+void EditCreditsSubscription(
+		not_null<Main::Session*> session,
+		const QString &id,
+		bool cancel,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	using Flag = MTPpayments_ChangeStarsSubscription::Flag;
+	session->api().request(
+		MTPpayments_ChangeStarsSubscription(
+			MTP_flags(Flag::f_canceled),
+			MTP_inputPeerSelf(),
+			MTP_string(id),
+			MTP_bool(cancel)
+	)).done(done).fail([=](const MTP::Error &e) { fail(e.type()); }).send();
+}
+
 } // namespace Api
@@ -36,6 +36,22 @@ private:

 };

+class CreditsGiveawayOptions final {
+public:
+	CreditsGiveawayOptions(not_null<PeerData*> peer);
+
+	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
+	[[nodiscard]] Data::CreditsGiveawayOptions options() const;
+
+private:
+	const not_null<PeerData*> _peer;
+
+	Data::CreditsGiveawayOptions _options;
+
+	MTP::Sender _api;
+
+};
+
 class CreditsStatus final {
 public:
 	CreditsStatus(not_null<PeerData*> peer);
@@ -83,8 +99,8 @@ public:
 	[[nodiscard]] Data::CreditsEarnStatistics data() const;

 private:
+	const bool _isUser = false;
 	Data::CreditsEarnStatistics _data;
-	bool _isUser = false;

 	mtpRequestId _requestId = 0;

@@ -93,4 +109,11 @@ private:
 [[nodiscard]] rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	not_null<Main::Session*> session);

+void EditCreditsSubscription(
+	not_null<Main::Session*> session,
+	const QString &id,
+	bool cancel,
+	Fn<void()> done,
+	Fn<void(QString)> fail);
+
 } // namespace Api
@@ -40,6 +40,7 @@ void HandleWithdrawalButton(
 		std::shared_ptr<Ui::Show> show) {
 	Expects(receiver.currencyReceiver
 		|| (receiver.creditsReceiver && receiver.creditsAmount));
+
 	struct State {
 		rpl::lifetime lifetime;
 		bool loading = false;
@@ -58,8 +59,7 @@ void HandleWithdrawalButton(
 	const auto processOut = [=] {
 		if (state->loading) {
 			return;
-		}
-		if (peer && !receiver.creditsAmount()) {
+		} else if (peer && !receiver.creditsAmount()) {
 			return;
 		}
 		state->loading = true;
@@ -89,12 +89,15 @@ void HandleWithdrawalButton(
 					}
 				};
 				const auto fail = [=](const MTP::Error &error) {
-					show->showToast(error.type());
+					const auto message = error.type();
+					if (box && !box->handleCustomCheckError(message)) {
+						show->showToast(message);
+					}
 				};
 				if (channel) {
 					session->api().request(
 						MTPstats_GetBroadcastRevenueWithdrawalUrl(
-							channel->inputChannel,
+							channel->input,
 							result.result
 					)).done([=](const ChannelOutUrl &r) {
 						done(qs(r.data().vurl()));
@@ -134,7 +137,7 @@ void HandleWithdrawalButton(
 		if (channel) {
 			session->api().request(
 				MTPstats_GetBroadcastRevenueWithdrawalUrl(
-					channel->inputChannel,
+					channel->input,
 					MTP_inputCheckPasswordEmpty()
 			)).fail(fail).send();
 		} else if (peer) {
@@ -115,6 +115,28 @@ rpl::producer<bool> GlobalPrivacy::newRequirePremium() const {
 	return _newRequirePremium.value();
 }

+void GlobalPrivacy::loadPaidReactionAnonymous() {
+	if (_paidReactionAnonymousLoaded) {
+		return;
+	}
+	_paidReactionAnonymousLoaded = true;
+	_api.request(MTPmessages_GetPaidReactionPrivacy(
+	)).done([=](const MTPUpdates &result) {
+		_session->api().applyUpdates(result);
+	}).send();
+}
+
+void GlobalPrivacy::updatePaidReactionAnonymous(bool value) {
+	_paidReactionAnonymous = value;
+}
+
+bool GlobalPrivacy::paidReactionAnonymousCurrent() const {
+	return _paidReactionAnonymous.current();
+}
+
+rpl::producer<bool> GlobalPrivacy::paidReactionAnonymous() const {
+	return _paidReactionAnonymous.value();
+}

 void GlobalPrivacy::updateArchiveAndMute(bool value) {
 	update(
@@ -49,6 +49,11 @@ public:
 	[[nodiscard]] bool newRequirePremiumCurrent() const;
 	[[nodiscard]] rpl::producer<bool> newRequirePremium() const;

+	void loadPaidReactionAnonymous();
+	void updatePaidReactionAnonymous(bool value);
+	[[nodiscard]] bool paidReactionAnonymousCurrent() const;
+	[[nodiscard]] rpl::producer<bool> paidReactionAnonymous() const;
+
 private:
 	void apply(const MTPGlobalPrivacySettings &data);

@@ -67,7 +72,9 @@ private:
 	rpl::variable<bool> _showArchiveAndMute = false;
 	rpl::variable<bool> _hideReadTime = false;
 	rpl::variable<bool> _newRequirePremium = false;
+	rpl::variable<bool> _paidReactionAnonymous = false;
 	std::vector<Fn<void()>> _callbacks;
+	bool _paidReactionAnonymousLoaded = false;

 };

@@ -37,7 +37,8 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 				MTP_int(dimensions.width()),
 				MTP_int(dimensions.height()),
 				MTPint(), // preload_prefix_size
-				MTPdouble())); // video_start_ts
+				MTPdouble(), // video_start_ts
+				MTPstring())); // video_codec
 		} else {
 			attributes.push_back(MTP_documentAttributeImageSize(
 				MTP_int(dimensions.width()),
@@ -361,9 +361,10 @@ void Premium::resolveGiveawayInfo(
 				? GiveawayState::Refunded
 				: GiveawayState::Finished;
 			info.giftCode = qs(data.vgift_code_slug().value_or_empty());
-			info.activatedCount = data.vactivated_count().v;
+			info.activatedCount = data.vactivated_count().value_or_empty();
 			info.finishDate = data.vfinish_date().v;
 			info.startDate = data.vstart_date().v;
+			info.credits = data.vstars_prize().value_or_empty();
 		});
 		_giveawayInfoDone(std::move(info));
 	}).fail([=] {
@@ -508,7 +509,9 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::applyPrepaid(
 		_api.request(MTPpayments_LaunchPrepaidGiveaway(
 			_peer->input,
 			MTP_long(prepaidId),
-			Payments::InvoicePremiumGiftCodeGiveawayToTL(invoice)
+			invoice.creditsAmount
+				? Payments::InvoiceCreditsGiveawayToTL(invoice)
+				: Payments::InvoicePremiumGiftCodeGiveawayToTL(invoice)
 		)).done([=](const MTPUpdates &result) {
 			_peer->session().api().applyUpdates(result);
 			consumer.put_done();
@@ -537,16 +540,34 @@ Payments::InvoicePremiumGiftCode PremiumGiftCodeOptions::invoice(
 	const auto token = Token{ users, months };
 	const auto &store = _stores[token];
 	return Payments::InvoicePremiumGiftCode{
-		.randomId = randomId,
 		.currency = _optionsForOnePerson.currency,
-		.amount = store.amount,
 		.storeProduct = store.product,
+		.randomId = randomId,
+		.amount = store.amount,
 		.storeQuantity = store.quantity,
 		.users = token.users,
 		.months = token.months,
 	};
 }

+std::vector<GiftOptionData> PremiumGiftCodeOptions::optionsForPeer() const {
+	auto result = std::vector<GiftOptionData>();
+
+	if (!_optionsForOnePerson.currency.isEmpty()) {
+		const auto count = int(_optionsForOnePerson.months.size());
+		result.reserve(count);
+		for (auto i = 0; i != count; ++i) {
+			Assert(i < _optionsForOnePerson.totalCosts.size());
+			result.push_back({
+				.cost = _optionsForOnePerson.totalCosts[i],
+				.currency = _optionsForOnePerson.currency,
+				.months = _optionsForOnePerson.months[i],
+			});
+		}
+	}
+	return result;
+}
+
 Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::options(int amount) {
 	const auto it = _subscriptionOptions.find(amount);
 	if (it != end(_subscriptionOptions)) {
@@ -568,6 +589,41 @@ Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::options(int amount) {
 	}
 }

+auto PremiumGiftCodeOptions::requestStarGifts()
+-> rpl::producer<rpl::no_value, QString> {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		_api.request(MTPpayments_GetStarGifts(
+			MTP_int(0)
+		)).done([=](const MTPpayments_StarGifts &result) {
+			result.match([&](const MTPDpayments_starGifts &data) {
+				_giftsHash = data.vhash().v;
+				const auto &list = data.vgifts().v;
+				const auto session = &_peer->session();
+				auto gifts = std::vector<StarGift>();
+				gifts.reserve(list.size());
+				for (const auto &gift : list) {
+					if (auto parsed = FromTL(session, gift)) {
+						gifts.push_back(std::move(*parsed));
+					}
+				}
+				_gifts = std::move(gifts);
+			}, [&](const MTPDpayments_starGiftsNotModified &) {
+			});
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return lifetime;
+	};
+}
+
+const std::vector<StarGift> &PremiumGiftCodeOptions::starGifts() const {
+	return _gifts;
+}
+
 int PremiumGiftCodeOptions::giveawayBoostsPerPremium() const {
 	constexpr auto kFallbackCount = 4;
 	return _peer->session().appConfig().get<int>(
@@ -702,4 +758,59 @@ rpl::producer<DocumentData*> RandomHelloStickerValue(
 	}) | rpl::take(1) | rpl::map(random));
 }

+std::optional<StarGift> FromTL(
+		not_null<Main::Session*> session,
+		const MTPstarGift &gift) {
+	const auto &data = gift.data();
+	const auto document = session->data().processDocument(
+		data.vsticker());
+	const auto remaining = data.vavailability_remains();
+	const auto total = data.vavailability_total();
+	if (!document->sticker()) {
+		return {};
+	}
+	return StarGift{
+		.id = uint64(data.vid().v),
+		.stars = int64(data.vstars().v),
+		.starsConverted = int64(data.vconvert_stars().v),
+		.document = document,
+		.limitedLeft = remaining.value_or_empty(),
+		.limitedCount = total.value_or_empty(),
+		.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
+		.lastSaleDate = data.vlast_sale_date().value_or_empty(),
+		.birthday = data.is_birthday(),
+	};
+}
+
+std::optional<UserStarGift> FromTL(
+		not_null<UserData*> to,
+		const MTPuserStarGift &gift) {
+	const auto session = &to->session();
+	const auto &data = gift.data();
+	auto parsed = FromTL(session, data.vgift());
+	if (!parsed) {
+		return {};
+	}
+	return UserStarGift{
+		.info = std::move(*parsed),
+		.message = (data.vmessage()
+			? TextWithEntities{
+				.text = qs(data.vmessage()->data().vtext()),
+				.entities = Api::EntitiesFromMTP(
+					session,
+					data.vmessage()->data().ventities().v),
+			}
+			: TextWithEntities()),
+		.starsConverted = int64(data.vconvert_stars().value_or_empty()),
+		.fromId = (data.vfrom_id()
+			? peerFromUser(data.vfrom_id()->v)
+			: PeerId()),
+		.messageId = data.vmsg_id().value_or_empty(),
+		.date = data.vdate().v,
+		.anonymous = data.is_name_hidden(),
+		.hidden = data.is_unsaved(),
+		.mine = to->isSelf(),
+	};
+}
+
 } // namespace Api
@@ -57,6 +57,7 @@ struct GiveawayInfo {
 	TimeId tooEarlyDate = 0;
 	TimeId finishDate = 0;
 	TimeId startDate = 0;
+	uint64 credits = 0;
 	int winnersCount = 0;
 	int activatedCount = 0;
 	bool participating = false;
@@ -66,6 +67,40 @@ struct GiveawayInfo {
 	}
 };

+struct GiftOptionData {
+	int64 cost = 0;
+	QString currency;
+	int months = 0;
+};
+
+struct StarGift {
+	uint64 id = 0;
+	int64 stars = 0;
+	int64 starsConverted = 0;
+	not_null<DocumentData*> document;
+	int limitedLeft = 0;
+	int limitedCount = 0;
+	TimeId firstSaleDate = 0;
+	TimeId lastSaleDate = 0;
+	bool birthday = false;
+
+	friend inline bool operator==(
+		const StarGift &,
+		const StarGift &) = default;
+};
+
+struct UserStarGift {
+	StarGift info;
+	TextWithEntities message;
+	int64 starsConverted = 0;
+	PeerId fromId = 0;
+	MsgId messageId = 0;
+	TimeId date = 0;
+	bool anonymous = false;
+	bool hidden = false;
+	bool mine = false;
+};
+
 class Premium final {
 public:
 	explicit Premium(not_null<ApiWrap*> api);
@@ -170,6 +205,7 @@ public:
 	PremiumGiftCodeOptions(not_null<PeerData*> peer);

 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
+	[[nodiscard]] std::vector<GiftOptionData> optionsForPeer() const;
 	[[nodiscard]] Data::PremiumSubscriptionOptions options(int amount);
 	[[nodiscard]] const std::vector<int> &availablePresets() const;
 	[[nodiscard]] int monthsFromPreset(int monthsIndex);
@@ -186,6 +222,9 @@ public:
 	[[nodiscard]] int giveawayPeriodMax() const;
 	[[nodiscard]] bool giveawayGiftsPurchaseAvailable() const;

+	[[nodiscard]] rpl::producer<rpl::no_value, QString> requestStarGifts();
+	[[nodiscard]] const std::vector<StarGift> &starGifts() const;
+
 private:
 	struct Token final {
 		int users = 0;
@@ -205,7 +244,7 @@ private:
 	base::flat_map<Amount, PremiumSubscriptionOptions> _subscriptionOptions;
 	struct {
 		std::vector<int> months;
-		std::vector<float64> totalCosts;
+		std::vector<int64> totalCosts;
 		QString currency;
 	} _optionsForOnePerson;

@@ -213,6 +252,9 @@ private:

 	base::flat_map<Token, Store> _stores;

+	int32 _giftsHash = 0;
+	std::vector<StarGift> _gifts;
+
 	MTP::Sender _api;

 };
@@ -241,4 +283,11 @@ enum class RequirePremiumState {
 [[nodiscard]] rpl::producer<DocumentData*> RandomHelloStickerValue(
 	not_null<Main::Session*> session);

+[[nodiscard]] std::optional<StarGift> FromTL(
+	not_null<Main::Session*> session,
+	const MTPstarGift &gift);
+[[nodiscard]] std::optional<UserStarGift> FromTL(
+	not_null<UserData*> to,
+	const MTPuserStarGift &gift);
+
 } // namespace Api
@@ -10,10 +10,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "data/data_peer.h"
 #include "data/data_photo.h"
+#include "data/data_report.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "ui/boxes/report_box.h"
+#include "ui/boxes/report_box_graphics.h"
 #include "ui/layers/show.h"

 namespace Api {
@@ -39,52 +40,106 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {

 } // namespace

-void SendReport(
-	std::shared_ptr<Ui::Show> show,
-	not_null<PeerData*> peer,
-	Ui::ReportReason reason,
-	const QString &comment,
-	std::variant<
-		v::null_t,
-		MessageIdsList,
-		not_null<PhotoData*>,
-		StoryId> data) {
-	auto done = [=] {
+void SendPhotoReport(
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> peer,
+		Ui::ReportReason reason,
+		const QString &comment,
+		not_null<PhotoData*> photo) {
+	peer->session().api().request(MTPaccount_ReportProfilePhoto(
+		peer->input,
+		photo->mtpInput(),
+		ReasonToTL(reason),
+		MTP_string(comment)
+	)).done([=] {
 		show->showToast(tr::lng_report_thanks(tr::now));
-	};
-	v::match(data, [&](v::null_t) {
-		peer->session().api().request(MTPaccount_ReportPeer(
-			peer->input,
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	}, [&](const MessageIdsList &ids) {
-		auto apiIds = QVector<MTPint>();
-		apiIds.reserve(ids.size());
-		for (const auto &fullId : ids) {
-			apiIds.push_back(MTP_int(fullId.msg));
+	}).send();
+}
+
+auto CreateReportMessagesOrStoriesCallback(
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer)
+-> Fn<void(Data::ReportInput, Fn<void(ReportResult)>)> {
+	using TLChoose = MTPDreportResultChooseOption;
+	using TLAddComment = MTPDreportResultAddComment;
+	using TLReported = MTPDreportResultReported;
+	using Result = ReportResult;
+
+	struct State final {
+#ifdef _DEBUG
+		~State() {
+			qDebug() << "Messages or Stories Report ~State().";
 		}
-		peer->session().api().request(MTPmessages_Report(
-			peer->input,
-			MTP_vector<MTPint>(apiIds),
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	}, [&](not_null<PhotoData*> photo) {
-		peer->session().api().request(MTPaccount_ReportProfilePhoto(
-			peer->input,
-			photo->mtpInput(),
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	}, [&](StoryId id) {
-		peer->session().api().request(MTPstories_Report(
-			peer->input,
-			MTP_vector<MTPint>(1, MTP_int(id)),
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	});
+#endif
+		mtpRequestId requestId = 0;
+	};
+	const auto state = std::make_shared<State>();
+
+	return [=](
+			Data::ReportInput reportInput,
+			Fn<void(Result)> done) {
+		auto apiIds = QVector<MTPint>();
+		apiIds.reserve(reportInput.ids.size() + reportInput.stories.size());
+		for (const auto &id : reportInput.ids) {
+			apiIds.push_back(MTP_int(id));
+		}
+		for (const auto &story : reportInput.stories) {
+			apiIds.push_back(MTP_int(story));
+		}
+
+		const auto received = [=](
+				const MTPReportResult &result,
+				mtpRequestId requestId) {
+			if (state->requestId != requestId) {
+				return;
+			}
+			state->requestId = 0;
+			done(result.match([&](const TLChoose &data) {
+				const auto t = qs(data.vtitle());
+				auto list = Result::Options();
+				list.reserve(data.voptions().v.size());
+				for (const auto &tl : data.voptions().v) {
+					list.emplace_back(Result::Option{
+						.id = tl.data().voption().v,
+						.text = qs(tl.data().vtext()),
+					});
+				}
+				return Result{ .options = std::move(list), .title = t };
+			}, [&](const TLAddComment &data) -> Result {
+				return {
+					.commentOption = ReportResult::CommentOption{
+						.optional = data.is_optional(),
+						.id = data.voption().v,
+					}
+				};
+			}, [&](const TLReported &data) -> Result {
+				return { .successful = true };
+			}));
+		};
+
+		const auto fail = [=](const MTP::Error &error) {
+			state->requestId = 0;
+			done({ .error = error.type() });
+		};
+
+		if (!reportInput.stories.empty()) {
+			state->requestId = peer->session().api().request(
+				MTPstories_Report(
+					peer->input,
+					MTP_vector<MTPint>(apiIds),
+					MTP_bytes(reportInput.optionId),
+					MTP_string(reportInput.comment))
+			).done(received).fail(fail).send();
+		} else {
+			state->requestId = peer->session().api().request(
+				MTPmessages_Report(
+					peer->input,
+					MTP_vector<MTPint>(apiIds),
+					MTP_bytes(reportInput.optionId),
+					MTP_string(reportInput.comment))
+			).done(received).fail(fail).send();
+		}
+	};
 }

 } // namespace Api
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once

+class HistoryItem;
 class PeerData;
 class PhotoData;

@@ -15,17 +16,41 @@ class Show;
 enum class ReportReason;
 } // namespace Ui

+namespace Data {
+struct ReportInput;
+} // namespace Data
+
 namespace Api {

-void SendReport(
+struct ReportResult final {
+	using Id = QByteArray;
+	struct Option final {
+		Id id = 0;
+		QString text;
+	};
+	using Options = std::vector<Option>;
+	Options options;
+	QString title;
+	QString error;
+	QString comment;
+	struct CommentOption {
+		bool optional = false;
+		Id id = 0;
+	};
+	std::optional<CommentOption> commentOption;
+	bool successful = false;
+};
+
+void SendPhotoReport(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
 	Ui::ReportReason reason,
 	const QString &comment,
-	std::variant<
-		v::null_t,
-		MessageIdsList,
-		not_null<PhotoData*>,
-		StoryId> data);
+	not_null<PhotoData*> photo);
+
+[[nodiscard]] auto CreateReportMessagesOrStoriesCallback(
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer)
+-> Fn<void(Data::ReportInput, Fn<void(ReportResult)>)>;

 } // namespace Api
@@ -44,7 +44,10 @@ void InnerFillMessagePostFlags(
 	if (ShouldSendSilent(peer, options)) {
 		flags |= MessageFlag::Silent;
 	}
-	if (!peer->amAnonymous()) {
+	if (!peer->amAnonymous()
+		|| (!peer->isBroadcast()
+			&& options.sendAs
+			&& options.sendAs != peer)) {
 		flags |= MessageFlag::HasFromId;
 	}
 	const auto channel = peer->asBroadcast();
@@ -453,6 +456,7 @@ void SendConfirmedFile(
 		not_null<Main::Session*> session,
 		const std::shared_ptr<FilePrepareResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
+		&& (file->type != SendMediaType::Round)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
 		file->to.peer,
@@ -522,7 +526,8 @@ void SendConfirmedFile(
 		// Shortcut messages have no 'edited' badge.
 		flags |= MessageFlag::HideEdited;
 	}
-	if (file->type == SendMediaType::Audio) {
+	if (file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		if (!peer->isChannel() || peer->isMegagroup()) {
 			flags |= MessageFlag::MediaIsUnread;
 		}
@@ -544,32 +549,28 @@ void SendConfirmedFile(
 				MTP_flags(Flag::f_document
 					| (file->spoiler ? Flag::f_spoiler : Flag())),
 				file->document,
-				MTPDocument(), // alt_document
+				MTPVector<MTPDocument>(), // alt_documents
 				MTPint());
 		} else if (file->type == SendMediaType::Audio) {
 			const auto ttlSeconds = file->to.options.ttlSeconds;
-			const auto isVoice = [&] {
-				return file->document.match([](const MTPDdocumentEmpty &d) {
-					return false;
-				}, [](const MTPDdocument &d) {
-					return ranges::any_of(d.vattributes().v, [&](
-							const MTPDocumentAttribute &attribute) {
-						using Att = MTPDdocumentAttributeAudio;
-						return attribute.match([](const Att &data) -> bool {
-							return data.vflags().v & Att::Flag::f_voice;
-						}, [](const auto &) {
-							return false;
-						});
-					});
-				});
-			}();
 			using Flag = MTPDmessageMediaDocument::Flag;
 			return MTP_messageMediaDocument(
 				MTP_flags(Flag::f_document
-					| (isVoice ? Flag::f_voice : Flag())
+					| Flag::f_voice
 					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())),
 				file->document,
-				MTPDocument(), // alt_document
+				MTPVector<MTPDocument>(), // alt_documents
+				MTP_int(ttlSeconds));
+		} else if (file->type == SendMediaType::Round) {
+			using Flag = MTPDmessageMediaDocument::Flag;
+			const auto ttlSeconds = file->to.options.ttlSeconds;
+			return MTP_messageMediaDocument(
+				MTP_flags(Flag::f_document
+					| Flag::f_round
+					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())
+					| (file->spoiler ? Flag::f_spoiler : Flag())),
+				file->document,
+				MTPVector<MTPDocument>(), // alt_documents
 				MTP_int(ttlSeconds));
 		} else {
 			Unexpected("Type in sendFilesConfirmed.");
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_story.h"
+#include "data/data_user.h"
 #include "history/history.h"
 #include "main/main_session.h"

@@ -341,6 +342,10 @@ void PublicForwards::request(
 			.token = nextToken,
 		});
 	};
+	const auto processFail = [=] {
+		_requestId = 0;
+		done({});
+	};

 	constexpr auto kLimit = tl::make_int(100);
 	if (_fullId.messageId) {
@@ -349,14 +354,14 @@ void PublicForwards::request(
 			MTP_int(_fullId.messageId.msg),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	} else if (_fullId.storyId) {
 		_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
 			channel->input,
 			MTP_int(_fullId.storyId.story),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	}
 }

@@ -381,7 +386,7 @@ Data::PublicForwardsSlice MessageStatistics::firstSlice() const {
 }

 void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
-	if (channel()->isMegagroup()) {
+	if (channel()->isMegagroup() && !_storyId) {
 		return;
 	}
 	const auto requestFirstPublicForwards = [=](
@@ -571,13 +576,22 @@ rpl::producer<rpl::no_value, QString> Boosts::request() {
 				_boostStatus.prepaidGiveaway = ranges::views::all(
 					data.vprepaid_giveaways()->v
 				) | ranges::views::transform([](const MTPPrepaidGiveaway &r) {
-					return Data::BoostPrepaidGiveaway{
-						.months = r.data().vmonths().v,
-						.id = r.data().vid().v,
-						.quantity = r.data().vquantity().v,
-						.date = QDateTime::fromSecsSinceEpoch(
-							r.data().vdate().v),
-					};
+					return r.match([&](const MTPDprepaidGiveaway &data) {
+						return Data::BoostPrepaidGiveaway{
+							.date = base::unixtime::parse(data.vdate().v),
+							.id = data.vid().v,
+							.months = data.vmonths().v,
+							.quantity = data.vquantity().v,
+						};
+					}, [&](const MTPDprepaidStarsGiveaway &data) {
+						return Data::BoostPrepaidGiveaway{
+							.date = base::unixtime::parse(data.vdate().v),
+							.id = data.vid().v,
+							.credits = data.vstars().v,
+							.quantity = data.vquantity().v,
+							.boosts = data.vboosts().v,
+						};
+					});
 				}) | ranges::to_vector;
 			}

@@ -635,19 +649,21 @@ void Boosts::requestBoosts(
 				}
 				: Data::GiftCodeLink();
 			list.push_back({
-				data.is_gift(),
-				data.is_giveaway(),
-				data.is_unclaimed(),
-				qs(data.vid()),
-				data.vuser_id().value_or_empty(),
-				data.vgiveaway_msg_id()
+				.id = qs(data.vid()),
+				.userId = UserId(data.vuser_id().value_or_empty()),
+				.giveawayMessage = data.vgiveaway_msg_id()
 					? FullMsgId{ _peer->id, data.vgiveaway_msg_id()->v }
 					: FullMsgId(),
-				QDateTime::fromSecsSinceEpoch(data.vdate().v),
-				QDateTime::fromSecsSinceEpoch(data.vexpires().v),
-				(data.vexpires().v - data.vdate().v) / kMonthsDivider,
-				std::move(giftCodeLink),
-				data.vmultiplier().value_or_empty(),
+				.date = base::unixtime::parse(data.vdate().v),
+				.expiresAt = base::unixtime::parse(data.vexpires().v),
+				.expiresAfterMonths = ((data.vexpires().v - data.vdate().v)
+					/ kMonthsDivider),
+				.giftCodeLink = std::move(giftCodeLink),
+				.multiplier = data.vmultiplier().value_or_empty(),
+				.credits = data.vstars().value_or_empty(),
+				.isGift = data.is_gift(),
+				.isGiveaway = data.is_giveaway(),
+				.isUnclaimed = data.is_unclaimed(),
 			});
 		}
 		done(Data::BoostsListSlice{
@@ -670,17 +686,18 @@ Data::BoostStatus Boosts::boostStatus() const {
 	return _boostStatus;
 }

-ChannelEarnStatistics::ChannelEarnStatistics(not_null<ChannelData*> channel)
-: StatisticsRequestSender(channel) {
+EarnStatistics::EarnStatistics(not_null<PeerData*> peer)
+: StatisticsRequestSender(peer)
+, _isUser(peer->isUser()) {
 }

-rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
+rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();

 		makeRequest(MTPstats_GetBroadcastRevenueStats(
 			MTP_flags(0),
-			channel()->inputChannel
+			(_isUser ? user()->input : channel()->input)
 		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
 			const auto &data = result.data();
 			const auto &balances = data.vbalances().data();
@@ -697,18 +714,22 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 			requestHistory({}, [=](Data::EarnHistorySlice &&slice) {
 				_data.firstHistorySlice = std::move(slice);

-				api().request(
-					MTPchannels_GetFullChannel(channel()->inputChannel)
-				).done([=](const MTPmessages_ChatFull &result) {
-					result.data().vfull_chat().match([&](
-							const MTPDchannelFull &d) {
-						_data.switchedOff = d.is_restricted_sponsored();
-					}, [](const auto &) {
-					});
+				if (!_isUser) {
+					api().request(
+						MTPchannels_GetFullChannel(channel()->inputChannel)
+					).done([=](const MTPmessages_ChatFull &result) {
+						result.data().vfull_chat().match([&](
+								const MTPDchannelFull &d) {
+							_data.switchedOff = d.is_restricted_sponsored();
+						}, [](const auto &) {
+						});
+						consumer.put_done();
+					}).fail([=](const MTP::Error &error) {
+						consumer.put_error_copy(error.type());
+					}).send();
+				} else {
 					consumer.put_done();
-				}).fail([=](const MTP::Error &error) {
-					consumer.put_error_copy(error.type());
-				}).send();
+				}
 			});
 		}).fail([=](const MTP::Error &error) {
 			consumer.put_error_copy(error.type());
@@ -718,7 +739,7 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 	};
 }

-void ChannelEarnStatistics::requestHistory(
+void EarnStatistics::requestHistory(
 		const Data::EarnHistorySlice::OffsetToken &token,
 		Fn<void(Data::EarnHistorySlice)> done) {
 	if (_requestId) {
@@ -727,7 +748,7 @@ void ChannelEarnStatistics::requestHistory(
 	constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
 	constexpr auto kTlLimit = tl::make_int(kLimit);
 	_requestId = api().request(MTPstats_GetBroadcastRevenueTransactions(
-		channel()->inputChannel,
+		(_isUser ? user()->input : channel()->input),
 		MTP_int(token),
 		(!token) ? kTlFirstSlice : kTlLimit
 	)).done([=](const MTPstats_BroadcastRevenueTransactions &result) {
@@ -788,7 +809,7 @@ void ChannelEarnStatistics::requestHistory(
 	}).send();
 }

-Data::EarnStatistics ChannelEarnStatistics::data() const {
+Data::EarnStatistics EarnStatistics::data() const {
 	return _data;
 }

@@ -79,9 +79,9 @@ private:

 };

-class ChannelEarnStatistics final : public StatisticsRequestSender {
+class EarnStatistics final : public StatisticsRequestSender {
 public:
-	explicit ChannelEarnStatistics(not_null<ChannelData*> channel);
+	explicit EarnStatistics(not_null<PeerData*> peer);

 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
 	void requestHistory(
@@ -94,6 +94,7 @@ public:
 	static constexpr auto kLimit = int(10);

 private:
+	const bool _isUser = false;
 	Data::EarnStatistics _data;

 	mtpRequestId _requestId = 0;
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_authorizations.h"
 #include "api/api_user_names.h"
 #include "api/api_chat_participants.h"
+#include "api/api_global_privacy.h"
 #include "api/api_ringtones.h"
 #include "api/api_text_entities.h"
 #include "api/api_user_privacy.h"
@@ -319,6 +320,9 @@ void Updates::feedUpdateVector(
 	} else if (policy == SkipUpdatePolicy::SkipExceptGroupCallParticipants) {
 		return;
 	}
+	if (policy == SkipUpdatePolicy::SkipNone) {
+		applyConvertToScheduledOnSend(updates);
+	}
 	for (const auto &entry : std::as_const(list)) {
 		const auto type = entry.type();
 		if ((policy == SkipUpdatePolicy::SkipMessageIds
@@ -332,6 +336,15 @@ void Updates::feedUpdateVector(
 	session().data().sendHistoryChangeNotifications();
 }

+void Updates::checkForSentToScheduled(const MTPUpdates &updates) {
+	updates.match([&](const MTPDupdates &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [&](const MTPDupdatesCombined &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [](const auto &) {
+	});
+}
+
 void Updates::feedMessageIds(const MTPVector<MTPUpdate> &updates) {
 	for (const auto &update : updates.v) {
 		if (update.type() == mtpc_updateMessageID) {
@@ -420,13 +433,12 @@ void Updates::channelDifferenceDone(
 			"{ good - after not final channelDifference was received }%1"
 			).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
 		getChannelDifference(channel);
-	} else if (ranges::contains(
-			_activeChats,
-			channel,
-			[](const auto &pair) { return pair.second.peer; })) {
-		channel->ptsWaitingForShortPoll(timeout
+	} else if (inActiveChats(channel)) {
+		channel->ptsSetWaitingForShortPoll(timeout
 			? (timeout * crl::time(1000))
 			: kWaitForChannelGetDifference);
+	} else {
+		channel->ptsSetWaitingForShortPoll(-1);
 	}
 }

@@ -436,6 +448,7 @@ void Updates::feedChannelDifference(
 	session().data().processChats(data.vchats());

 	_handlingChannelDifference = true;
+	applyConvertToScheduledOnSend(data.vother_updates());
 	feedMessageIds(data.vother_updates());
 	session().data().processMessages(
 		data.vnew_messages(),
@@ -600,6 +613,7 @@ void Updates::feedDifference(
 	Core::App().checkAutoLock();
 	session().data().processUsers(users);
 	session().data().processChats(chats);
+	applyConvertToScheduledOnSend(other);
 	feedMessageIds(other);
 	session().data().processMessages(msgs, NewMessageType::Unread);
 	feedUpdateVector(other, SkipUpdatePolicy::SkipMessageIds);
@@ -658,6 +672,7 @@ void Updates::getDifferenceAfterFail() {
 			wait = wait ? std::min(wait, i->second - now) : (i->second - now);
 			++i;
 		} else {
+			i->first->ptsSetRequesting(false);
 			getChannelDifference(i->first, ChannelDifferenceRequest::AfterFail);
 			i = _whenGetDiffAfterFail.erase(i);
 		}
@@ -706,7 +721,9 @@ void Updates::getChannelDifference(
 		_whenGetDiffByPts.remove(channel);
 	}

-	if (!channel->ptsInited() || channel->ptsRequesting()) return;
+	if (!channel->ptsInited() || channel->ptsRequesting()) {
+		return;
+	}

 	if (from != ChannelDifferenceRequest::AfterFail) {
 		_whenGetDiffAfterFail.remove(channel);
@@ -743,16 +760,32 @@ void Updates::addActiveChat(rpl::producer<PeerData*> chat) {
 	std::move(
 		chat
 	) | rpl::start_with_next_done([=](PeerData *peer) {
-		_activeChats[key].peer = peer;
-		if (const auto channel = peer ? peer->asChannel() : nullptr) {
-			channel->ptsWaitingForShortPoll(
-				kWaitForChannelGetDifference);
+		auto &active = _activeChats[key];
+		const auto was = active.peer;
+		if (was != peer) {
+			active.peer = peer;
+			if (const auto channel = was ? was->asChannel() : nullptr) {
+				if (!inActiveChats(channel)) {
+					channel->ptsSetWaitingForShortPoll(-1);
+				}
+			}
+			if (const auto channel = peer ? peer->asChannel() : nullptr) {
+				channel->ptsSetWaitingForShortPoll(
+					kWaitForChannelGetDifference);
+			}
 		}
 	}, [=] {
 		_activeChats.erase(key);
 	}, _activeChats[key].lifetime);
 }

+bool Updates::inActiveChats(not_null<PeerData*> peer) const {
+	return ranges::contains(
+		_activeChats,
+		peer.get(),
+		[](const auto &pair) { return pair.second.peer; });
+}
+
 void Updates::requestChannelRangeDifference(not_null<History*> history) {
 	Expects(history->peer->isChannel());

@@ -866,6 +899,51 @@ void Updates::mtpUpdateReceived(const MTPUpdates &updates) {
 	}
 }

+void Updates::applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck) {
+	for (const auto &update : other.v) {
+		update.match([&](const MTPDupdateNewScheduledMessage &data) {
+			const auto &message = data.vmessage();
+			const auto id = IdFromMessage(message);
+			const auto scheduledMessages = &_session->scheduledMessages();
+			const auto scheduledId = scheduledMessages->localMessageId(id);
+			for (const auto &updateId : other.v) {
+				updateId.match([&](const MTPDupdateMessageID &dataId) {
+					if (dataId.vid().v == id) {
+						auto &owner = session().data();
+						if (skipScheduledCheck) {
+							const auto peerId = PeerFromMessage(message);
+							const auto history = owner.historyLoaded(peerId);
+							if (history) {
+								_session->data().sentToScheduled({
+									.history = history,
+									.scheduledId = scheduledId,
+								});
+							}
+							return;
+						}
+						const auto rand = dataId.vrandom_id().v;
+						const auto localId = owner.messageIdByRandomId(rand);
+						if (const auto local = owner.message(localId)) {
+							if (!local->isScheduled()) {
+								_session->data().sentToScheduled({
+									.history = local->history(),
+									.scheduledId = scheduledId,
+								});
+
+								// We've sent a non-scheduled message,
+								// but it was converted to a scheduled.
+								local->destroy();
+							}
+						}
+					}
+				}, [](const auto &) {});
+			}
+		}, [](const auto &) {});
+	}
+}
+
 void Updates::applyGroupCallParticipantUpdates(const MTPUpdates &updates) {
 	updates.match([&](const MTPDupdates &data) {
 		session().data().processUsers(data.vusers());
@@ -1561,6 +1639,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				MTP_LOG(0, ("Skipping new channel message because getting the difference."));
 				return;
 			}
 			channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
@@ -1653,6 +1732,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {

 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				MTP_LOG(0, ("Skipping channel message edit because getting the difference."));
 				return;
 			} else {
 				channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
@@ -1668,6 +1748,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {

 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				MTP_LOG(0, ("Skipping pinned channel messages because getting the difference."));
 				return;
 			} else {
 				channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
@@ -1782,6 +1863,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {

 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				MTP_LOG(0, ("Skipping delete channel messages because getting the difference."));
 				return;
 			}
 			channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
@@ -1845,6 +1927,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		auto channel = session().data().channelLoaded(d.vchannel_id());
 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				MTP_LOG(0, ("Skipping channel web page update because getting the difference."));
 				return;
 			} else {
 				channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
@@ -2630,6 +2713,12 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		_session->credits().apply(data);
 	} break;

+	case mtpc_updatePaidReactionPrivacy: {
+		const auto &data = update.c_updatePaidReactionPrivacy();
+		_session->api().globalPrivacy().updatePaidReactionAnonymous(
+			mtpIsTrue(data.vprivate()));
+	} break;
+
 	}
 }

@@ -40,6 +40,8 @@ public:
 	void applyUpdatesNoPtsCheck(const MTPUpdates &updates);
 	void applyUpdateNoPtsCheck(const MTPUpdate &update);

+	void checkForSentToScheduled(const MTPUpdates &updates);
+
 	[[nodiscard]] int32 pts() const;

 	void updateOnline(crl::time lastNonIdleTime = 0);
@@ -63,6 +65,7 @@ public:
 	void requestChannelRangeDifference(not_null<History*> history);

 	void addActiveChat(rpl::producer<PeerData*> chat);
+	[[nodiscard]] bool inActiveChats(not_null<PeerData*> peer) const;

 private:
 	enum class ChannelDifferenceRequest {
@@ -130,6 +133,9 @@ private:
 	// Doesn't call sendHistoryChangeNotifications itself.
 	void feedUpdate(const MTPUpdate &update);

+	void applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck = false);
 	void applyGroupCallParticipantUpdates(const MTPUpdates &updates);

 	bool whenGetDiffChanged(
@@ -69,6 +69,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		if (rule.always.premiums && (rule.option != Option::Everyone)) {
 			result.push_back(MTP_inputPrivacyValueAllowPremium());
 		}
+		if (rule.always.miniapps && (rule.option != Option::Everyone)) {
+			result.push_back(MTP_inputPrivacyValueAllowBots());
+		}
 	}
 	if (!rule.ignoreNever) {
 		const auto users = collectInputUsers(rule.never);
@@ -83,6 +86,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 				MTP_inputPrivacyValueDisallowChatParticipants(
 					MTP_vector<MTPlong>(chats)));
 		}
+		if (rule.never.miniapps && (rule.option != Option::Nobody)) {
+			result.push_back(MTP_inputPrivacyValueDisallowBots());
+		}
 	}
 	result.push_back([&] {
 		switch (rule.option) {
@@ -124,6 +130,10 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 			setOption(Option::CloseFriends);
 		}, [&](const MTPDprivacyValueAllowPremium &) {
 			result.always.premiums = true;
+		}, [&](const MTPDprivacyValueAllowBots &) {
+			result.always.miniapps = true;
+		}, [&](const MTPDprivacyValueDisallowBots &) {
+			result.never.miniapps = true;
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
@@ -199,6 +209,7 @@ MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
 	case Key::Voices: return MTP_inputPrivacyKeyVoiceMessages();
 	case Key::About: return MTP_inputPrivacyKeyAbout();
 	case Key::Birthday: return MTP_inputPrivacyKeyBirthday();
+	case Key::GiftsAutoSave: return MTP_inputPrivacyKeyStarGiftsAutoSave();
 	}
 	Unexpected("Key in Api::UserPrivacy::KetToTL.");
 }
@@ -228,6 +239,8 @@ std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
 	case mtpc_inputPrivacyKeyAbout: return Key::About;
 	case mtpc_privacyKeyBirthday:
 	case mtpc_inputPrivacyKeyBirthday: return Key::Birthday;
+	case mtpc_privacyKeyStarGiftsAutoSave:
+	case mtpc_inputPrivacyKeyStarGiftsAutoSave: return Key::GiftsAutoSave;
 	}
 	return std::nullopt;
 }
@@ -31,6 +31,7 @@ public:
 		Voices,
 		About,
 		Birthday,
+		GiftsAutoSave,
 	};
 	enum class Option {
 		Everyone,
@@ -41,6 +42,7 @@ public:
 	struct Exceptions {
 		std::vector<not_null<PeerData*>> peers;
 		bool premiums = false;
+		bool miniapps = false;
 	};
 	struct Rule {
 		Option option = Option::Everyone;
@@ -214,7 +214,10 @@ struct State {

 [[nodiscard]] QImage GenerateUserpic(Userpic &userpic, int size) {
 	size *= style::DevicePixelRatio();
-	auto result = userpic.peer->generateUserpicImage(userpic.view, size);
+	auto result = PeerData::GenerateUserpicImage(
+		userpic.peer,
+		userpic.view,
+		size);
 	result.setDevicePixelRatio(style::DevicePixelRatio());
 	return result;
 }
@@ -653,12 +656,12 @@ QString FormatReadDate(TimeId date, const QDateTime &now) {
 		return tr::lng_mediaview_today(
 			tr::now,
 			lt_time,
-			QLocale().toString(parsed.time(), QLocale::ShortFormat));
+			QLocale().toString(parsed.time(), "HH:mm:ss"));
 	} else if (readDate.addDays(1) == nowDate) {
 		return tr::lng_mediaview_yesterday(
 			tr::now,
 			lt_time,
-			QLocale().toString(parsed.time(), QLocale::ShortFormat));
+			QLocale().toString(parsed.time(), "HH:mm:ss"));
 	}
 	return tr::lng_mediaview_date_time(
 		tr::now,
@@ -670,7 +673,7 @@ QString FormatReadDate(TimeId date, const QDateTime &now) {
 			lt_day,
 			QString::number(readDate.day())),
 		lt_time,
-		QLocale().toString(parsed.time(), QLocale::ShortFormat));
+		QLocale().toString(parsed.time(), "HH:mm:ss"));
 }

 bool WhoReadExists(not_null<HistoryItem*> item) {
@@ -753,5 +756,19 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		const style::WhoRead &st) {
 	return WhoReacted(item, reaction, context, st, nullptr);
 }
+rpl::producer<Ui::WhoReadContent> WhenEdited(
+		not_null<PeerData*> author,
+		TimeId date) {
+	return rpl::single(Ui::WhoReadContent{
+		.participants = { Ui::WhoReadParticipant{
+			.name = author->name(),
+			.date = FormatReadDate(date, QDateTime::currentDateTime()),
+			.id = author->id.value,
+		} },
+		.type = Ui::WhoReadType::Edited,
+		.fullReadCount = 1,
+	});
+}
+

 } // namespace Api
@@ -61,5 +61,8 @@ struct WhoReadList {
 	const Data::ReactionId &reaction,
 	not_null<QWidget*> context, // Cache results for this lifetime.
 	const style::WhoRead &st);
+[[nodiscard]] rpl::producer<Ui::WhoReadContent> WhenEdited(
+	not_null<PeerData*> author,
+	TimeId date);

 } // namespace Api
@@ -582,6 +582,14 @@ void ApiWrap::sendMessageFail(
 			: tr::lng_error_noforwards_group(tr::now), kJoinErrorDuration);
 	} else if (error == u"PREMIUM_ACCOUNT_REQUIRED"_q) {
 		Settings::ShowPremium(&session(), "premium_stickers");
+	} else if (error == u"SCHEDULE_TOO_MUCH"_q) {
+		auto &scheduled = _session->scheduledMessages();
+		if (const auto item = scheduled.lookupItem(peer->id, itemId.msg)) {
+			scheduled.removeSending(item);
+		}
+		if (show) {
+			show->showToast(tr::lng_error_schedule_limit(tr::now));
+		}
 	}
 	if (const auto item = _session->data().message(itemId)) {
 		Assert(randomId != 0);
@@ -731,7 +739,8 @@ void ApiWrap::finalizeMessageDataRequest(

 QString ApiWrap::exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext) {
+		bool inRepliesContext,
+		bool forceNonPublicLink) {
 	Expects(item->history()->peer->isChannel());

 	const auto itemId = item->fullId();
@@ -754,7 +763,7 @@ QString ApiWrap::exportDirectMessageLink(
 				const auto sender = root
 					? root->discussionPostOriginalSender()
 					: nullptr;
-				if (sender && sender->hasUsername()) {
+				if (sender && sender->hasUsername() && !forceNonPublicLink) {
 					// Comment to a public channel.
 					const auto forwarded = root->Get<HistoryMessageForwarded>();
 					linkItemId = forwarded->savedFromMsgId;
@@ -770,7 +779,7 @@ QString ApiWrap::exportDirectMessageLink(
 				}
 			}
 		}
-		const auto base = linkChannel->hasUsername()
+		const auto base = (linkChannel->hasUsername() && !forceNonPublicLink)
 			? linkChannel->username()
 			: "c/" + QString::number(peerToChannel(linkChannel->id).bare);
 		const auto post = QString::number(linkItemId.bare);
@@ -784,6 +793,7 @@ QString ApiWrap::exportDirectMessageLink(
 				? (QString::number(linkThreadId.bare) + '/' + post)
 				: post);
 		if (linkChannel->hasUsername()
+			&& !forceNonPublicLink
 			&& !linkChannel->isMegagroup()
 			&& !linkCommentId
 			&& !linkThreadId) {
@@ -797,6 +807,9 @@ QString ApiWrap::exportDirectMessageLink(
 		}
 		return session().createInternalLinkFull(query);
 	};
+	if (forceNonPublicLink) {
+		return fallback();
+	}
 	const auto i = _unlikelyMessageLinks.find(itemId);
 	const auto current = (i != end(_unlikelyMessageLinks))
 		? i->second
@@ -2072,7 +2085,7 @@ void ApiWrap::deleteHistory(
 	}
 	if (const auto channel = peer->asChannel()) {
 		if (!justClear && !revoke) {
-			channel->ptsWaitingForShortPoll(-1);
+			channel->ptsSetWaitingForShortPoll(-1);
 			leaveChannel(channel);
 		} else {
 			if (const auto migrated = peer->migrateFrom()) {
@@ -3373,6 +3386,7 @@ void ApiWrap::forwardMessages(
 		}
 		const auto requestType = Data::Histories::RequestType::Send;
 		const auto idsCopy = localIds;
+		const auto scheduled = action.options.scheduled;
 		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 			history->sendRequestId = request(MTPmessages_ForwardMessages(
 				MTP_flags(sendFlags),
@@ -3385,6 +3399,9 @@ void ApiWrap::forwardMessages(
 				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
 				Data::ShortcutIdToMTP(_session, action.options.shortcutId)
 			)).done([=](const MTPUpdates &result) {
+				if (!scheduled) {
+					this->updates().checkForSentToScheduled(result);
+				}
 				applyUpdates(result);
 				if (shared && !--shared->requestsLeft) {
 					shared->callback();
@@ -3553,6 +3570,7 @@ void ApiWrap::sendVoiceMessage(
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action) {
 	const auto caption = TextWithTags();
 	const auto to = FileLoadTaskOptions(action);
@@ -3561,6 +3579,7 @@ void ApiWrap::sendVoiceMessage(
 		result,
 		duration,
 		waveform,
+		video,
 		to,
 		caption));
 }
@@ -3661,9 +3680,7 @@ void ApiWrap::sendUploadedPhoto(
 		Api::RemoteFileInfo info,
 		Api::SendOptions options) {
 	if (const auto item = _session->data().message(localId)) {
-		// AyuGram useScheduledMessages
-		const auto settings = &AyuSettings::getInstance();
-		if (settings->useScheduledMessages && !options.scheduled) {
+		if (AyuSettings::isUseScheduledMessages() && !options.scheduled) {
 			auto current = base::unixtime::now();
 			options.scheduled = current + 12;
 		}
@@ -3686,9 +3703,7 @@ void ApiWrap::sendUploadedDocument(
 			return;
 		}

-		// AyuGram useScheduledMessages
-		const auto settings = &AyuSettings::getInstance();
-		if (settings->useScheduledMessages && !options.scheduled) {
+		if (AyuSettings::isUseScheduledMessages() && !options.scheduled) {
 			auto current = base::unixtime::now();
 			options.scheduled = current + 12;
 		}
@@ -3978,6 +3993,12 @@ void ApiWrap::sendBotStart(
 		if (chat) {
 			message.textWithTags.text += '@' + bot->username();
 		}
+
+		if (AyuSettings::isUseScheduledMessages()) {
+			auto current = base::unixtime::now();
+			message.action.options.scheduled = current + 12;
+		}
+
 		sendMessage(std::move(message));
 		return;
 	}
@@ -4006,7 +4027,8 @@ void ApiWrap::sendInlineResult(
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
 		const SendAction &action,
-		std::optional<MsgId> localMessageId) {
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done) {
 	sendAction(action);

 	const auto history = action.history;
@@ -4086,11 +4108,17 @@ void ApiWrap::sendInlineResult(
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
+		if (done) {
+			done(true);
+		}
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		sendMessageFail(error, peer, randomId, newId);
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
+		if (done) {
+			done(false);
+		}
 	});
 	finishForwarding(action);
 }
@@ -4192,9 +4220,7 @@ void ApiWrap::sendMediaWithRandomId(
 		Api::SendOptions options,
 		uint64 randomId,
 		Fn<void(bool)> done) {
-	// AyuGram useScheduledMessages
-	const auto settings = &AyuSettings::getInstance();
-	if (settings->useScheduledMessages && !options.scheduled) {
+	if (AyuSettings::isUseScheduledMessages() && !options.scheduled) {
 		auto current = base::unixtime::now();
 		options.scheduled = current + 12;
 	}
@@ -4237,8 +4263,10 @@ void ApiWrap::sendMediaWithRandomId(
 			Data::Histories::ReplyToPlaceholder(),
 			(options.price
 				? MTPInputMedia(MTP_inputMediaPaidMedia(
+					MTP_flags(0),
 					MTP_long(options.price),
-					MTP_vector<MTPInputMedia>(1, media)))
+					MTP_vector<MTPInputMedia>(1, media),
+					MTPstring()))
 				: media),
 			MTP_string(caption.text),
 			MTP_long(randomId),
@@ -4302,6 +4330,7 @@ void ApiWrap::sendMultiPaidMedia(
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
 	const auto itemId = item->fullId();
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
@@ -4311,8 +4340,10 @@ void ApiWrap::sendMultiPaidMedia(
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
 			MTP_inputMediaPaidMedia(
+				MTP_flags(0),
 				MTP_long(options.price),
-				MTP_vector<MTPInputMedia>(std::move(medias))),
+				MTP_vector<MTPInputMedia>(std::move(medias)),
+				MTPstring()),
 			MTP_string(caption.text),
 			MTP_long(randomId),
 			MTPReplyMarkup(),
@@ -4371,6 +4402,9 @@ void ApiWrap::sendAlbumWithCancelled(
 }

 void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
+	if (album->sent) {
+		return;
+	}
 	const auto groupId = album->groupId;
 	if (album->items.empty()) {
 		_sendingAlbums.remove(groupId);
@@ -4395,6 +4429,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		return;
 	} else if (medias.size() < 2) {
 		const auto &single = medias.front().data();
+		album->sent = true;
 		sendMediaWithRandomId(
 			sample,
 			single.vmedia(),
@@ -4404,9 +4439,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		return;
 	}

-	// AyuGram useScheduledMessages
-	const auto settings = &AyuSettings::getInstance();
-	if (settings->useScheduledMessages && !album->options.scheduled) {
+	if (AyuSettings::isUseScheduledMessages() && !album->options.scheduled) {
 		auto current = base::unixtime::now();
 		album->options.scheduled = current + 12;
 	}
@@ -4429,6 +4462,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		| (album->options.invertCaption ? Flag::f_invert_media : Flag(0));
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
@@ -164,7 +164,8 @@ public:
 	void requestMessageData(PeerData *peer, MsgId msgId, Fn<void()> done);
 	QString exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext);
+		bool inRepliesContext,
+		bool forceNonPublicLink = false);
 	QString exportDirectStoryLink(not_null<Data::Story*> item);

 	void requestContacts();
@@ -317,6 +318,7 @@ public:
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action);
 	void sendFiles(
 		Ui::PreparedList &&list,
@@ -359,7 +361,8 @@ public:
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
 		const SendAction &action,
-		std::optional<MsgId> localMessageId);
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done = nullptr);
 	void sendMessageFail(
 		const MTP::Error &error,
 		not_null<PeerData*> peer,
@@ -8,29 +8,29 @@

 #include "ayu/ayu_lang.h"
 #include "ayu/ayu_worker.h"
-#include "ayu/ayu_fonts.h"
 #include "ayu/ayu_settings.h"
+#include "ayu/ayu_ui_settings.h"
 #include "ayu/data/ayu_database.h"
 #include "lang/lang_instance.h"
-#include "utils/taptic_engine/taptic_engine.h"

 namespace AyuInfra {

 void initLang() {
-	QString langPackBaseId = Lang::GetInstance().baseId();
-	QString langPackId = Lang::GetInstance().id();
-	if (langPackId.isEmpty()) {
-		LOG(("Lang ID not found! Re-use old language pack..."));
+	QString id = Lang::GetInstance().id();
+	QString baseId = Lang::GetInstance().baseId();
+	if (id.isEmpty()) {
+		LOG(("Language ID not found!"));
 		return;
 	}
-	CustomLangPack::initInstance();
-	CustomLangPack::currentInstance()->fetchCustomLangPack(langPackId, langPackBaseId);
+	AyuLanguage::init();
+	AyuLanguage::currentInstance()->fetchLanguage(id, baseId);
 }

 void initFonts() {
 	auto settings = &AyuSettings::getInstance();

-	AyuFonts::setMonoFont(settings->monoFont);
+	AyuUiSettings::setMonoFont(settings->monoFont);
+	AyuUiSettings::setWideMultiplier(settings->wideMultiplier);
 }

 void initDatabase() {
@@ -46,8 +46,6 @@ void init() {
 	initDatabase();
 	initFonts();
 	initWorker();
-
-	TapticEngine::init();
 }

 }
@@ -20,49 +20,45 @@ std::map<QString, QString> langMapping = {
 	{"zh-hant-raw", "zh-hant"},
 };

-CustomLangPack *CustomLangPack::instance = nullptr;
+AyuLanguage *AyuLanguage::instance = nullptr;

-CustomLangPack::CustomLangPack() = default;
+AyuLanguage::AyuLanguage() = default;

-void CustomLangPack::initInstance() {
-	if (!instance) instance = new CustomLangPack;
+void AyuLanguage::init() {
+	if (!instance) instance = new AyuLanguage;
 }

-CustomLangPack *CustomLangPack::currentInstance() {
+AyuLanguage *AyuLanguage::currentInstance() {
 	return instance;
 }

-void CustomLangPack::fetchCustomLangPack(const QString &langPackId, const QString &langPackBaseId) {
-	LOG(("Current Language pack ID: %1, Base ID: %2").arg(langPackId, langPackBaseId));
+void AyuLanguage::fetchLanguage(const QString &id, const QString &baseId) {
+	auto finalLangPackId = langMapping.contains(id) ? langMapping[id] : id;

-	auto finalLangPackId = langMapping.contains(langPackId) ? langMapping[langPackId] : langPackId;
-
-	const auto proxy = Core::App().settings().proxy().isEnabled()
-						   ? Core::App().settings().proxy().selected()
-						   : MTP::ProxyData();
-	if (proxy.type == MTP::ProxyData::Type::Socks5 || proxy.type == MTP::ProxyData::Type::Http) {
-		QNetworkProxy LocaleProxy = ToNetworkProxy(ToDirectIpProxy(proxy));
-		networkManager.setProxy(LocaleProxy);
+	if (Core::App().settings().proxy().isEnabled()) {
+		const auto proxy = Core::App().settings().proxy().selected();
+		if (proxy.type == MTP::ProxyData::Type::Socks5 || proxy.type == MTP::ProxyData::Type::Http) {
+			const auto networkProxy = ToNetworkProxy(ToDirectIpProxy(Core::App().settings().proxy().selected()));
+			networkManager.setProxy(networkProxy);
+		}
 	}

 	// using `jsdelivr` since China (...and maybe other?) users have some problems with GitHub
 	// https://crowdin.com/project/ayugram/discussions/6
 	QUrl url;
-	if (!finalLangPackId.isEmpty() && !langPackBaseId.isEmpty() && !needFallback) {
+	if (!finalLangPackId.isEmpty() && !baseId.isEmpty() && !needFallback) {
 		url.setUrl(qsl("https://cdn.jsdelivr.net/gh/AyuGram/Languages@l10n_main/values/langs/%1/Shared.json").arg(
 			finalLangPackId));
 	} else {
 		url.setUrl(qsl("https://cdn.jsdelivr.net/gh/AyuGram/Languages@l10n_main/values/langs/%1/Shared.json").arg(
-			needFallback ? langPackBaseId : finalLangPackId));
+			needFallback ? baseId : finalLangPackId));
 	}
 	_chkReply = networkManager.get(QNetworkRequest(url));
 	connect(_chkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(fetchError(QNetworkReply::NetworkError)));
 	connect(_chkReply, SIGNAL(finished()), this, SLOT(fetchFinished()));
-	LOG(("Fetching %1 lang pack...").arg(
-		needFallback ? (langPackBaseId.isEmpty() ? finalLangPackId : langPackBaseId) : finalLangPackId));
 }

-void CustomLangPack::fetchFinished() {
+void AyuLanguage::fetchFinished() {
 	if (!_chkReply) return;

 	QString langPackBaseId = Lang::GetInstance().baseId();
@@ -70,72 +66,61 @@ void CustomLangPack::fetchFinished() {
 	auto statusCode = _chkReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();

 	if (statusCode == 404 && !langPackId.isEmpty() && !langPackBaseId.isEmpty() && !needFallback) {
-		LOG(("AyuGram Language pack not found! Fallback to main language: %1...").arg(langPackBaseId));
+		LOG(("AyuGram Language not found! Fallback to main language: %1...").arg(langPackBaseId));
 		needFallback = true;
 		_chkReply->disconnect();
-		fetchCustomLangPack("", langPackBaseId);
+		fetchLanguage("", langPackBaseId);
 	} else {
-		QByteArray result = _chkReply->readAll().trimmed();
+		const auto result = _chkReply->readAll().trimmed();
 		QJsonParseError error{};
-		QJsonDocument str = QJsonDocument::fromJson(result, &error);
+		const auto doc = QJsonDocument::fromJson(result, &error);
 		if (error.error == QJsonParseError::NoError) {
-			parseLangFile(str);
+			applyLanguageJson(doc);
 		} else {
-			LOG(("Incorrect JSON File. Fallback to default language: English..."));
-			loadDefaultLangFile();
+			LOG(("Incorrect language JSON File."));
 		}

 		_chkReply = nullptr;
 	}
 }

-void CustomLangPack::fetchError(QNetworkReply::NetworkError e) {
+void AyuLanguage::fetchError(QNetworkReply::NetworkError e) {
 	LOG(("Network error: %1").arg(e));

 	if (e == QNetworkReply::NetworkError::ContentNotFoundError) {
-		QString langPackBaseId = Lang::GetInstance().baseId();
-		QString langPackId = Lang::GetInstance().id();
+		const auto baseId = Lang::GetInstance().baseId();
+		const auto id = Lang::GetInstance().id();

-		if (!langPackId.isEmpty() && !langPackBaseId.isEmpty() && !needFallback) {
-			LOG(("AyuGram Language pack not found! Fallback to main language: %1...").arg(langPackBaseId));
+		if (!id.isEmpty() && !baseId.isEmpty() && !needFallback) {
+			LOG(("AyuGram Language not found! Fallback to main language: %1...").arg(baseId));
 			needFallback = true;
 			_chkReply->disconnect();
-			fetchCustomLangPack("", langPackBaseId);
+			fetchLanguage("", baseId);
 		} else {
-			LOG(("AyuGram Language pack not found! Fallback to default language: English..."));
-			loadDefaultLangFile();
+			LOG(("AyuGram Language not found!"));
 			_chkReply = nullptr;
 		}
 	}
 }

-void CustomLangPack::loadDefaultLangFile() {
-	QFile file(":/localization/en.json");
-	if (file.open(QIODevice::ReadOnly)) {
-		QJsonDocument str = QJsonDocument::fromJson(file.readAll());
-		QJsonObject json = str.object();
-		for (const QString &key : json.keys()) {
-			Lang::GetInstance().applyValue(key.toUtf8(), json.value(key).toString().toUtf8());
-		}
-		Lang::GetInstance().updatePluralRules();
-		file.close();
-	}
-}
-
-void CustomLangPack::parseLangFile(QJsonDocument str) {
-	QJsonObject json = str.object();
+void AyuLanguage::applyLanguageJson(QJsonDocument doc) {
+	const auto json = doc.object();
 	for (const QString &brokenKey : json.keys()) {
 		auto key = qsl("ayu_") + brokenKey;
-		auto val = json.value(brokenKey).toString().replace(qsl("&amp;"), qsl("&")).toUtf8();
+		const auto val = json.value(brokenKey).toString().replace(qsl("&amp;"), qsl("&")).toUtf8();
+
+		if (key.endsWith("_zero") || key.endsWith("_two") || key.endsWith("_few") || key.endsWith("_many")) {
+			continue;
+		}
+
+		if (key.endsWith("_one")) {
+			key = key.replace("_one", "#one");
+		} else if (key.endsWith("_other")) {
+			key = key.replace("_other", "#other");
+		}

 		Lang::GetInstance().resetValue(key.toUtf8());
 		Lang::GetInstance().applyValue(key.toUtf8(), val);
-		if (key.contains("#other")) {
-			Lang::GetInstance().resetValue(key.toUtf8().replace("#other", "#few"));
-			Lang::GetInstance().resetValue(key.toUtf8().replace("#other", "#few"));
-			Lang::GetInstance().applyValue(key.toUtf8().replace("#other", "#few"), val);
-			Lang::GetInstance().applyValue(key.toUtf8().replace("#other", "#many"), val);
-		}
 	}
 	Lang::GetInstance().updatePluralRules();
 }
@@ -9,27 +9,26 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtXml/QDomDocument>

-class CustomLangPack : public QObject
+class AyuLanguage : public QObject
 {
 	Q_OBJECT
-	Q_DISABLE_COPY(CustomLangPack)
+	Q_DISABLE_COPY(AyuLanguage)

 public:
-	static CustomLangPack *currentInstance();
-	static void initInstance();
-	static CustomLangPack *instance;
+	static AyuLanguage *currentInstance();
+	static void init();
+	static AyuLanguage *instance;

-	void fetchCustomLangPack(const QString &langPackId, const QString &langPackBaseId);
-	void loadDefaultLangFile();
-	void parseLangFile(QJsonDocument str);
+	void fetchLanguage(const QString &id, const QString &baseId);
+	void applyLanguageJson(QJsonDocument doc);

 public Q_SLOTS:
 	void fetchFinished();
 	void fetchError(QNetworkReply::NetworkError e);

 private:
-	CustomLangPack();
-	~CustomLangPack() override = default;
+	AyuLanguage();
+	~AyuLanguage() override = default;

 	QNetworkAccessManager networkManager;
 	QNetworkReply *_chkReply = nullptr;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg width="1000px" height="1000px" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M226.328419,494.722069 C372.088573,431.216685 469.284839,389.350049 517.917216,369.122161 C656.772535,311.36743 685.625481,301.334815 704.431427,301.003532 C708.567621,300.93067 717.815839,301.955743 723.806446,306.816707 C728.864797,310.92121 730.256552,316.46581 730.922551,320.357329 C731.588551,324.248848 732.417879,333.113828 731.758626,340.040666 C724.234007,419.102486 691.675104,610.964674 675.110982,699.515267 C668.10208,736.984342 654.301336,749.547532 640.940618,750.777006 C611.904684,753.448938 589.856115,731.588035 561.733393,713.153237 C517.726886,684.306416 492.866009,666.349181 450.150074,638.200013 C400.78442,605.66878 432.786119,587.789048 460.919462,558.568563 C468.282091,550.921423 596.21508,434.556479 598.691227,424.000355 C599.00091,422.680135 599.288312,417.758981 596.36474,415.160431 C593.441168,412.561881 589.126229,413.450484 586.012448,414.157198 C581.598758,415.158943 511.297793,461.625274 375.109553,553.556189 C355.154858,567.258623 337.080515,573.934908 320.886524,573.585046 C303.033948,573.199351 268.692754,563.490928 243.163606,555.192408 C211.851067,545.013936 186.964484,539.632504 189.131547,522.346309 C190.260287,513.342589 202.659244,504.134509 226.328419,494.722069 Z" id="Path-3" fill="#FFFFFF"></path></g></svg>