fix: update submodules

Merge tag 'v4.11.7' into dev
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/core/version.h # Telegram/lib_ui
2026-07-25 23:12:10 +00:00 · 2023-11-19 01:21:39 +03:00 · 2023-11-19 00:27:58 +03:00 · 2023-11-18 21:33:26 +03:00 · 2023-11-18 21:14:25 +03:00 · 2023-11-18 20:51:18 +03:00
883 changed files with 45186 additions and 11503 deletions
@@ -30,7 +30,7 @@ jobs:
          curl -sSL https://install.python-poetry.org | python3 -

      - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@76866dbe54312617f00798d1762df7f43def6e5c
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8

      - name: Docker image build.
        run: |
@@ -41,7 +41,7 @@ on:
 jobs:

  linux:
-    name: CentOS 7
+    name: Rocky Linux 8
    runs-on: ubuntu-latest
    container:
      image: ghcr.io/${{ github.repository }}/centos_env
@@ -51,7 +51,7 @@ jobs:

    defaults:
      run:
-        shell: scl enable rh-python38 -- scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}
+        shell: scl enable gcc-toolset-12 -- bash --noprofile --norc -eo pipefail {0}

    strategy:
      matrix:
@@ -0,0 +1,158 @@
+name: MacOS Packaged.
+
+on:
+  push:
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - 'changelog.txt'
+      - 'LEGAL'
+      - 'LICENSE'
+      - '.github/**'
+      - '!.github/workflows/mac_packaged.yml'
+      - 'lib/xdg/**'
+      - 'snap/**'
+      - 'Telegram/build/**'
+      - 'Telegram/Resources/uwp/**'
+      - 'Telegram/Resources/winrc/**'
+      - 'Telegram/SourceFiles/platform/win/**'
+      - 'Telegram/SourceFiles/platform/linux/**'
+      - 'Telegram/configure.bat'
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - 'changelog.txt'
+      - 'LEGAL'
+      - 'LICENSE'
+      - '.github/**'
+      - '!.github/workflows/mac_packaged.yml'
+      - 'lib/xdg/**'
+      - 'snap/**'
+      - 'Telegram/build/**'
+      - 'Telegram/Resources/uwp/**'
+      - 'Telegram/Resources/winrc/**'
+      - 'Telegram/SourceFiles/platform/win/**'
+      - 'Telegram/SourceFiles/platform/linux/**'
+      - 'Telegram/configure.bat'
+
+jobs:
+
+  macos:
+    name: MacOS
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        defines:
+          - ""
+
+    env:
+      GIT: "https://github.com"
+      OPENALDIR: "/usr/local/opt/openal-soft"
+      UPLOAD_ARTIFACT: "false"
+      ONLY_CACHE: "false"
+      MANUAL_CACHING: "1"
+      AUTO_CACHING: "1"
+
+    steps:
+      - name: Get repository name.
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
+
+      - name: Clone.
+        uses: actions/checkout@v3.1.0
+        with:
+          submodules: recursive
+          path: ${{ env.REPO_NAME }}
+
+      - name: First set up.
+        run: |
+          brew install autoconf automake boost cmake ffmpeg openal-soft openssl opus ninja pkg-config python qt yasm xz
+          sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+
+          xcodebuild -version > CACHE_KEY.txt
+          echo $MANUAL_CACHING >> CACHE_KEY.txt
+          echo "$GITHUB_WORKSPACE" >> CACHE_KEY.txt
+          if [ "$AUTO_CACHING" = "1" ]; then
+            thisFile=$REPO_NAME/.github/workflows/mac_packaged.yml
+            echo `md5 -q $thisFile` >> CACHE_KEY.txt
+          fi
+          echo "CACHE_KEY=`md5 -q CACHE_KEY.txt`" >> $GITHUB_ENV
+
+          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
+
+          curl -o tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
+
+      - name: RNNoise.
+        run: |
+          cd $LibrariesPath
+
+          git clone --depth=1 https://gitlab.xiph.org/xiph/rnnoise.git
+          cd rnnoise
+          ./autogen.sh
+          ./configure --disable-examples --disable-doc
+          make -j$(sysctl -n hw.logicalcpu)
+          make install
+
+      - name: WebRTC cache.
+        id: cache-webrtc
+        uses: actions/cache@v3.0.11
+        with:
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
+      - name: WebRTC.
+        if: steps.cache-webrtc.outputs.cache-hit != 'true'
+        run: |
+          cd $LibrariesPath
+
+          git clone --recursive --depth=1 $GIT/desktop-app/tg_owt.git
+          cd tg_owt
+
+          cmake -B build . -GNinja -DCMAKE_BUILD_TYPE=Debug
+          cmake --build build --parallel
+
+      - name: Telegram Desktop build.
+        if: env.ONLY_CACHE == 'false'
+        env:
+          tg_owt_DIR: ${{ env.LibrariesPath }}/tg_owt/build
+        run: |
+          cd $REPO_NAME
+
+          DEFINE=""
+          if [ -n "${{ matrix.defines }}" ]; then
+            DEFINE="-D ${{ matrix.defines }}=ON"
+            echo Define from matrix: $DEFINE
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
+          else
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
+          fi
+
+          cmake -Bbuild -GNinja . \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DCMAKE_FIND_FRAMEWORK=LAST \
+          -DTDESKTOP_API_TEST=ON \
+          -DDESKTOP_APP_USE_PACKAGED_LAZY=ON \
+          $DEFINE
+
+          cmake --build build --parallel
+
+          cd build
+          macdeployqt Telegram.app
+          codesign --remove-signature Telegram.app
+
+          mkdir dmgsrc
+          mv Telegram.app dmgsrc
+          hdiutil create -volname Telegram -srcfolder dmgsrc -ov -format UDZO Telegram.dmg
+
+      - name: Move artifact.
+        if: env.UPLOAD_ARTIFACT == 'true'
+        run: |
+          cd $REPO_NAME/build
+          mkdir artifact
+          mv Telegram.dmg artifact/
+      - uses: actions/upload-artifact@master
+        if: env.UPLOAD_ARTIFACT == 'true'
+        name: Upload artifact.
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: ${{ env.REPO_NAME }}/build/artifact/
@@ -11,7 +11,9 @@ jobs:
      SKIP: "0"
      to_branch: "master"
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.0
+        with:
+          fetch-depth: 0
        if: env.SKIP == '0'
      - name: Push the code to the master branch.
        if: env.SKIP == '0'
@@ -61,7 +61,7 @@ jobs:
          sudo snap run lxd waitready

      - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@76866dbe54312617f00798d1762df7f43def6e5c
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8

      - name: Telegram Desktop snap build.
        run: sg lxd -c 'snap run snapcraft -v'
@@ -124,7 +124,7 @@ jobs:
          echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV

          API="-D TDESKTOP_API_TEST=ON"
-          if [ ${{ github.ref == 'refs/heads/nightly' }} ]; then
+          if [ $GITHUB_REF == 'refs/heads/nightly' ]; then
            echo "Use the open credentials."
            API="-D TDESKTOP_API_ID=611335 -D TDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
          fi
@@ -58,9 +58,6 @@
 [submodule "Telegram/ThirdParty/range-v3"]
 	path = Telegram/ThirdParty/range-v3
 	url = https://github.com/ericniebler/range-v3.git
-[submodule "Telegram/ThirdParty/fcitx-qt5"]
-	path = Telegram/ThirdParty/fcitx-qt5
-	url = https://github.com/fcitx/fcitx-qt5.git
 [submodule "Telegram/ThirdParty/nimf"]
 	path = Telegram/ThirdParty/nimf
 	url = https://github.com/hamonikr/nimf.git
@@ -103,3 +100,6 @@
 [submodule "Telegram/ThirdParty/wayland"]
 	path = Telegram/ThirdParty/wayland
 	url = https://github.com/gitlab-freedesktop-mirrors/wayland.git
+[submodule "Telegram/ThirdParty/libprisma"]
+	path = Telegram/ThirdParty/libprisma
+	url = https://github.com/desktop-app/libprisma.git
@@ -29,8 +29,8 @@ endif()
 project(Telegram
    LANGUAGES ${project_langs}
    VERSION ${desktop_app_version_cmake}
-    DESCRIPTION "Official Telegram Desktop messenger"
-    HOMEPAGE_URL "https://desktop.telegram.org"
+    DESCRIPTION "AyuGram Desktop"
+    HOMEPAGE_URL "https://ayugram.one"
 )
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)

@@ -59,9 +59,9 @@ include(cmake/options.cmake)

 if (NOT DESKTOP_APP_USE_PACKAGED)
    if (WIN32)
-        set(qt_version 5.15.10)
+        set(qt_version 5.15.11)
    elseif (APPLE)
-        set(qt_version 6.3.2)
+        set(qt_version 6.2.6)
    endif()
 endif()
 include(cmake/external/qt/package.cmake)
@@ -7,33 +7,41 @@
 - Full ghost mode (flexible)
 - Messages history
 - Anti-recall
- Some appearance customization stuff
+- Font customization
+- Streamer mode
+- Material Design switches
 - Local Telegram Premium
 - Sync read states and message history with AyuSync *(TBA)*

-![AyuGram Preferences](.github/preview.png)
+<img src='.github/demos/demo1.png' width='250'> <img src='.github/demos/demo2.png' width='250'> <img src='.github/demos/demo3.png' width='250'>

 ## Downloads

 ### Windows

-You can download prebuilt Windows binary from [Releases tab](https://github.com/AyuGram/AyuGramDesktop/releases) or from the [Telegram topic](https://t.me/ayugramchat/12788).
+You can download prebuilt Windows binary from [Releases tab](https://github.com/AyuGram/AyuGramDesktop/releases) or from
+the [Telegram topic](https://t.me/ayugramchat/12788).

-Follow [official guide](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-win-x64.md) if you want to build by yourself.
+Follow [official guide](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-win-x64.md) if you want to
+build by yourself.

 ### Arch Linux

-You can install `ayugram-desktop-git` or `ayugram-desktop-bin` from [AUR](https://aur.archlinux.org/packages?O=0&K=ayugram).
+It is recommended to build AyuGram from source on any Linux distro.
+
+But if you're brave enough, you can install `ayugram-desktop-git` or `ayugram-desktop-bin`
+from [AUR](https://aur.archlinux.org/packages?O=0&K=ayugram).

 These packages maintained by [westpain](https://github.com/incycledream). *We're not responsible for them.*

 ### Any other Linux distro

-Follow [official guide](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-linux.md).
+Follow the [official guide](https://github.com/AyuGram/AyuGramDesktop/blob/dev/docs/building-linux.md).

 ### Remarks for Windows

 Make sure you have these components installed with VS Build Tools:
+
 - C++ MFC latest (x86 & x64)
 - C++ ATL latest (x86 & x64)
 - latest Windows 11 SDK
@@ -28,6 +28,7 @@ include(cmake/lib_ffmpeg.cmake)
 include(cmake/lib_stripe.cmake)
 include(cmake/lib_tgvoip.cmake)
 include(cmake/lib_tgcalls.cmake)
+include(cmake/lib_prisma.cmake)
 include(cmake/td_export.cmake)
 include(cmake/td_mtproto.cmake)
 include(cmake/td_lang.cmake)
@@ -101,9 +102,15 @@ PRIVATE
    ayu/ayu_settings.h
    ayu/ayu_lang.cpp
    ayu/ayu_lang.h
+    ayu/ayu_infra.cpp
+    ayu/ayu_infra.h
    ayu/ayu_constants.h
+    ayu/utils/ayu_mapper.cpp
+    ayu/utils/ayu_mapper.h
    ayu/utils/telegram_helpers.cpp
    ayu/utils/telegram_helpers.h
+    ayu/utils/windows_utils.cpp
+    ayu/utils/windows_utils.h
    ayu/ui/ayu_lottie.cpp
    ayu/ui/ayu_lottie.h
    ayu/ui/ayu_assets.cpp
@@ -116,6 +123,12 @@ PRIVATE
    ayu/ui/settings/settings_ayu.h
    ayu/ui/context_menu/context_menu.cpp
    ayu/ui/context_menu/context_menu.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/boxes/voice_confirmation_box.cpp
    ayu/ui/boxes/voice_confirmation_box.h
    ayu/ui/boxes/message_history_box.cpp
@@ -126,6 +139,8 @@ PRIVATE
    ayu/ui/boxes/edit_deleted_mark.h
    ayu/ui/boxes/edit_edited_mark.cpp
    ayu/ui/boxes/edit_edited_mark.h
+    ayu/ui/boxes/font_selector.cpp
+    ayu/ui/boxes/font_selector.h
    ayu/sync/ayu_sync_controller.cpp
    ayu/sync/ayu_sync_controller.h
    ayu/sync/models.h
@@ -204,6 +219,8 @@ PRIVATE
    api/api_sensitive_content.h
    api/api_single_message_search.cpp
    api/api_single_message_search.h
+    api/api_statistics.cpp
+    api/api_statistics.h
    api/api_text_entities.cpp
    api/api_text_entities.h
    api/api_toggling_media.cpp
@@ -248,6 +265,8 @@ PRIVATE
    boxes/peers/edit_participant_box.h
    boxes/peers/edit_participants_box.cpp
    boxes/peers/edit_participants_box.h
+    boxes/peers/edit_peer_color_box.cpp
+    boxes/peers/edit_peer_color_box.h
    boxes/peers/edit_peer_common.h
    boxes/peers/edit_peer_info_box.cpp
    boxes/peers/edit_peer_info_box.h
@@ -269,6 +288,8 @@ PRIVATE
    boxes/peers/peer_short_info_box.h
    boxes/peers/prepare_short_info_box.cpp
    boxes/peers/prepare_short_info_box.h
+    boxes/peers/replace_boost_box.cpp
+    boxes/peers/replace_boost_box.h
    boxes/about_box.cpp
    boxes/about_box.h
    boxes/about_sponsored_box.cpp
@@ -466,6 +487,7 @@ PRIVATE
    core/crash_report_window.h
    core/crash_reports.cpp
    core/crash_reports.h
+    core/deadlock_detector.h
    core/file_utilities.cpp
    core/file_utilities.h
    core/launcher.cpp
@@ -502,6 +524,7 @@ PRIVATE
    data/data_audio_msg_id.h
    data/data_auto_download.cpp
    data/data_auto_download.h
+    data/data_boosts.h
    data/data_bot_app.cpp
    data/data_bot_app.h
    data/data_chat.cpp
@@ -604,6 +627,7 @@ PRIVATE
    data/data_sparse_ids.h
    data/data_sponsored_messages.cpp
    data/data_sponsored_messages.h
+    data/data_statistics.h
    data/data_stories.cpp
    data/data_stories.h
    data/data_stories_ids.cpp
@@ -698,6 +722,8 @@ PRIVATE
    history/view/controls/history_view_compose_controls.h
    history/view/controls/history_view_compose_search.cpp
    history/view/controls/history_view_compose_search.h
+    history/view/controls/history_view_draft_options.cpp
+    history/view/controls/history_view_draft_options.h
    history/view/controls/history_view_forward_panel.cpp
    history/view/controls/history_view_forward_panel.h
    history/view/controls/history_view_ttl_button.cpp
@@ -706,6 +732,8 @@ PRIVATE
    history/view/controls/history_view_voice_record_bar.h
    history/view/controls/history_view_voice_record_button.cpp
    history/view/controls/history_view_voice_record_button.h
+    history/view/controls/history_view_webpage_processor.cpp
+    history/view/controls/history_view_webpage_processor.h
    history/view/media/history_view_call.cpp
    history/view/media/history_view_call.h
    history/view/media/history_view_contact.cpp
@@ -724,6 +752,8 @@ PRIVATE
    history/view/media/history_view_game.h
    history/view/media/history_view_gif.cpp
    history/view/media/history_view_gif.h
+    history/view/media/history_view_giveaway.cpp
+    history/view/media/history_view_giveaway.h
    history/view/media/history_view_invoice.cpp
    history/view/media/history_view_invoice.h
    history/view/media/history_view_large_emoji.cpp
@@ -809,6 +839,8 @@ PRIVATE
    history/view/history_view_quick_action.h
    history/view/history_view_replies_section.cpp
    history/view/history_view_replies_section.h
+    history/view/history_view_reply.cpp
+    history/view/history_view_reply.h
    history/view/history_view_requests_bar.cpp
    history/view/history_view_requests_bar.h
    history/view/history_view_schedule_box.cpp
@@ -863,20 +895,14 @@ PRIVATE
    history/history_view_highlight_manager.h
    history/history_widget.cpp
    history/history_widget.h
-    info/info_content_widget.cpp
-    info/info_content_widget.h
-    info/info_controller.cpp
-    info/info_controller.h
-    info/info_layer_widget.cpp
-    info/info_layer_widget.h
-    info/info_memento.cpp
-    info/info_memento.h
-    info/info_section_widget.cpp
-    info/info_section_widget.h
-    info/info_top_bar.cpp
-    info/info_top_bar.h
-    info/info_wrap_widget.cpp
-    info/info_wrap_widget.h
+    info/boosts/giveaway/giveaway_list_controllers.cpp
+    info/boosts/giveaway/giveaway_list_controllers.h
+    info/boosts/create_giveaway_box.cpp
+    info/boosts/create_giveaway_box.h
+    info/boosts/info_boosts_inner_widget.cpp
+    info/boosts/info_boosts_inner_widget.h
+    info/boosts/info_boosts_widget.cpp
+    info/boosts/info_boosts_widget.h
    info/common_groups/info_common_groups_inner_widget.cpp
    info/common_groups/info_common_groups_inner_widget.h
    info/common_groups/info_common_groups_widget.cpp
@@ -932,6 +958,15 @@ PRIVATE
    info/profile/info_profile_widget.h
    info/settings/info_settings_widget.cpp
    info/settings/info_settings_widget.h
+    info/statistics/info_statistics_common.h
+    info/statistics/info_statistics_inner_widget.cpp
+    info/statistics/info_statistics_inner_widget.h
+    info/statistics/info_statistics_list_controllers.cpp
+    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_widget.cpp
+    info/statistics/info_statistics_widget.h
    info/stories/info_stories_inner_widget.cpp
    info/stories/info_stories_inner_widget.h
    info/stories/info_stories_provider.cpp
@@ -950,6 +985,20 @@ PRIVATE
    info/userpic/info_userpic_emoji_builder_preview.h
    info/userpic/info_userpic_emoji_builder_widget.cpp
    info/userpic/info_userpic_emoji_builder_widget.h
+    info/info_content_widget.cpp
+    info/info_content_widget.h
+    info/info_controller.cpp
+    info/info_controller.h
+    info/info_layer_widget.cpp
+    info/info_layer_widget.h
+    info/info_memento.cpp
+    info/info_memento.h
+    info/info_section_widget.cpp
+    info/info_section_widget.h
+    info/info_top_bar.cpp
+    info/info_top_bar.h
+    info/info_wrap_widget.cpp
+    info/info_wrap_widget.h
    inline_bots/bot_attach_web_view.cpp
    inline_bots/bot_attach_web_view.h
    inline_bots/inline_bot_layout_internal.cpp
@@ -1529,6 +1578,7 @@ PRIVATE
    qrc/emoji_5.qrc
    qrc/emoji_6.qrc
    qrc/emoji_7.qrc
+    qrc/emoji_8.qrc
    qrc/emoji_preview.qrc
    qrc/telegram/animations.qrc
    qrc/telegram/export.qrc
@@ -1567,7 +1617,39 @@ elseif (APPLE)
    endif()

    set(icons_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets)
-    target_add_resource(Telegram ${icons_path})
+    if (CMAKE_GENERATOR STREQUAL Xcode)
+        target_add_resource(Telegram ${icons_path})
+    else()
+        set(icon_path ${icons_path}/Icon.iconset)
+        find_program(ICONUTIL iconutil)
+        find_program(PNG2ICNS png2icns)
+        if (ICONUTIL)
+            add_custom_command(
+                OUTPUT Icon.icns
+                COMMAND ${ICONUTIL}
+                ARGS
+                    --convert icns
+                    --output Icon.icns
+                    ${icon_path}
+            )
+        elseif (PNG2ICNS)
+            add_custom_command(
+                OUTPUT Icon.icns
+                COMMAND ${PNG2ICNS}
+                ARGS
+                    Icon.icns
+                    ${icon_path}/icon_16x16.png
+                    ${icon_path}/icon_32x32.png
+                    ${icon_path}/icon_128x128.png
+                    ${icon_path}/icon_256x256.png
+                    ${icon_path}/icon_512x512.png
+            )
+        endif()
+        if (ICONUTIL OR PNG2ICNS)
+            set_source_files_properties(Icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+            target_add_resource(Telegram Icon.icns)
+        endif()
+    endif()

    set(lang_packs
        en
@@ -1592,25 +1674,19 @@ elseif (APPLE)
    PRE_LINK
        COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
        COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
+        COMMAND cp ${CMAKE_BINARY_DIR}/lib_spellcheck.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
    )
-    if (NOT build_macstore)
+    if (NOT build_macstore AND NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
+        if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
+            set(crashpad_dir_part ".${DESKTOP_APP_MAC_ARCH}")
+        else()
+            set(crashpad_dir_part "")
+        endif()
        add_custom_command(TARGET Telegram
        PRE_LINK
-            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
-            COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
+            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Helpers
+            COMMAND cp ${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>${crashpad_dir_part}/crashpad_handler $<TARGET_FILE_DIR:Telegram>/../Helpers/
        )
-        if (NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
-            if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
-                set(crashpad_dir_part ".${DESKTOP_APP_MAC_ARCH}")
-            else()
-                set(crashpad_dir_part "")
-            endif()
-            add_custom_command(TARGET Telegram
-            PRE_LINK
-                COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Helpers
-                COMMAND cp ${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>${crashpad_dir_part}/crashpad_handler $<TARGET_FILE_DIR:Telegram>/../Helpers/
-            )
-        endif()
    endif()
 else()
    target_link_libraries(Telegram
@@ -1659,7 +1735,11 @@ if (build_macstore)
        COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework/Resources/Inspector
    )
 else()
-    set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
+    if (CMAKE_GENERATOR STREQUAL Xcode)
+        set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
+    else()
+        set(bundle_identifier "com.tdesktop.Telegram")
+    endif()
    set(bundle_entitlements "Telegram.entitlements")
    if (LINUX AND DESKTOP_APP_USE_PACKAGED)
        set(output_name "ayugram-desktop")
@@ -1668,6 +1748,12 @@ else()
    endif()
 endif()

+if (CMAKE_GENERATOR STREQUAL Xcode)
+    set(bundle_identifier_plist "$(PRODUCT_BUNDLE_IDENTIFIER)")
+else()
+    set(bundle_identifier_plist ${bundle_identifier})
+endif()
+
 set_target_properties(Telegram PROPERTIES
    OUTPUT_NAME ${output_name}
    MACOSX_BUNDLE_GUI_IDENTIFIER ${bundle_identifier}
@@ -1741,7 +1827,7 @@ endif()

 target_prepare_qrc(Telegram)

-if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT build_winstore)
+if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_winstore)
    add_executable(Updater WIN32)
    init_non_host_target(Updater)

@@ -1779,6 +1865,12 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
        else()
            target_link_options(Updater PRIVATE -municode)
        endif()
+    elseif (APPLE)
+        add_custom_command(TARGET Updater
+        PRE_LINK
+            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
+            COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
+        )
    endif()

    if (DESKTOP_APP_SPECIAL_TARGET)
@@ -1832,6 +1924,7 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
    install(FILES "Resources/art/icon128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "ayugram.png")
    install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "ayugram.png")
    install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "ayugram.png")
+    install(FILES "Resources/icons/tray_monochrome.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/symbolic/apps" RENAME "telegram-symbolic.svg")
    install(FILES "../lib/xdg/ayugram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayugram.desktop.service" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayugram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
--- a/Show More
+++ b/Show More