Beta version 2.8.12: Fix build on Linux.

- Change the default chat background.
- Add GIFs overview section in chats.
- Add a simple new messages animation.
- Use modern Telegram application icon.
- Use Direct3D 11 by default on Windows.
- Fix Direct3D acceleration on basic Windows 7 setup.

.github/workflows/linux.yml

@@ -5,7 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-cmake.md'
+      - '!docs/building-linux.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -13,7 +13,6 @@ on:
       - '!.github/workflows/linux.yml'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -25,7 +24,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-cmake.md'
+      - '!docs/building-linux.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -33,7 +32,6 @@ on:
       - '!.github/workflows/linux.yml'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -94,7 +92,10 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then
-              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON"
+              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
+            fi
+            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_GTK_INTEGRATION" ]; then
+              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
             fi
             echo Define from matrix: $DEFINE
             echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV

.github/workflows/mac.yml

@@ -5,7 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-xcode.md'
+      - '!docs/building-mac.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -14,7 +14,6 @@ on:
       - 'lib/xdg/**'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -24,7 +23,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-xcode.md'
+      - '!docs/building-mac.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -33,7 +32,6 @@ on:
       - 'lib/xdg/**'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -64,7 +62,7 @@ jobs:
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-xcode.md"
+      DOC_PATH: "docs/building-mac.md"
       AUTO_CACHING: "1"
 
     steps:

.github/workflows/snap.yml

@@ -11,7 +11,6 @@ on:
       - '.github/**'
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -29,7 +28,6 @@ on:
       - '.github/**'
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'

.github/workflows/win.yml

@@ -5,7 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-msvc.md'
+      - '!docs/building-win.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -14,8 +14,6 @@ on:
       - 'lib/xdg/**'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
-      - '!Telegram/Patches/build_ffmpeg_win.sh'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/SourceFiles/platform/linux/**'
       - 'Telegram/SourceFiles/platform/mac/**'
@@ -26,7 +24,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
-      - '!docs/building-msvc.md'
+      - '!docs/building-win.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -35,12 +33,9 @@ on:
       - 'lib/xdg/**'
       - 'snap/**'
       - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
-      - '!Telegram/Patches/build_ffmpeg_win.sh'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/SourceFiles/platform/linux/**'
       - 'Telegram/SourceFiles/platform/mac/**'
-      - '!Telegram/Patches/breakpad.diff'
       - 'Telegram/Telegram/**'
       - 'Telegram/configure.sh'
       - 'Telegram/Telegram.plist'
@@ -65,7 +60,7 @@ jobs:
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-msvc.md"
+      DOC_PATH: "docs/building-win.md"
       AUTO_CACHING: "1"
 
     defaults:
@@ -104,6 +99,7 @@ jobs:
         shell: bash
         run: |
           curl -o $LibrariesPath/tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
+          curl -o $LibrariesPath/tg_angle-version.json https://api.github.com/repos/desktop-app/tg_angle/git/refs/heads/master
           echo $MANUAL_CACHING >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" == "1" ]; then
             thisFile=$REPO_NAME/.github/workflows/win.yml
@@ -316,6 +312,33 @@ jobs:
 
           rmdir /S /Q .git
 
+      - name: Angle cache.
+        id: cache-angle
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.LibrariesPath }}/tg_angle
+          key: ${{ runner.OS }}-angle-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_angle-version.json') }}
+      - name: Angle.
+        if: steps.cache-angle.outputs.cache-hit != 'true'
+        run: |
+          %VC%
+
+          git clone --recursive %GIT%/desktop-app/tg_angle.git
+          mkdir tg_angle\out\Debug
+          cd tg_angle\out\Debug
+          cmake -G Ninja ^
+          -DCMAKE_BUILD_TYPE=Debug ^
+          -DTG_ANGLE_SPECIAL_TARGET=win64 ^
+          -DTG_ANGLE_ZLIB_INCLUDE_PATH=%cd%/../../../zlib ../..
+          ninja
+
+          :: Cleanup.
+          cd %LibrariesPath%\tg_angle
+          move out\Debug\tg_angle.lib tg_angle.lib
+          rmdir /S /Q out
+          mkdir out\Debug
+          move tg_angle.lib out\Debug\tg_angle.lib
+
       - name: Qt 5.15.2 cache.
         id: cache-qt
         uses: actions/cache@v2
@@ -338,7 +361,12 @@ jobs:
           cd ..
 
           SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
-          SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
+          SET SSL_LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
+
+          SET ANGLE=%LibrariesPath%\tg_angle
+          SET ANGLE_LIBS=d3d9.lib dxgi.lib dxguid.lib
+
+          SET ZLIB=%LibrariesPath%\zlib\contrib\vstudio\vc14\x86
 
           configure ^
           -prefix "%LibrariesPath%\Qt-%QT_VER%" ^
@@ -347,18 +375,29 @@ jobs:
           -opensource ^
           -confirm-license ^
           -static ^
-          -static-runtime -I "%SSL%\include" ^
-          -opengl dynamic ^
+          -static-runtime ^
+          -opengl es2 -no-angle ^
+          -I "%ANGLE%\include" ^
+          -D "GL_APICALL=" ^
+          QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS%" ^
+          QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS%" ^
+          -egl ^
+          -D "EGLAPI=" ^
+          -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
+          QMAKE_LIBS_EGL_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
+          QMAKE_LIBS_EGL_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
           -openssl-linked ^
-          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%LIBS%" ^
-          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%LIBS%" ^
+          -I "%SSL%\include" ^
+          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%SSL_LIBS%" ^
+          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%SSL_LIBS%" ^
+          -I "%LibrariesPath%\mozjpeg" ^
+          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
           -mp ^
           -nomake examples ^
           -nomake tests ^
-          -platform win32-msvc ^
-          -I "%LibrariesPath%\mozjpeg" ^
-          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
-          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
+          -platform win32-msvc
+
       - name: Qt 5.15.2 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |

CMakeLists.txt

@@ -14,8 +14,13 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)
 
+set(project_langs C CXX)
+if (APPLE)
+    set(project_langs C CXX OBJC OBJCXX)
+endif()
+
 project(Telegram
-    LANGUAGES C CXX
+    LANGUAGES ${project_langs}
     VERSION ${desktop_app_version_cmake}
     DESCRIPTION "Official Telegram Desktop messenger"
     HOMEPAGE_URL "https://desktop.telegram.org"
@@ -24,6 +29,7 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT T
 
 get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
 get_filename_component(submodules_loc "Telegram" REALPATH)
+get_filename_component(cmake_helpers_loc "cmake" REALPATH)
 
 include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
@@ -32,6 +38,7 @@ include(cmake/target_link_frameworks.cmake)
 include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
 include(cmake/nuget.cmake)
+include(cmake/validate_d3d_compiler.cmake)
 
 include(cmake/options.cmake)
 

README.md

@@ -63,9 +63,9 @@ Version **1.8.15** was the last that supports older systems
 
 ## Build instructions
 
-* Visual Studio 2019 [(32 bits)][msvc32] [(64 bits)][msvc64]
-* [Xcode 12][xcode]
-* [CMake on GNU/Linux][cmake]
+* Windows [(32-bit)][win32] [(64-bit)][win64]
+* [macOS][mac]
+* [GNU/Linux using Docker][linux]
 
 [//]: # (LINKS)
 [telegram]: https://telegram.org
@@ -73,10 +73,9 @@ Version **1.8.15** was the last that supports older systems
 [telegram_api]: https://core.telegram.org
 [telegram_proto]: https://core.telegram.org/mtproto
 [license]: LICENSE
-[msvc32]: docs/building-msvc.md
-[msvc64]: docs/building-msvc-x64.md
-[xcode]: docs/building-xcode.md
-[xcode_old]: docs/building-xcode-old.md
-[cmake]: docs/building-cmake.md
+[win32]: docs/building-win.md
+[win64]: docs/building-win-x64.md
+[mac]: docs/building-mac.md
+[linux]: docs/building-linux.md
 [preview_image]: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/assets/preview.png "Preview of Telegram Desktop"
 [preview_image_url]: https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/preview.png

Telegram/CMakeLists.txt

@@ -82,59 +82,6 @@ PRIVATE
     desktop-app::external_xxhash
 )
 
-if (LINUX)
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_glibmm
-        desktop-app::external_glib
-    )
-
-    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_statusnotifieritem
-            desktop-app::external_dbusmenu_qt
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_xcb
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::lib_waylandshells
-            desktop-app::external_kwayland
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-        target_link_libraries(Telegram PRIVATE rt)
-        find_package(PkgConfig REQUIRED)
-
-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
-            target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
-
-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
-                target_link_libraries(Telegram PRIVATE PkgConfig::X11)
-            endif()
-        else()
-            pkg_check_modules(GTK REQUIRED gtk+-3.0)
-            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
-
-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-                target_link_libraries(Telegram PRIVATE X11)
-            endif()
-        endif()
-    endif()
-endif()
-
 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
 nice_target_sources(Telegram ${src_loc}
 PRIVATE
@@ -525,6 +472,7 @@ PRIVATE
     editor/photo_editor_content.h
     editor/photo_editor_controls.cpp
     editor/photo_editor_controls.h
+    editor/photo_editor_inner_common.h
     editor/photo_editor_layer_widget.cpp
     editor/photo_editor_layer_widget.h
     editor/scene/scene.cpp
@@ -616,6 +564,8 @@ PRIVATE
     history/view/history_view_cursor_state.h
     history/view/history_view_element.cpp
     history/view/history_view_element.h
+    history/view/history_view_empty_list_bubble.cpp
+    history/view/history_view_empty_list_bubble.h
     history/view/history_view_group_call_tracker.cpp
     history/view/history_view_group_call_tracker.h
     history/view/history_view_list_widget.cpp
@@ -726,6 +676,8 @@ PRIVATE
     inline_bots/inline_bot_send_data.h
     inline_bots/inline_results_inner.cpp
     inline_bots/inline_results_inner.h
+    inline_bots/inline_results_mosaic_layout.cpp
+    inline_bots/inline_results_mosaic_layout.h
     inline_bots/inline_results_widget.cpp
     inline_bots/inline_results_widget.h
     intro/intro_code.cpp
@@ -752,6 +704,8 @@ PRIVATE
     lang/lang_numbers_animation.h
     lang/lang_translator.cpp
     lang/lang_translator.h
+    layout/layout_utils.cpp
+    layout/layout_utils.h
     main/main_account.cpp
     main/main_account.h
     main/main_app_config.cpp
@@ -865,6 +819,8 @@ PRIVATE
     overview/overview_layout.cpp
     overview/overview_layout.h
     overview/overview_layout_delegate.h
+    overview/overview_mosaic_layout.cpp
+    overview/overview_mosaic_layout.h
     passport/passport_encryption.cpp
     passport/passport_encryption.h
     passport/passport_form_controller.cpp
@@ -893,16 +849,12 @@ PRIVATE
     platform/linux/linux_desktop_environment.h
     platform/linux/linux_gdk_helper.cpp
     platform/linux/linux_gdk_helper.h
-    platform/linux/linux_gsd_media_keys.cpp
-    platform/linux/linux_gsd_media_keys.h
     platform/linux/linux_gtk_integration_dummy.cpp
     platform/linux/linux_gtk_integration_p.h
     platform/linux/linux_gtk_integration.cpp
     platform/linux/linux_gtk_integration.h
     platform/linux/linux_gtk_open_with_dialog.cpp
     platform/linux/linux_gtk_open_with_dialog.h
-    platform/linux/linux_notification_service_watcher.cpp
-    platform/linux/linux_notification_service_watcher.h
     platform/linux/linux_wayland_integration_dummy.cpp
     platform/linux/linux_wayland_integration.cpp
     platform/linux/linux_wayland_integration.h
@@ -1068,6 +1020,10 @@ PRIVATE
     support/support_helper.h
     support/support_templates.cpp
     support/support_templates.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
+    ui/chat/attach/attach_item_single_media_preview.h
     ui/effects/fireworks_animation.cpp
     ui/effects/fireworks_animation.h
     ui/effects/round_checkbox.cpp
@@ -1194,12 +1150,6 @@ endif()
 
 if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_gsd_media_keys.cpp
-        platform/linux/linux_gsd_media_keys.h
-        platform/linux/linux_mpris_support.cpp
-        platform/linux/linux_mpris_support.h
-        platform/linux/linux_notification_service_watcher.cpp
-        platform/linux/linux_notification_service_watcher.h
         platform/linux/linux_xdp_file_dialog.cpp
         platform/linux/linux_xdp_file_dialog.h
         platform/linux/linux_xdp_open_with_dialog.cpp
@@ -1317,6 +1267,48 @@ elseif (APPLE)
             )
         endif()
     endif()
+else()
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::external_glibmm
+        desktop-app::external_glib
+    )
+
+    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_statusnotifieritem
+            desktop-app::external_dbusmenu_qt
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_xcb
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::lib_waylandshells
+            desktop-app::external_kwayland
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
+        find_package(PkgConfig REQUIRED)
+
+        pkg_check_modules(GTK REQUIRED gtk+-3.0)
+        target_include_directories(Telegram SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})
+
+        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+            target_link_libraries(Telegram PRIVATE X11)
+        endif()
+
+        target_link_libraries(Telegram PRIVATE rt)
+    endif()
 endif()
 
 if (build_macstore)
@@ -1459,7 +1451,7 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
     endif()
 
     if (DESKTOP_APP_SPECIAL_TARGET)
-        add_executable(Packer WIN32)
+        add_executable(Packer)
         init_target(Packer)
 
         add_dependencies(Telegram Packer)

Telegram/Patches/breakpad.diff

@@ -1,651 +0,0 @@
-diff --git a/src/build/common.gypi b/src/build/common.gypi
-index 29990c65..53e99d44 100644
---- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -330,6 +330,7 @@
-           'VCCLCompilerTool': {
-             'WarnAsError': 'true',
-             'Detect64BitPortabilityProblems': 'false',
-+            'TreatWChar_tAsBuiltInType': 'false',
-           },
-         },
-       }],
-diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-index 1a93ce6d..b5986e33 100644
---- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-@@ -35,6 +35,19 @@
- /* End PBXAggregateTarget section */
- 
- /* Begin PBXBuildFile section */
-+		0748C0431C63C409004489BF /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; };
-+		0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536F0ECCE3FD009BE4BA /* minidump_generator.cc */; };
-+		0748C0451C63C46C004489BF /* string_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53820ECCE635009BE4BA /* string_utilities.cc */; };
-+		0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */; };
-+		0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
-+		0748C0491C63C4CF004489BF /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537A0ECCE635009BE4BA /* macho_id.cc */; };
-+		0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
-+		0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */ = {isa = PBXBuildFile; fileRef = F92C53870ECCE6C0009BE4BA /* convert_UTF.c */; };
-+		0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537C0ECCE635009BE4BA /* macho_utilities.cc */; };
-+		0748C04D1C63C50F004489BF /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53740ECCE635009BE4BA /* file_id.cc */; };
-+		0748C04E1C63C51C004489BF /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
-+		0748C04F1C63C523004489BF /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537E0ECCE635009BE4BA /* macho_walker.cc */; };
-+		0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
- 		162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
- 		162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
- 		162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
-@@ -67,6 +80,7 @@
- 		4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
- 		4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
- 		4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
-+		5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
- 		8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
- 		8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
- 		8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
-@@ -170,11 +184,8 @@
- 		F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
- 		F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
- 		F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
--		F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
- 		F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53720ECCE3FD009BE4BA /* protected_memory_allocator.cc */; };
- 		F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
--		F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
--		F92C568A0ECD15F9009BE4BA /* Inspector in Resources */ = {isa = PBXBuildFile; fileRef = F92C53540ECCE349009BE4BA /* Inspector */; };
- 		F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
- 		F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
- 		F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
-@@ -213,7 +224,6 @@
- 		F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
- 		F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
- 		F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
--		F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */ = {isa = PBXBuildFile; fileRef = F92C56A00ECE04A7009BE4BA /* crash_report_sender.app */; };
- 		F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
- 		F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
- 		F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
-@@ -410,20 +420,6 @@
- 			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
- 			remoteInfo = breakpadUtilities;
- 		};
--		F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
--			proxyType = 1;
--			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
--			remoteInfo = breakpadUtilities;
--		};
--		F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
--			proxyType = 1;
--			remoteGlobalIDString = F92C53530ECCE349009BE4BA;
--			remoteInfo = Inspector;
--		};
- 		F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
- 			isa = PBXContainerItemProxy;
- 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-@@ -536,13 +532,6 @@
- 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- 			remoteInfo = Breakpad;
- 		};
--		F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */ = {
--			isa = PBXContainerItemProxy;
--			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
--			proxyType = 1;
--			remoteGlobalIDString = F92C569F0ECE04A7009BE4BA;
--			remoteInfo = crash_report_sender;
--		};
- /* End PBXContainerItemProxy section */
- 
- /* Begin PBXCopyFilesBuildPhase section */
-@@ -714,7 +703,6 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
--				F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */,
- 				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
-@@ -1181,18 +1169,13 @@
- 			isa = PBXNativeTarget;
- 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
- 			buildPhases = (
--				F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */,
- 				8DC2EF500486A6940098B216 /* Headers */,
--				8DC2EF520486A6940098B216 /* Resources */,
- 				8DC2EF540486A6940098B216 /* Sources */,
- 				8DC2EF560486A6940098B216 /* Frameworks */,
- 			);
- 			buildRules = (
- 			);
- 			dependencies = (
--				F92C56860ECD15EF009BE4BA /* PBXTargetDependency */,
--				F92C56880ECD15F1009BE4BA /* PBXTargetDependency */,
--				F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */,
- 			);
- 			name = Breakpad;
- 			productInstallPath = "$(HOME)/Library/Frameworks";
-@@ -1399,6 +1382,8 @@
- /* Begin PBXProject section */
- 		0867D690FE84028FC02AAC07 /* Project object */ = {
- 			isa = PBXProject;
-+			attributes = {
-+			};
- 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
- 			compatibilityVersion = "Xcode 3.1";
- 			developmentRegion = English;
-@@ -1583,16 +1568,6 @@
- /* End PBXReferenceProxy section */
- 
- /* Begin PBXResourcesBuildPhase section */
--		8DC2EF520486A6940098B216 /* Resources */ = {
--			isa = PBXResourcesBuildPhase;
--			buildActionMask = 2147483647;
--			files = (
--				F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */,
--				F92C568A0ECD15F9009BE4BA /* Inspector in Resources */,
--				F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */,
--			);
--			runOnlyForDeploymentPostprocessing = 0;
--		};
- 		F92C569C0ECE04A7009BE4BA /* Resources */ = {
- 			isa = PBXResourcesBuildPhase;
- 			buildActionMask = 2147483647;
-@@ -1640,20 +1615,6 @@
- 			shellPath = /bin/sh;
- 			shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
- 		};
--		F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */ = {
--			isa = PBXShellScriptBuildPhase;
--			buildActionMask = 2147483647;
--			files = (
--			);
--			inputPaths = (
--			);
--			name = "Change install name of breakpadUtilities";
--			outputPaths = (
--			);
--			runOnlyForDeploymentPostprocessing = 0;
--			shellPath = /bin/sh;
--			shellScript = "#!/bin/bash\ninstall_name_tool -id \"@executable_path/../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
--		};
- 		F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
- 			isa = PBXShellScriptBuildPhase;
- 			buildActionMask = 2147483647;
-@@ -1674,6 +1635,20 @@
- 			isa = PBXSourcesBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
-+				0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
-+				0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
-+				0748C04E1C63C51C004489BF /* md5.cc in Sources */,
-+				0748C04D1C63C50F004489BF /* file_id.cc in Sources */,
-+				0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */,
-+				0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */,
-+				0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */,
-+				0748C0491C63C4CF004489BF /* macho_id.cc in Sources */,
-+				0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */,
-+				0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */,
-+				0748C0451C63C46C004489BF /* string_utilities.cc in Sources */,
-+				0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */,
-+				0748C0431C63C409004489BF /* MachIPC.mm in Sources */,
- 				F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
- 				F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
- 				F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
-@@ -1955,16 +1930,6 @@
- 			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
- 			targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
- 		};
--		F92C56860ECD15EF009BE4BA /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
--			targetProxy = F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */;
--		};
--		F92C56880ECD15F1009BE4BA /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			target = F92C53530ECCE349009BE4BA /* Inspector */;
--			targetProxy = F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */;
--		};
- 		F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
- 			isa = PBXTargetDependency;
- 			target = F93803BD0F80820F004D428B /* generator_test */;
-@@ -2025,11 +1990,6 @@
- 			target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
- 			targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
- 		};
--		F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */ = {
--			isa = PBXTargetDependency;
--			target = F92C569F0ECE04A7009BE4BA /* crash_report_sender */;
--			targetProxy = F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */;
--		};
- /* End PBXTargetDependency section */
- 
- /* Begin PBXVariantGroup section */
-@@ -2126,8 +2086,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
--				SDKROOT = macosx10.5;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -2135,7 +2099,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -2454,7 +2423,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = "Debug With Code Coverage";
- 		};
-diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
-index 1d2e519b..943310fa 100644
---- a/src/client/mac/Framework/Breakpad.mm
-+++ b/src/client/mac/Framework/Breakpad.mm
-@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
-     return false;
-   }
- 
--  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
-+//  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
-     return InitializeInProcess(parameters);
--  else
--    return InitializeOutOfProcess(parameters);
-+//  else
-+//    return InitializeOutOfProcess(parameters);
- }
- 
- //=============================================================================
-@@ -373,52 +373,52 @@ bool Breakpad::InitializeInProcess(NSDictionary* parameters) {
- }
- 
- //=============================================================================
--bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
--  // Get path to Inspector executable.
--  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
--
--  // Standardize path (resolve symlinkes, etc.)  and escape spaces
--  inspectorPathString = [inspectorPathString stringByStandardizingPath];
--  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
--                                              componentsJoinedByString:@"\\ "];
--
--  // Create an on-demand server object representing the Inspector.
--  // In case of a crash, we simply need to call the LaunchOnDemand()
--  // method on it, then send a mach message to its service port.
--  // It will then launch and perform a process inspection of our crashed state.
--  // See the HandleException() method for the details.
--#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
--
--  name_t portName;
--  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
--
--  // Save the location of the Inspector
--  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
--          sizeof(inspector_path_));
--
--  // Append a single command-line argument to the Inspector path
--  // representing the bootstrap name of the launch-on-demand receive port.
--  // When the Inspector is launched, it can use this to lookup the port
--  // by calling bootstrap_check_in().
--  strlcat(inspector_path_, " ", sizeof(inspector_path_));
--  strlcat(inspector_path_, portName, sizeof(inspector_path_));
--
--  kern_return_t kr = inspector_.Initialize(inspector_path_,
--                                           portName,
--                                           true);        // shutdown on exit
--
--  if (kr != KERN_SUCCESS) {
--    return false;
--  }
--
--  // Create the handler (allocating it in our special protected pool)
--  handler_ =
--      new (gBreakpadAllocator->Allocate(
--          sizeof(google_breakpad::ExceptionHandler)))
--          google_breakpad::ExceptionHandler(
--              Breakpad::ExceptionHandlerDirectCallback, this, true);
--  return true;
--}
-+//bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
-+//  // Get path to Inspector executable.
-+//  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
-+//
-+//  // Standardize path (resolve symlinkes, etc.)  and escape spaces
-+//  inspectorPathString = [inspectorPathString stringByStandardizingPath];
-+//  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
-+//                                              componentsJoinedByString:@"\\ "];
-+//
-+//  // Create an on-demand server object representing the Inspector.
-+//  // In case of a crash, we simply need to call the LaunchOnDemand()
-+//  // method on it, then send a mach message to its service port.
-+//  // It will then launch and perform a process inspection of our crashed state.
-+//  // See the HandleException() method for the details.
-+//#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
-+//
-+//  name_t portName;
-+//  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
-+//
-+//  // Save the location of the Inspector
-+//  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
-+//          sizeof(inspector_path_));
-+//
-+//  // Append a single command-line argument to the Inspector path
-+//  // representing the bootstrap name of the launch-on-demand receive port.
-+//  // When the Inspector is launched, it can use this to lookup the port
-+//  // by calling bootstrap_check_in().
-+//  strlcat(inspector_path_, " ", sizeof(inspector_path_));
-+//  strlcat(inspector_path_, portName, sizeof(inspector_path_));
-+//
-+//  kern_return_t kr = inspector_.Initialize(inspector_path_,
-+//                                           portName,
-+//                                           true);        // shutdown on exit
-+//
-+//  if (kr != KERN_SUCCESS) {
-+//    return false;
-+//  }
-+//
-+//  // Create the handler (allocating it in our special protected pool)
-+//  handler_ =
-+//      new (gBreakpadAllocator->Allocate(
-+//          sizeof(google_breakpad::ExceptionHandler)))
-+//          google_breakpad::ExceptionHandler(
-+//              Breakpad::ExceptionHandlerDirectCallback, this, true);
-+//  return true;
-+//}
- 
- //=============================================================================
- Breakpad::~Breakpad() {
-@@ -445,10 +445,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   NSString *version = [parameters objectForKey:@BREAKPAD_VERSION];
-   NSString *urlStr = [parameters objectForKey:@BREAKPAD_URL];
-   NSString *interval = [parameters objectForKey:@BREAKPAD_REPORT_INTERVAL];
--  NSString *inspectorPathString =
--      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
--  NSString *reporterPathString =
--      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
-+//  NSString *inspectorPathString =
-+//      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
-+//  NSString *reporterPathString =
-+//      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
-   NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT];
-   NSArray  *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES];
-   NSString *logFileTailSize =
-@@ -536,39 +536,39 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   }
- 
-   // Find the helper applications if not specified in user config.
--  NSString *resourcePath = nil;
--  if (!inspectorPathString || !reporterPathString) {
--    resourcePath = GetResourcePath();
--    if (!resourcePath) {
--      return false;
--    }
--  }
-+//  NSString *resourcePath = nil;
-+//  if (!inspectorPathString || !reporterPathString) {
-+//    resourcePath = GetResourcePath();
-+//    if (!resourcePath) {
-+//      return false;
-+//    }
-+//  }
- 
-   // Find Inspector.
--  if (!inspectorPathString) {
--    inspectorPathString =
--        [resourcePath stringByAppendingPathComponent:@"Inspector"];
--  }
--
--  // Verify that there is an Inspector tool.
--  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
--    return false;
--  }
-+//  if (!inspectorPathString) {
-+//    inspectorPathString =
-+//        [resourcePath stringByAppendingPathComponent:@"Inspector"];
-+//  }
-+//
-+//  // Verify that there is an Inspector tool.
-+//  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
-+//    return false;
-+//  }
- 
-   // Find Reporter.
--  if (!reporterPathString) {
--    reporterPathString =
--        [resourcePath
--         stringByAppendingPathComponent:@"crash_report_sender.app"];
--    reporterPathString =
--        [[NSBundle bundleWithPath:reporterPathString] executablePath];
--  }
-+//  if (!reporterPathString) {
-+//    reporterPathString =
-+//        [resourcePath
-+//         stringByAppendingPathComponent:@"crash_report_sender.app"];
-+//    reporterPathString =
-+//        [[NSBundle bundleWithPath:reporterPathString] executablePath];
-+//  }
- 
-   // Verify that there is a Reporter application.
--  if (![[NSFileManager defaultManager]
--             fileExistsAtPath:reporterPathString]) {
--    return false;
--  }
-+//  if (![[NSFileManager defaultManager]
-+//             fileExistsAtPath:reporterPathString]) {
-+//    return false;
-+//  }
- 
-   if (!dumpSubdirectory) {
-     dumpSubdirectory = @"";
-@@ -601,10 +601,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   dictionary.SetKeyValue(BREAKPAD_REPORT_INTERVAL, [interval UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_SKIP_CONFIRM,    [skipConfirm UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_CONFIRM_TIMEOUT, [timeout UTF8String]);
--  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
--                         [inspectorPathString fileSystemRepresentation]);
--  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
--                         [reporterPathString fileSystemRepresentation]);
-+//  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
-+//                         [inspectorPathString fileSystemRepresentation]);
-+//  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
-+//                         [reporterPathString fileSystemRepresentation]);
-   dictionary.SetKeyValue(BREAKPAD_LOGFILE_UPLOAD_SIZE,
-                          [logFileTailSize UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_REQUEST_COMMENTS,
-@@ -762,9 +762,9 @@ bool Breakpad::HandleException(int exception_type,
- bool Breakpad::HandleMinidump(const char *dump_dir, const char *minidump_id) {
-   google_breakpad::ConfigFile config_file;
-   config_file.WriteFile(dump_dir, config_params_, dump_dir, minidump_id);
--  google_breakpad::LaunchReporter(
--      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
--      config_file.GetFilePath());
-+//  google_breakpad::LaunchReporter(
-+//      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
-+//      config_file.GetFilePath());
-   return true;
- }
- 
-diff --git a/src/common/language.cc b/src/common/language.cc
-index 978fb855..a95ae5f7 100644
---- a/src/common/language.cc
-+++ b/src/common/language.cc
-@@ -46,8 +46,27 @@
- 
- #include <limits>
- 
-+#include <cstdio>
-+#include <iostream>
-+#include <memory>
-+#include <stdexcept>
-+#include <string>
-+#include <array>
-+
- namespace {
- 
-+std::string exec(std::string cmd) {
-+    std::array<char, 128> buffer;
-+    std::string result;
-+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
-+    if (!pipe) throw std::runtime_error("popen() failed!");
-+    while (!feof(pipe.get())) {
-+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
-+            result += buffer.data();
-+    }
-+    return result;
-+}
-+
- string MakeQualifiedNameWithSeparator(const string& parent_name,
-                                       const char* separator,
-                                       const string& name) {
-@@ -79,11 +98,29 @@ class CPPLanguage: public Language {
-     demangled->clear();
-     return kDontDemangle;
- #else
-+    DemangleResult result;
-+    if (mangled.find("type_erased_handlers") != std::string::npos
-+            && mangled.find("vtable_once_impl") != std::string::npos) {
-+
-+        auto demangled_str = exec("c++filt " + mangled);
-+        if (!demangled_str.empty() && demangled_str.back() == '\n') {
-+            demangled_str.pop_back();
-+        }
-+        if (demangled_str != mangled) {
-+            result = kDemangleSuccess;
-+            demangled->assign(demangled_str.c_str());
-+        } else {
-+            result = kDemangleFailure;
-+            demangled->clear();
-+        }
-+
-+    } else {
-+
-     int status;
-     char* demangled_c =
-         abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status);
- 
--    DemangleResult result;
-+//    DemangleResult result;
-     if (status == 0) {
-       result = kDemangleSuccess;
-       demangled->assign(demangled_c);
-@@ -96,6 +133,8 @@ class CPPLanguage: public Language {
-       free(reinterpret_cast<void*>(demangled_c));
-     }
- 
-+    }
-+
-     return result;
- #endif
-   }
-diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
-index 562875e1..43678510 100644
---- a/src/common/linux/elf_symbols_to_module.cc
-+++ b/src/common/linux/elf_symbols_to_module.cc
-@@ -39,6 +39,29 @@
- #include "common/byte_cursor.h"
- #include "common/module.h"
- 
-+#include <cstdio>
-+#include <iostream>
-+#include <memory>
-+#include <stdexcept>
-+#include <string>
-+#include <array>
-+
-+namespace {
-+
-+std::string exec(std::string cmd) {
-+    std::array<char, 128> buffer;
-+    std::string result;
-+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
-+    if (!pipe) throw std::runtime_error("popen() failed!");
-+    while (!feof(pipe.get())) {
-+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
-+            result += buffer.data();
-+    }
-+    return result;
-+}
-+
-+}
-+
- namespace google_breakpad {
- 
- class ELFSymbolIterator {
-@@ -159,6 +182,19 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
-       Module::Extern *ext = new Module::Extern(iterator->value);
-       ext->name = SymbolString(iterator->name_offset, strings);
- #if !defined(__ANDROID__)  // Android NDK doesn't provide abi::__cxa_demangle.
-+      if (ext->name.find("type_erased_handlers") != std::string::npos
-+              && ext->name.find("vtable_once_impl") != std::string::npos) {
-+
-+          auto demangled_str = exec("c++filt " + ext->name);
-+          if (!demangled_str.empty() && demangled_str.back() == '\n') {
-+              demangled_str.pop_back();
-+          }
-+          if (demangled_str != ext->name) {
-+              ext->name = demangled_str;
-+          }
-+
-+      } else {
-+
-       int status = 0;
-       char* demangled =
-           abi::__cxa_demangle(ext->name.c_str(), NULL, NULL, &status);
-@@ -167,6 +203,8 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
-           ext->name = demangled;
-         free(demangled);
-       }
-+
-+      }
- #endif
-       module->AddExtern(ext);
-     }
-diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
-index 1c15992e..020e4c1c 100644
---- a/src/tools/linux/tools_linux.gypi
-+++ b/src/tools/linux/tools_linux.gypi
-@@ -58,7 +58,7 @@
-       'target_name': 'minidump_upload',
-       'type': 'executable',
-       'sources': [
--        'symupload/minidump_upload.m',
-+        'symupload/minidump_upload.cc',
-       ],
-       'dependencies': [
-         '../common/common.gyp:common',
-diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
-index d882bbe8..3432bb45 100644
---- a/src/tools/mac/dump_syms/macho_dump.cc
-+++ b/src/tools/mac/dump_syms/macho_dump.cc
-@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
-   size_t object_files_size;
-   const SuperFatArch* super_fat_object_files =
-       fat_reader.object_files(&object_files_size);
--  struct fat_arch *object_files;
-+  struct fat_arch *object_files = 0;
-   if (!super_fat_object_files->ConvertToFatArch(object_files)) {
-     exit(1);
-   }

Telegram/Patches/build_ffmpeg_win.sh

@@ -1,121 +0,0 @@
-set -e
-FullExecPath=$PWD
-pushd `dirname $0` > /dev/null
-FullScriptPath=`pwd`
-popd > /dev/null
-
-pacman --noconfirm -Sy
-pacman --noconfirm -S msys/make
-pacman --noconfirm -S mingw64/mingw-w64-x86_64-opus
-pacman --noconfirm -S diffutils
-pacman --noconfirm -S pkg-config
-
-PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-./configure --toolchain=msvc \
---extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
---extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
---extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
---disable-programs \
---disable-doc \
---disable-network \
---disable-everything \
---enable-hwaccel=h264_d3d11va \
---enable-hwaccel=h264_d3d11va2 \
---enable-hwaccel=h264_dxva2 \
---enable-hwaccel=hevc_d3d11va \
---enable-hwaccel=hevc_d3d11va2 \
---enable-hwaccel=hevc_dxva2 \
---enable-hwaccel=mpeg2_d3d11va \
---enable-hwaccel=mpeg2_d3d11va2 \
---enable-hwaccel=mpeg2_dxva2 \
---enable-protocol=file --enable-libopus \
---enable-decoder=aac \
---enable-decoder=aac_at \
---enable-decoder=aac_fixed \
---enable-decoder=aac_latm \
---enable-decoder=aasc \
---enable-decoder=alac \
---enable-decoder=alac_at \
---enable-decoder=flac \
---enable-decoder=gif \
---enable-decoder=h264 \
---enable-decoder=hevc \
---enable-decoder=mp1 \
---enable-decoder=mp1float \
---enable-decoder=mp2 \
---enable-decoder=mp2float \
---enable-decoder=mp3 \
---enable-decoder=mp3adu \
---enable-decoder=mp3adufloat \
---enable-decoder=mp3float \
---enable-decoder=mp3on4 \
---enable-decoder=mp3on4float \
---enable-decoder=mpeg4 \
---enable-decoder=msmpeg4v2 \
---enable-decoder=msmpeg4v3 \
---enable-decoder=opus \
---enable-decoder=pcm_alaw \
---enable-decoder=pcm_alaw_at \
---enable-decoder=pcm_f32be \
---enable-decoder=pcm_f32le \
---enable-decoder=pcm_f64be \
---enable-decoder=pcm_f64le \
---enable-decoder=pcm_lxf \
---enable-decoder=pcm_mulaw \
---enable-decoder=pcm_mulaw_at \
---enable-decoder=pcm_s16be \
---enable-decoder=pcm_s16be_planar \
---enable-decoder=pcm_s16le \
---enable-decoder=pcm_s16le_planar \
---enable-decoder=pcm_s24be \
---enable-decoder=pcm_s24daud \
---enable-decoder=pcm_s24le \
---enable-decoder=pcm_s24le_planar \
---enable-decoder=pcm_s32be \
---enable-decoder=pcm_s32le \
---enable-decoder=pcm_s32le_planar \
---enable-decoder=pcm_s64be \
---enable-decoder=pcm_s64le \
---enable-decoder=pcm_s8 \
---enable-decoder=pcm_s8_planar \
---enable-decoder=pcm_u16be \
---enable-decoder=pcm_u16le \
---enable-decoder=pcm_u24be \
---enable-decoder=pcm_u24le \
---enable-decoder=pcm_u32be \
---enable-decoder=pcm_u32le \
---enable-decoder=pcm_u8 \
---enable-decoder=pcm_zork \
---enable-decoder=vorbis \
---enable-decoder=wavpack \
---enable-decoder=wmalossless \
---enable-decoder=wmapro \
---enable-decoder=wmav1 \
---enable-decoder=wmav2 \
---enable-decoder=wmavoice \
---enable-encoder=libopus \
---enable-parser=aac \
---enable-parser=aac_latm \
---enable-parser=flac \
---enable-parser=h264 \
---enable-parser=hevc \
---enable-parser=mpeg4video \
---enable-parser=mpegaudio \
---enable-parser=opus \
---enable-parser=vorbis \
---enable-demuxer=aac \
---enable-demuxer=flac \
---enable-demuxer=gif \
---enable-demuxer=h264 \
---enable-demuxer=hevc \
---enable-demuxer=m4v \
---enable-demuxer=mov \
---enable-demuxer=mp3 \
---enable-demuxer=ogg \
---enable-demuxer=wav \
---enable-muxer=ogg \
---enable-muxer=opus
-
-make -j4
-make -j4 install

Telegram/Patches/crashpad.diff

@@ -1,107 +0,0 @@
-diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
-index 436ac5ad..8e14fb9c 100644
---- a/client/capture_context_mac_test.cc
-+++ b/client/capture_context_mac_test.cc
-@@ -34,11 +34,11 @@ namespace {
- // gtest assertions.
- void SanityCheckContext(const NativeCPUContext& context) {
- #if defined(ARCH_CPU_X86)
--  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
--  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #elif defined(ARCH_CPU_X86_64)
--  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
--  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #endif
- 
- #if defined(ARCH_CPU_X86_FAMILY)
-diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
-index 7e279015..27864388 100644
---- a/client/simulate_crash_mac.cc
-+++ b/client/simulate_crash_mac.cc
-@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
- 
- void SimulateCrash(const NativeCPUContext& cpu_context) {
- #if defined(ARCH_CPU_X86)
--  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE32_COUNT);
- #elif defined(ARCH_CPU_X86_64)
--  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE64_COUNT);
-diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
-index 87c5f845..ca813e4c 100644
---- a/client/simulate_crash_mac_test.cc
-+++ b/client/simulate_crash_mac_test.cc
-@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_thread_state*>(old_state);
-           switch (state->tsh.flavor) {
-             case x86_THREAD_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
--                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             case x86_THREAD_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
--                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
-@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_float_state*>(old_state);
-           switch (state->fsh.flavor) {
-             case x86_FLOAT_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
--                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             case x86_FLOAT_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
--                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
-@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_debug_state*>(old_state);
-           switch (state->dsh.flavor) {
-             case x86_DEBUG_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
--                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             case x86_DEBUG_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
--                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
-diff --git a/crashpad.gyp b/crashpad.gyp
-index 42fe0a26..d8af1bf1 100644
---- a/crashpad.gyp
-+++ b/crashpad.gyp
-@@ -25,7 +25,7 @@
-         'minidump/minidump.gyp:*',
-         'minidump/minidump_test.gyp:*',
-         'snapshot/snapshot.gyp:*',
--        'snapshot/snapshot_test.gyp:*',
-+#        'snapshot/snapshot_test.gyp:*',
-         'test/test.gyp:*',
-         'test/test_test.gyp:*',
-         'tools/tools.gyp:*',

Telegram/Patches/gyp.diff

@@ -1,132 +0,0 @@
-diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
-index 4a2041cf..e5333926 100644
---- a/pylib/gyp/generator/cmake.py
-+++ b/pylib/gyp/generator/cmake.py
-@@ -1078,6 +1078,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
- 
-       output.write(')\n')
- 
-+  # Precompile header
-+  precompiled_header = config.get('cmake_precompiled_header', '')
-+  if precompiled_header:
-+    precompiled_header_script = config.get('cmake_precompiled_header_script', '')
-+    if not precompiled_header_script:
-+      print ('ERROR: cmake_precompiled_header requires cmake_precompiled_header_script')
-+    cmake_precompiled_header = NormjoinPath(path_from_cmakelists_to_gyp, precompiled_header)
-+    cmake_precompiled_header_script = NormjoinPathForceCMakeSource(path_from_cmakelists_to_gyp, precompiled_header_script)
-+    output.write('include(')
-+    output.write(cmake_precompiled_header_script)
-+    output.write(')\n')
-+    output.write('add_precompiled_header(')
-+    output.write(cmake_target_name)
-+    output.write(' ')
-+    output.write(cmake_precompiled_header)
-+    output.write(')\n')
-+
-   UnsetVariable(output, 'TOOLSET')
-   UnsetVariable(output, 'TARGET')
- 
-@@ -1120,6 +1137,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
-   SetVariable(output, 'configuration', config_to_use)
- 
-   ar = None
-+  ranlib = None
-+  nm = None
-   cc = None
-   cxx = None
- 
-@@ -1129,17 +1148,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
-   for key, value in make_global_settings:
-     if key == 'AR':
-       ar = os.path.join(build_to_top, value)
-+    if key == 'RANLIB':
-+      ranlib = os.path.join(build_to_top, value)
-+    if key == 'NM':
-+      nm = os.path.join(build_to_top, value)
-     if key == 'CC':
-       cc = os.path.join(build_to_top, value)
-     if key == 'CXX':
-       cxx = os.path.join(build_to_top, value)
- 
-   ar = gyp.common.GetEnvironFallback(['AR_target', 'AR'], ar)
-+  ranlib = gyp.common.GetEnvironFallback(['RANLIB_target', 'RANLIB'], ranlib)
-+  nm = gyp.common.GetEnvironFallback(['NM_target', 'NM'], nm)
-   cc = gyp.common.GetEnvironFallback(['CC_target', 'CC'], cc)
-   cxx = gyp.common.GetEnvironFallback(['CXX_target', 'CXX'], cxx)
- 
-   if ar:
-     SetVariable(output, 'CMAKE_AR', ar)
-+  if ranlib:
-+    SetVariable(output, 'CMAKE_RANLIB', ranlib)
-+  if nm:
-+    SetVariable(output, 'CMAKE_NM', nm)
-   if cc:
-     SetVariable(output, 'CMAKE_C_COMPILER', cc)
-   if cxx:
-diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
-index 8bc22bed..24bee427 100644
---- a/pylib/gyp/generator/xcode.py
-+++ b/pylib/gyp/generator/xcode.py
-@@ -74,6 +74,12 @@ generator_additional_non_configuration_keys = [
-   'ios_app_extension',
-   'ios_watch_app',
-   'ios_watchkit_extension',
-+
-+  'mac_sandbox', # sandbox support
-+  'mac_sandbox_development_team',
-+
-+  'mac_hardened_runtime', # hardened runtime support
-+
-   'mac_bundle',
-   'mac_bundle_resources',
-   'mac_framework_headers',
-@@ -774,6 +780,39 @@ def GenerateOutput(target_list, target_dicts, data, params):
-     xcode_targets[qualified_target] = xct
-     xcode_target_to_target_dict[xct] = spec
- 
-+    # sandbox and hardened runtime support
-+    is_sandbox = int(spec.get('mac_sandbox', 0))
-+    is_hardened_runtime = int(spec.get('mac_hardened_runtime', 0))
-+    if is_sandbox or is_hardened_runtime:
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes']
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'] = {}
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'][xct] = {}
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities'] = {}
-+
-+    if is_sandbox:
-+      dev_team = spec.get('mac_sandbox_development_team', '%%ERROR%%')
-+      assert dev_team != '%%ERROR%%', (
-+          'mac_sandbox must be accompanied by mac_sandbox_development_team (target "%s")' %
-+          target_name)
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['DevelopmentTeam'] = dev_team
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.Sandbox'] = {
-+        'enabled': 1,
-+      }
-+
-+    # hardened runtime support
-+    if is_hardened_runtime:
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.HardenedRuntime'] = {
-+        'enabled': 1,
-+      }
-+
-     spec_actions = spec.get('actions', [])
-     spec_rules = spec.get('rules', [])
- 
-@@ -1132,7 +1171,8 @@ exit 1
-         groups = [x for x in groups if not x.endswith('_excluded')]
-       for group in groups:
-         for item in rule.get(group, []):
--          pbxp.AddOrGetFileInRootGroup(item)
-+          concrete_item = ExpandXcodeVariables(item, rule_input_dict)
-+          pbxp.AddOrGetFileInRootGroup(concrete_item)
- 
-     # Add "sources".
-     for source in spec.get('sources', []):

Telegram/Patches/macold/crashpad.diff

@@ -1,127 +0,0 @@
-diff --git a/build/crashpad.gypi b/build/crashpad.gypi
-index 027c7b68..4bfdfb5a 100644
---- a/build/crashpad.gypi
-+++ b/build/crashpad.gypi
-@@ -25,5 +25,15 @@
-       4201,  # nonstandard extension used : nameless struct/union.
-       4324,  # structure was padded due to __declspec(align()).
-     ],
-+    'xcode_settings': {
-+      'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-+      'OTHER_LDFLAGS': [
-+        '/usr/local/macold/lib/libc++.a',
-+        '/usr/local/macold/lib/libc++abi.a',
-+      ],
-+    },
-+    'include_dirs': [
-+      '/usr/local/macold/include/c++/v1',
-+    ],
-   },
- }
-diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
-index 436ac5ad..8e14fb9c 100644
---- a/client/capture_context_mac_test.cc
-+++ b/client/capture_context_mac_test.cc
-@@ -34,11 +34,11 @@ namespace {
- // gtest assertions.
- void SanityCheckContext(const NativeCPUContext& context) {
- #if defined(ARCH_CPU_X86)
--  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
--  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #elif defined(ARCH_CPU_X86_64)
--  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
--  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #endif
- 
- #if defined(ARCH_CPU_X86_FAMILY)
-diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
-index 7e279015..27864388 100644
---- a/client/simulate_crash_mac.cc
-+++ b/client/simulate_crash_mac.cc
-@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
- 
- void SimulateCrash(const NativeCPUContext& cpu_context) {
- #if defined(ARCH_CPU_X86)
--  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE32_COUNT);
- #elif defined(ARCH_CPU_X86_64)
--  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE64_COUNT);
-diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
-index 87c5f845..ca813e4c 100644
---- a/client/simulate_crash_mac_test.cc
-+++ b/client/simulate_crash_mac_test.cc
-@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_thread_state*>(old_state);
-           switch (state->tsh.flavor) {
-             case x86_THREAD_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
--                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             case x86_THREAD_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
--                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
-@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_float_state*>(old_state);
-           switch (state->fsh.flavor) {
-             case x86_FLOAT_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
--                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             case x86_FLOAT_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
--                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
-@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_debug_state*>(old_state);
-           switch (state->dsh.flavor) {
-             case x86_DEBUG_STATE32:
--              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
--                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             case x86_DEBUG_STATE64:
--              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
--                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
-diff --git a/crashpad.gyp b/crashpad.gyp
-index 42fe0a26..d8af1bf1 100644
---- a/crashpad.gyp
-+++ b/crashpad.gyp
-@@ -25,7 +25,7 @@
-         'minidump/minidump.gyp:*',
-         'minidump/minidump_test.gyp:*',
-         'snapshot/snapshot.gyp:*',
--        'snapshot/snapshot_test.gyp:*',
-+#        'snapshot/snapshot_test.gyp:*',
-         'test/test.gyp:*',
-         'test/test_test.gyp:*',
-         'tools/tools.gyp:*',

Telegram/Patches/macold/mini_chromium.diff

@@ -1,28 +0,0 @@
-diff --git a/build/common.gypi b/build/common.gypi
-index 1affc70..0677e4b 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -66,6 +66,13 @@
-           'conditions': [
-             ['clang!=0', {
-               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
-+              'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-+              'OTHER_LDFLAGS': [
-+                '/usr/local/macold/lib/libc++.a',
-+                '/usr/local/macold/lib/libc++abi.a',
-+                '-isysroot/',
-+                '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
-+              ],
- 
-               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
-               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
-@@ -116,6 +123,9 @@
-           ],
- 
-         },
-+        'include_dirs': [
-+          '/usr/local/macold/include/c++/v1',
-+        ],
-       }],
- 
-       ['OS=="linux"', {

Telegram/Patches/macold/qtbase_5_3_2.diff

@@ -1,844 +0,0 @@
-diff --git a/configure b/configure
-index cb8d78fd3c..cadb3f0a88 100755
---- a/configure
-+++ b/configure
-@@ -511,7 +511,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
-         exit 2
-     fi
- 
--    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
-+    # Patch: Fix Qt for working with Xcode 8.
-+    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
-         echo >&2
-         echo "   Xcode not set up properly. You may need to confirm the license" >&2
-         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
-diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
-index 086510dd96..078a5ed1dd 100644
---- a/mkspecs/common/g++-macx.conf
-+++ b/mkspecs/common/g++-macx.conf
-@@ -14,7 +14,13 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
- QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
- QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
- 
--QMAKE_LFLAGS_STATIC_LIB += -all_load
-+# Patch: Don't remember :(
-+#QMAKE_LFLAGS_STATIC_LIB += -all_load
-+
-+# Patch: Use C++14 with custom libc++ build.
-+QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+QMAKE_CXXFLAGS += -nostdinc++ -I/usr/local/macold/include/c++/v1
-+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a -isysroot /
- 
- QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
- 
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index 0cc8cd6dfd..ca9725b779 100644
---- a/mkspecs/features/mac/default_pre.prf
-+++ b/mkspecs/features/mac/default_pre.prf
-@@ -12,7 +12,9 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
-         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
- 
-     # Make sure Xcode is set up properly
--    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
-+
-+    # Patch: Fix Qt for working with Xcode 8.
-+    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
-         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
- }
- 
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index bb79a139b3..5d595bc3b3 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -220,6 +220,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-     int blue_scale = 0;
-     int alpha_scale = 0;
- 
-+    // Patch: Backport a fix for bmp reader.
-+    if (!d->isSequential())
-+        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
-+
-     if (bi.biSize >= BMP_WIN4 || (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32))) {
-         if (d->read((char *)&red_mask, sizeof(red_mask)) != sizeof(red_mask))
-             return false;
-@@ -307,8 +311,9 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-     image.setDotsPerMeterX(bi.biXPelsPerMeter);
-     image.setDotsPerMeterY(bi.biYPelsPerMeter);
- 
--    if (!d->isSequential())
--        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
-+    // Patch: Backport a fix for bmp reader.
-+    //if (!d->isSequential())
-+    //    d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
- 
-     if (ncols > 0) {                                // read color table
-         uchar rgb[4];
-diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
-index ebff9509ab..4300ca4c0f 100644
---- a/src/gui/painting/qpaintengine_p.h
-+++ b/src/gui/painting/qpaintengine_p.h
-@@ -87,8 +87,18 @@ public:
-         if (hasSystemTransform) {
-             if (systemTransform.type() <= QTransform::TxTranslate)
-                 systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy()));
--            else
-+            // Patch: Transform the system clip region back from device pixels to device-independent pixels before
-+            // applying systemTransform, which already has transform from device-independent pixels to device pixels.
-+            else {
-+#ifdef Q_OS_MAC
-+                QTransform scaleTransform;
-+                const qreal invDevicePixelRatio = 1. / pdev->devicePixelRatio();
-+                scaleTransform.scale(invDevicePixelRatio, invDevicePixelRatio);
-+                systemClip = systemTransform.map(scaleTransform.map(systemClip));
-+#else
-                 systemClip = systemTransform.map(systemClip);
-+#endif
-+            }
-         }
- 
-         // Make sure we're inside the viewport.
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 4879ae51d7..56cdcbaf01 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
-         while (oldPos < len && !attributes[oldPos].graphemeBoundary)
-             oldPos++;
-     } else {
-+        // Patch: Skip to the end of the current word, not to the start of the next one.
-+        while (oldPos < len && attributes[oldPos].whiteSpace)
-+            oldPos++;
-         if (oldPos < len && d->atWordSeparator(oldPos)) {
-             oldPos++;
-             while (oldPos < len && d->atWordSeparator(oldPos))
-@@ -662,8 +665,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
-             while (oldPos < len && !d->atSpace(oldPos) && !d->atWordSeparator(oldPos))
-                 oldPos++;
-         }
--        while (oldPos < len && d->atSpace(oldPos))
--            oldPos++;
-+        // Patch: Skip to the end of the current word, not to the start of the next one.
-+        //while (oldPos < len && d->atSpace(oldPos))
-+        //    oldPos++;
-     }
- 
-     return oldPos;
-@@ -1602,6 +1606,9 @@ namespace {
-         int currentPosition;
-         glyph_t previousGlyph;
- 
-+        // Patch: Backport a crash fix.
-+        QFontEngine *previousGlyphFontEngine;
-+
-         QFixed minw;
-         QFixed softHyphenWidth;
-         QFixed rightBearing;
-@@ -1634,13 +1641,19 @@ namespace {
-             if (currentPosition > 0 &&
-                 logClusters[currentPosition - 1] < glyphs.numGlyphs) {
-                 previousGlyph = currentGlyph(); // needed to calculate right bearing later
-+
-+                // Patch: Backport a crash fix.
-+                previousGlyphFontEngine = fontEngine;
-             }
-         }
- 
--        inline void adjustRightBearing(glyph_t glyph)
-+        // Patch: Backport a crash fix.
-+        inline void adjustRightBearing(QFontEngine *engine, glyph_t glyph)
-         {
-             qreal rb;
--            fontEngine->getGlyphBearings(glyph, 0, &rb);
-+
-+            // Patch: Backport a crash fix.
-+            engine->getGlyphBearings(glyph, 0, &rb);
-             rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
-         }
- 
-@@ -1648,13 +1661,16 @@ namespace {
-         {
-             if (currentPosition <= 0)
-                 return;
--            adjustRightBearing(currentGlyph());
-+
-+            // Patch: Backport a crash fix.
-+            adjustRightBearing(fontEngine, currentGlyph());
-         }
- 
-         inline void adjustPreviousRightBearing()
-         {
-             if (previousGlyph > 0)
--                adjustRightBearing(previousGlyph);
-+                // Patch: Backport a crash fix.
-+                adjustRightBearing(previousGlyphFontEngine, previousGlyph);
-         }
- 
-         inline void resetRightBearing()
-diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
-index cbe42c3844..b273db7e78 100644
---- a/src/gui/text/qtextlayout.h
-+++ b/src/gui/text/qtextlayout.h
-@@ -194,6 +194,9 @@ private:
-                                QRectF *brect, int tabstops, int* tabarray, int tabarraylen,
-                                QPainter *painter);
-     QTextEngine *d;
-+
-+    // Patch: Give access to the internal api.
-+    friend class TextBlock;
- };
- 
- 
-diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
-index 360f9722c7..f28f289ef6 100644
---- a/src/network/access/qhttpnetworkconnection.cpp
-+++ b/src/network/access/qhttpnetworkconnection.cpp
-@@ -118,6 +118,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
- {
-     for (int i = 0; i < channelCount; ++i) {
-         if (channels[i].socket) {
-+            // Patch: backport critical bugfix from '4f959b6b30' commit.
-+            QObject::disconnect(channels[i].socket, Q_NULLPTR, &channels[i], Q_NULLPTR);
-             channels[i].socket->close();
-             delete channels[i].socket;
-         }
-diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-index ca7afb7d1b..25ae50008d 100644
---- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-@@ -256,6 +256,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
- 
-     fd->foundryName = QStringLiteral("CoreText");
-     fd->familyName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontFamilyNameAttribute);
-+
-+    // Patch: Fix open sans semibold loading.
-+    QCFString _displayName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontDisplayNameAttribute);
-+    if (_displayName == QStringLiteral("Open Sans Semibold")) {
-+        fd->familyName = _displayName;
-+    }
-+
-     fd->styleName = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
-     fd->weight = QFont::Normal;
-     fd->style = QFont::StyleNormal;
-diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 6e2c8a2a9a..3cace8abcb 100644
---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-@@ -717,7 +717,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t, QPainterPath *, glyph_metric
- 
- QFixed QCoreTextFontEngine::emSquareSize() const
- {
--    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
-+    // Patch: Fix build for Xcode 9.3.1.
-+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
- }
- 
- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
-diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-index 92358ecc74..694fee7350 100644
---- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-@@ -213,7 +213,8 @@ static void cleanupCocoaApplicationDelegate()
-     if (reflectionDelegate) {
-         if ([reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)])
-             return [reflectionDelegate applicationShouldTerminate:sender];
--        return NSTerminateNow;
-+        // Patch: Don't terminate if reflectionDelegate does not respond to that selector, just use the default.
-+        //return NSTerminateNow;
-     }
- 
-     if ([self canQuit]) {
-@@ -289,6 +290,11 @@ static void cleanupCocoaApplicationDelegate()
- 
- - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
- {
-+    // Patch: We need to receive this notification in the delegate as well.
-+    if (reflectionDelegate
-+        && [reflectionDelegate respondsToSelector:@selector(applicationDidFinishLaunching:)])
-+        [reflectionDelegate applicationDidFinishLaunching:aNotification];
-+
-     Q_UNUSED(aNotification);
-     inLaunch = false;
-     // qt_release_apple_event_handler();
-@@ -411,7 +417,9 @@ static void cleanupCocoaApplicationDelegate()
- {
-     Q_UNUSED(replyEvent);
-     NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
--    QWindowSystemInterface::handleFileOpenEvent(QUrl(QCFString::toQString(urlString)));
-+
-+    // Patch: Fix opening of an external url by a protocol handler.
-+    QWindowSystemInterface::handleFileOpenEvent(QUrl::fromNSURL([NSURL URLWithString:urlString]));
- }
- 
- - (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
-diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
-index b81b9a0b1c..4e59e833b1 100644
---- a/src/plugins/platforms/cocoa/qcocoacursor.mm
-+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
-@@ -81,7 +81,7 @@ void QCocoaCursor::setPos(const QPoint &position)
-     pos.x = position.x();
-     pos.y = position.y();
- 
--    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
-+    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
-     CGEventPost(kCGHIDEventTap, e);
-     CFRelease(e);
- }
-diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-index 9850f83dea..b2e1d3dfda 100644
---- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
-+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-@@ -649,9 +649,10 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
-     // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
-     OSStatus err = noErr;
- 
--    require_action(inContext != NULL, InvalidContext, err = paramErr);
--    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
--    require_action(inImage != NULL, InvalidImage, err = paramErr);
-+    // Patch: Fix build on latest Xcode.
-+    //require_action(inContext != NULL, InvalidContext, err = paramErr);
-+    //require_action(inBounds != NULL, InvalidBounds, err = paramErr);
-+    //require_action(inImage != NULL, InvalidImage, err = paramErr);
- 
-     CGContextSaveGState( inContext );
-     CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
-@@ -660,9 +661,11 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
-     CGContextDrawImage(inContext, *inBounds, inImage);
- 
-     CGContextRestoreGState(inContext);
--InvalidImage:
--InvalidBounds:
--InvalidContext:
-+
-+// Patch: Fix build on latest Xcode.
-+//InvalidImage:
-+//InvalidBounds:
-+//InvalidContext:
-         return err;
- }
- 
-diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-index 9fd05a65ee..dea60720e7 100644
---- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-@@ -402,14 +402,24 @@ void QCocoaIntegration::updateScreens()
-         }
-         siblings << screen;
-     }
-+
-+    // Patch: Backport crash fix from Qt 5.6.1.
-+    // Set virtual siblings list. All screens in mScreens are siblings, because we ignored the
-+    // mirrors. Note that some of the screens we update the siblings list for here may be deleted
-+    // below, but update anyway to keep the to-be-deleted screens out of the siblings list.
-+    foreach (QCocoaScreen* screen, mScreens)
-+        screen->setVirtualSiblings(siblings);
-+
-     // Now the leftovers in remainingScreens are no longer current, so we can delete them.
-     foreach (QCocoaScreen* screen, remainingScreens) {
-         mScreens.removeOne(screen);
-         delete screen;
-     }
-+
-+    // Patch: Backport crash fix from Qt 5.6.1.
-     // All screens in mScreens are siblings, because we ignored the mirrors.
--    foreach (QCocoaScreen* screen, mScreens)
--        screen->setVirtualSiblings(siblings);
-+    //foreach (QCocoaScreen* screen, mScreens)
-+    //    screen->setVirtualSiblings(siblings);
- }
- 
- QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
-diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-index e46eaff6be..c62db534a2 100644
---- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-@@ -382,6 +382,12 @@ bool QCocoaKeyMapper::updateKeyboard()
-         keyboardInputLocale = QLocale::c();
-         keyboardInputDirection = Qt::LeftToRight;
-     }
-+
-+    // Patch: Backport a fix for layout-independent keyboard shortcuts.
-+    const auto newMode = keyboard_mode;
-+    deleteLayouts();
-+    keyboard_mode = newMode;
-+
-     return true;
- }
- 
-@@ -464,7 +470,8 @@ QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const
-         Qt::KeyboardModifiers neededMods = ModsTbl[i];
-         int key = kbItem->qtKey[i];
-         if (key && key != baseKey && ((keyMods & neededMods) == neededMods)) {
--            ret << int(key + (keyMods & ~neededMods));
-+            // Patch: Backport a fix for layout-independent keyboard shortcuts.
-+            ret << int(key + neededMods);
-         }
-     }
-     return ret;
-diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-index 83c960d931..03ae9696af 100755
---- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-@@ -102,7 +102,10 @@ QT_USE_NAMESPACE
-     QCocoaSystemTrayIcon *systray;
-     NSStatusItem *item;
-     QCocoaMenu *menu;
--    bool menuVisible;
-+
-+    // Patch: Nice macOS tray icon support.
-+    bool menuVisible, iconSelected;
-+
-     QIcon icon;
-     QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
- }
-@@ -124,6 +127,10 @@ QT_USE_NAMESPACE
-     QT_MANGLE_NAMESPACE(QNSStatusItem) *parent;
- }
- -(id)initWithParent:(QT_MANGLE_NAMESPACE(QNSStatusItem)*)myParent;
-+
-+// Patch: Nice macOS tray icon support.
-+-(void)updateIconSelection;
-+
- -(void)menuTrackingDone:(NSNotification*)notification;
- -(void)mousePressed:(NSEvent *)mouseEvent button:(Qt::MouseButton)mouseButton;
- @end
-@@ -187,6 +194,19 @@ void QCocoaSystemTrayIcon::cleanup()
-     m_sys = 0;
- }
- 
-+// Patch: Nice macOS tray icon support.
-+namespace {
-+
-+qreal getDevicePixelRatio() {
-+    qreal result = 1.0;
-+    foreach (QScreen *screen, QGuiApplication::screens()) {
-+        result = qMax(result, screen->devicePixelRatio());
-+    }
-+    return result;
-+}
-+
-+} // namespace
-+
- void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
- {
-     if (!m_sys)
-@@ -194,13 +214,18 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
- 
-     m_sys->item->icon = icon;
- 
--    const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
-+    // Patch: Nice macOS tray icon support.
-+    //const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
- 
--    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
--    const short scale = hgt - 4;
-+    const int padding = 0;
-+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
-+    const int maxImageHeight = menuHeight - padding;
-+
-+    const short scale = maxImageHeight * getDevicePixelRatio();
- 
-     QPixmap pm = m_sys->item->icon.pixmap(QSize(scale, scale),
--                                          menuVisible ? QIcon::Selected : QIcon::Normal);
-+                                          // Patch: Nice macOS tray icon support.
-+                                          m_sys->item->iconSelected ? QIcon::Selected : QIcon::Normal);
-     if (pm.isNull()) {
-         pm = QPixmap(scale, scale);
-         pm.fill(Qt::transparent);
-@@ -322,15 +347,16 @@ QT_END_NAMESPACE
-     return self;
- }
- 
---(void)menuTrackingDone:(NSNotification*)notification
-+// Patch: Nice macOS tray icon support.
-+-(void)updateIconSelection
- {
--    Q_UNUSED(notification);
--    down = NO;
-+    const int padding = 0;
-+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
-+    const int maxImageHeight = menuHeight - padding;
- 
--    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
--    const short scale = hgt - 4;
--
--    QPixmap pm = parent->icon.pixmap(QSize(scale, scale), QIcon::Normal);
-+    const short scale = maxImageHeight * getDevicePixelRatio();
-+    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
-+    parent->iconSelected ? QIcon::Selected : QIcon::Normal);
-     if (pm.isNull()) {
-         pm = QPixmap(scale, scale);
-         pm.fill(Qt::transparent);
-@@ -338,9 +364,19 @@ QT_END_NAMESPACE
-     NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
-     [self setImage: nsaltimage];
-     [nsaltimage release];
-+}
-+
-+-(void)menuTrackingDone:(NSNotification*)notification
-+{
-+    Q_UNUSED(notification);
-+    down = NO;
- 
-     parent->menuVisible = false;
- 
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
-+
-     [self setNeedsDisplay:YES];
- }
- 
-@@ -350,18 +386,9 @@ QT_END_NAMESPACE
-     int clickCount = [mouseEvent clickCount];
-     [self setNeedsDisplay:YES];
- 
--    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
--    const short scale = hgt - 4;
--
--    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
--                                     parent->menuVisible ? QIcon::Selected : QIcon::Normal);
--    if (pm.isNull()) {
--        pm = QPixmap(scale, scale);
--        pm.fill(Qt::transparent);
--    }
--    NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
--    [self setImage: nsaltimage];
--    [nsaltimage release];
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = (clickCount != 2) && parent->menu;
-+    [self updateIconSelection];
- 
-     if (clickCount == 2) {
-         [self menuTrackingDone:nil];
-@@ -380,6 +407,10 @@ QT_END_NAMESPACE
- {
-     Q_UNUSED(mouseEvent);
-     [self menuTrackingDone:nil];
-+
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
- }
- 
- - (void)rightMouseDown:(NSEvent *)mouseEvent
-@@ -391,6 +422,10 @@ QT_END_NAMESPACE
- {
-     Q_UNUSED(mouseEvent);
-     [self menuTrackingDone:nil];
-+
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
- }
- 
- - (void)otherMouseDown:(NSEvent *)mouseEvent
-@@ -405,7 +440,8 @@ QT_END_NAMESPACE
- }
- 
- -(void)drawRect:(NSRect)rect {
--    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:down];
-+    // Patch: Nice macOS tray icon support.
-+    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:parent->menu ? down : NO];
-     [super drawRect:rect];
- }
- @end
-diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
-index 4d0458a4aa..3357a5ef81 100644
---- a/src/plugins/platforms/cocoa/qcocoawindow.mm
-+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
-@@ -167,7 +167,8 @@ static bool isMouseEvent(NSEvent *ev)
-     if (!self.window.delegate)
-         return; // Already detached, pending NSAppKitDefined event
- 
--    if (pw && pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
-+    // Patch: Fix events loss if the window was minimized or hidden.
-+    if (pw && pw->frameStrutEventsEnabled() && pw->m_synchedWindowState != Qt::WindowMinimized && pw->m_isExposed && isMouseEvent(theEvent)) {
-         NSPoint loc = [theEvent locationInWindow];
-         NSRect windowFrame = [self.window legacyConvertRectFromScreen:[self.window frame]];
-         NSRect contentFrame = [[self.window contentView] frame];
-@@ -795,6 +796,16 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
- {
-     Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask));
-     NSInteger styleMask = NSBorderlessWindowMask;
-+
-+    // Patch: allow creating panels floating on all spaces in macOS.
-+    // If you call "setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary" before
-+    // setting the "NSNonactivatingPanelMask" bit in the style mask it won't work after that.
-+    // So we need a way to set that bit before Qt sets collection behavior the way it does.
-+    QVariant nonactivatingPanelMask = window()->property("_td_macNonactivatingPanelMask");
-+    if (nonactivatingPanelMask.isValid() && nonactivatingPanelMask.toBool()) {
-+        styleMask |= NSNonactivatingPanelMask;
-+    }
-+
-     if (flags & Qt::FramelessWindowHint)
-         return styleMask;
-     if ((type & Qt::Popup) == Qt::Popup) {
-@@ -914,6 +925,19 @@ void QCocoaWindow::setWindowFilePath(const QString &filePath)
-     [m_nsWindow setRepresentedFilename: fi.exists() ? QCFString::toNSString(filePath) : @""];
- }
- 
-+// Patch: Nice macOS window icon.
-+namespace {
-+
-+qreal getDevicePixelRatio() {
-+	qreal result = 1.0;
-+	foreach (QScreen *screen, QGuiApplication::screens()) {
-+		result = qMax(result, screen->devicePixelRatio());
-+	}
-+	return result;
-+}
-+
-+} // namespace
-+
- void QCocoaWindow::setWindowIcon(const QIcon &icon)
- {
-     QCocoaAutoReleasePool pool;
-@@ -929,7 +953,10 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
-     if (icon.isNull()) {
-         [iconButton setImage:nil];
-     } else {
--        QPixmap pixmap = icon.pixmap(QSize(22, 22));
-+        // Patch: Nice macOS window icon.
-+        CGFloat hgt = 16. * getDevicePixelRatio();
-+        QPixmap pixmap = icon.pixmap(QSize(hgt, hgt));
-+
-         NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap));
-         [iconButton setImage:image];
-         [image release];
-diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
-index a18ee7ff71..1f91feb0ae 100644
---- a/src/plugins/platforms/cocoa/qnsview.mm
-+++ b/src/plugins/platforms/cocoa/qnsview.mm
-@@ -393,7 +393,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
-         [self notifyWindowStateChanged:newState];
-         // NSWindowDidOrderOnScreenAndFinishAnimatingNotification is private API, and not
-         // emitted in 10.6, so we bring back the old behavior for that case alone.
--        if (newState == Qt::WindowNoState && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6)
-+
-+        // Patch: Fix macOS window show after window was hidden.
-+        if (newState == Qt::WindowNoState/* && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6*/)
-             m_platformWindow->exposeWindow();
-     } else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) {
-         m_platformWindow->obscureWindow();
-@@ -1300,7 +1302,9 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-         if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
-             // On 10.8 and above, MayBegin is likely to happen.  We treat it the same as an actual begin.
--            if (phase == NSEventPhaseMayBegin)
-+
-+            // Patch: Actual begin should be treated as begin as well.
-+            if (phase == NSEventPhaseMayBegin || phase == NSEventPhaseBegan)
-                 ph = Qt::ScrollBegin;
-         } else
- #endif
-@@ -1366,14 +1370,22 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
-     quint32 nativeVirtualKey = [nsevent keyCode];
- 
-     QChar ch = QChar::ReplacementCharacter;
--    int keyCode = Qt::Key_unknown;
--    if ([characters length] != 0) {
--        if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
--            ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
--        else
--            ch = QChar([characters characterAtIndex:0]);
--        keyCode = [self convertKeyCode:ch];
--    }
-+
-+    // Patch: Backport a fix for layout-independent shortcuts.
-+    if ([characters length] != 0) // https://bugreports.qt.io/browse/QTBUG-42584
-+        ch = QChar([characters characterAtIndex:0]);
-+    else if ([charactersIgnoringModifiers length] != 0 && ((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)))
-+        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
-+
-+    int keyCode = [self convertKeyCode:ch];
-+    //int keyCode = Qt::Key_unknown;
-+    //if ([characters length] != 0) {
-+    //    if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
-+    //        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
-+    //    else
-+    //        ch = QChar([characters characterAtIndex:0]);
-+    //    keyCode = [self convertKeyCode:ch];
-+    //}
- 
-     // we will send a key event unless the input method sets m_sendKeyEvent to false
-     m_sendKeyEvent = true;
-@@ -1437,6 +1449,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
-                 && qtKey == Qt::Key_Period) {
-             [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
-             return YES;
-+
-+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
-+        } else if ([nsevent modifierFlags] & NSControlKeyMask && (qtKey == Qt::Key_Tab || qtKey == Qt::Key_Backtab)) {
-+            [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
-+            return YES;
-         }
-     }
-     return [super performKeyEquivalent:nsevent];
-diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
-index c68076477f..e2a7aafa58 100644
---- a/src/tools/qlalr/lalr.cpp
-+++ b/src/tools/qlalr/lalr.cpp
-@@ -246,11 +246,13 @@ void Grammar::buildExtendedGrammar ()
-   non_terminals.insert (accept_symbol);
- }
- 
--struct _Nullable: public std::unary_function<Name, bool>
-+// Patch: Fix building with the new SDK.
-+struct __Nullable: public std::unary_function<Name, bool>
- {
-   Automaton *_M_automaton;
- 
--  _Nullable (Automaton *aut):
-+  // Patch: Fix building with the new SDK.
-+  __Nullable (Automaton *aut):
-     _M_automaton (aut) {}
- 
-   bool operator () (Name name) const
-@@ -308,7 +310,8 @@ void Automaton::buildNullables ()
- 
-       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
-         {
--          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
-+          // Patch: Fix building with the new SDK.
-+          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (__Nullable (this)));
- 
-           if (nn == rule->rhs.end ())
-             changed |= nullables.insert (rule->lhs).second;
-@@ -643,7 +646,8 @@ void Automaton::buildIncludesDigraph ()
-                   if (! _M_grammar->isNonTerminal (*A))
-                     continue;
- 
--                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
-+                  // Patch: Fix building with the new SDK.
-+                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (__Nullable (this)));
-                   if (first_not_nullable != rule->rhs.end ())
-                     continue;
- 
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 7396808442..7178aecf80 100644
---- a/src/widgets/kernel/qwidget.cpp
-+++ b/src/widgets/kernel/qwidget.cpp
-@@ -4722,6 +4722,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-         return; // Fully transparent.
- 
-     Q_D(QWidget);
-+
-+    // Patch: save and restore dirtyOpaqueChildren field.
-+    //
-+    // Just like in QWidget::grab() this field should be restored
-+    // after the d->render() call, because it will be set to 1 and
-+    // opaqueChildren field will be filled with empty region in
-+    // case the widget is hidden (because all the opaque children
-+    // will be skipped in isVisible() check).
-+    //
-+    const bool oldDirtyOpaqueChildren = d->dirtyOpaqueChildren;
-+
-     const bool inRenderWithPainter = d->extra && d->extra->inRenderWithPainter;
-     const QRegion toBePainted = !inRenderWithPainter ? d->prepareToRender(sourceRegion, renderFlags)
-                                                      : sourceRegion;
-@@ -4743,6 +4754,10 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-     if (!inRenderWithPainter && (opacity < 1.0 || (target->devType() == QInternal::Printer))) {
-         d->render_helper(painter, targetOffset, toBePainted, renderFlags);
-         d->extra->inRenderWithPainter = inRenderWithPainter;
-+
-+        // Patch: save and restore dirtyOpaqueChildren field.
-+        d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
-+
-         return;
-     }
- 
-@@ -4774,6 +4789,9 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-     d->setSharedPainter(oldPainter);
- 
-     d->extra->inRenderWithPainter = inRenderWithPainter;
-+
-+    // Patch: save and restore dirtyOpaqueChildren field.
-+    d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
- }
- 
- static void sendResizeEvents(QWidget *target)
-@@ -7983,7 +8001,8 @@ bool QWidget::event(QEvent *event)
-     case QEvent::KeyPress: {
-         QKeyEvent *k = (QKeyEvent *)event;
-         bool res = false;
--        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) {  //### Add MetaModifier?
-+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
-+        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier))) {  //### Add MetaModifier?
-             if (k->key() == Qt::Key_Backtab
-                 || (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
-                 res = focusNextPrevChild(false);
-diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
-index 0845a5eb02..5735cb6b39 100644
---- a/src/widgets/styles/qmacstyle_mac.mm
-+++ b/src/widgets/styles/qmacstyle_mac.mm
-@@ -3667,9 +3667,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
- 
-                 NSBezierPath *pushButtonFocusRingPath;
-                 if (bdi.kind == kThemeBevelButton)
--                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
-+                    // Patch: Fix building with the new SDK.
-+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
-                 else
--                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
-+                    // Patch: Fix building with the new SDK.
-+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
-                 qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
-             }
- 
-diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
-index f98aeaf678..00c0734129 100644
---- a/src/widgets/util/qsystemtrayicon_qpa.cpp
-+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
-@@ -99,13 +99,18 @@ void QSystemTrayIconPrivate::updateIcon_sys()
- 
- void QSystemTrayIconPrivate::updateMenu_sys()
- {
--    if (qpa_sys && menu) {
--        if (!menu->platformMenu()) {
--            QPlatformMenu *platformMenu = qpa_sys->createMenu();
--            if (platformMenu)
--                menu->setPlatformMenu(platformMenu);
-+    // Patch: Nice macOS tray icon support.
-+    if (qpa_sys) {
-+        if (menu) {
-+            if (!menu->platformMenu()) {
-+                QPlatformMenu *platformMenu = qpa_sys->createMenu();
-+                if (platformMenu)
-+                    menu->setPlatformMenu(platformMenu);
-+            }
-+            qpa_sys->updateMenu(menu->platformMenu());
-+        } else {
-+            qpa_sys->updateMenu(0);
-         }
--        qpa_sys->updateMenu(menu->platformMenu());
-     }
- }
- 
-diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
-index 75f30599be..980f2be1e9 100644
---- a/src/widgets/widgets/qwidgetlinecontrol.cpp
-+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
-@@ -1867,7 +1867,8 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
- 
-     if (unknown && !isReadOnly()) {
-         QString t = event->text();
--        if (!t.isEmpty() && t.at(0).isPrint()) {
-+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
-+        if (!t.isEmpty() && (t.at(0).isPrint() || t.at(0).unicode() == 0x200C || t.at(0).unicode() == 0x200D)) {
-             insert(t);
- #ifndef QT_NO_COMPLETER
-             complete(event->key());
-diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
-index 96438a0bdf..b0b7206405 100644
---- a/src/widgets/widgets/qwidgettextcontrol.cpp
-+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
-@@ -1342,7 +1342,8 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e)
- process:
-     {
-         QString text = e->text();
--        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
-+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
-+        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t') || text.at(0).unicode() == 0x200C || text.at(0).unicode() == 0x200D)) {
-             if (overwriteMode
-                 // no need to call deleteChar() if we have a selection, insertText
-                 // does it already

Telegram/Patches/macold/qtimageformats_5_3_2.diff

@@ -1,47 +0,0 @@
-diff --git a/src/3rdparty/libwebp/src/dec/vp8l.c b/src/3rdparty/libwebp/src/dec/vp8l.c
-index ea0254d..953ff01 100644
---- a/src/3rdparty/libwebp/src/dec/vp8l.c
-+++ b/src/3rdparty/libwebp/src/dec/vp8l.c
-@@ -12,7 +12,7 @@
- // Authors: Vikas Arora (vikaas.arora@gmail.com)
- //          Jyrki Alakuijala (jyrki@google.com)
- 
--#include <stdio.h>
-+// Patch: Backport of a crash fix.
- #include <stdlib.h>
- #include "./alphai.h"
- #include "./vp8li.h"
-@@ -740,6 +740,10 @@ static int DecodeAlphaData(VP8LDecoder* const dec, uint8_t* const data,
-   const int len_code_limit = NUM_LITERAL_CODES + NUM_LENGTH_CODES;
-   const int mask = hdr->huffman_mask_;
-   assert(htree_group != NULL);
-+
-+  // Patch: Backport of a crash fix.
-+  assert(pos < end);
-+
-   assert(last_row <= height);
-   assert(Is8bOptimizable(hdr));
- 
-@@ -830,6 +834,10 @@ static int DecodeImageData(VP8LDecoder* const dec, uint32_t* const data,
-       (hdr->color_cache_size_ > 0) ? &hdr->color_cache_ : NULL;
-   const int mask = hdr->huffman_mask_;
-   assert(htree_group != NULL);
-+
-+  // Patch: Backport of a crash fix.
-+  assert(src < src_end);
-+
-   assert(src_last <= src_end);
- 
-   while (!br->eos_ && src < src_last) {
-@@ -1294,6 +1302,11 @@ int VP8LDecodeAlphaImageStream(ALPHDecoder* const alph_dec, int last_row) {
-   assert(dec->action_ == READ_DATA);
-   assert(last_row <= dec->height_);
- 
-+  // Patch: Backport of a crash fix.
-+  if (dec->last_pixel_ == dec->width_ * dec->height_) {
-+    return 1; // done
-+  }
-+
-   // Decode (with special row processing).
-   return alph_dec->use_8b_decode ?
-       DecodeAlphaData(dec, (uint8_t*)dec->pixels_, dec->width_, dec->height_,

Telegram/Patches/mini_chromium.diff

@@ -1,52 +0,0 @@
-diff --git a/base/mac/scoped_nsobject.h b/base/mac/scoped_nsobject.h
-index 2e157a4..5a306a1 100644
---- a/base/mac/scoped_nsobject.h
-+++ b/base/mac/scoped_nsobject.h
-@@ -11,6 +11,7 @@
- 
- #include "base/compiler_specific.h"
- #include "base/mac/scoped_typeref.h"
-+#include "base/template_util.h"
- 
- namespace base {
- 
-@@ -55,7 +56,7 @@ class scoped_nsobject : public scoped_nsprotocol<NST*> {
-  public:
-   using scoped_nsprotocol<NST*>::scoped_nsprotocol;
- 
--  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
-+  static_assert(is_same<NST, NSAutoreleasePool>::value == false,
-                 "Use ScopedNSAutoreleasePool instead");
- };
- 
-diff --git a/base/macros.h b/base/macros.h
-index 5d96783..096704c 100644
---- a/base/macros.h
-+++ b/base/macros.h
-@@ -42,8 +42,9 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
- 
- template <typename Dest, typename Source>
- inline Dest bit_cast(const Source& source) {
-+#if __cplusplus >= 201103L
-   static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal");
--
-+#endif
-   Dest dest;
-   memcpy(&dest, &source, sizeof(dest));
-   return dest;
-diff --git a/build/common.gypi b/build/common.gypi
-index 1affc70..6e8f292 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -66,6 +66,11 @@
-           'conditions': [
-             ['clang!=0', {
-               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
-+              'conditions': [
-+                ['mac_deployment_target=="10.8"', {
-+                  'CLANG_CXX_LIBRARY': 'libc++',  # force -stdlib=libc++ for 10.8
-+                }]
-+              ],
- 
-               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
-               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime

Telegram/Patches/openal.diff

@@ -1,22 +0,0 @@
-diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
-index 9d8f8e9..8c8e44a 100644
---- a/Alc/backends/winmm.c
-+++ b/Alc/backends/winmm.c
-@@ -219,7 +219,7 @@ FORCE_ALIGN static int ALCwinmmPlayback_mixerProc(void *arg)
-     SetRTPriority();
-     althrd_setname(althrd_current(), MIXER_THREAD_NAME);
- 
--    while(GetMessage(&msg, NULL, 0, 0))
-+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
-     {
-         if(msg.message != WOM_DONE)
-             continue;
-@@ -504,7 +504,7 @@ static int ALCwinmmCapture_captureProc(void *arg)
- 
-     althrd_setname(althrd_current(), RECORD_THREAD_NAME);
- 
--    while(GetMessage(&msg, NULL, 0, 0))
-+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
-     {
-         if(msg.message != WIM_DATA)
-             continue;

Telegram/Resources/langs/lang.strings

@@ -862,6 +862,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_photos_header" = "Photos";
+"lng_profile_gifs#one" = "{count} GIF";
+"lng_profile_gifs#other" = "{count} GIFs";
+"lng_profile_gifs_header" = "GIFs";
 "lng_profile_videos#one" = "{count} video";
 "lng_profile_videos#other" = "{count} videos";
 "lng_profile_videos_header" = "Videos";
@@ -904,6 +907,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_add_as_contact" = "Add to contacts";
 "lng_profile_shared_media" = "Shared media";
 "lng_media_type_photos" = "Photos";
+"lng_media_type_gifs" = "GIFs";
 "lng_media_type_videos" = "Videos";
 "lng_media_type_songs" = "Audio files";
 "lng_media_type_files" = "Files";
@@ -923,6 +927,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_export_channel" = "Export channel history";
 "lng_media_selected_photo#one" = "{count} Photo";
 "lng_media_selected_photo#other" = "{count} Photos";
+"lng_media_selected_gif#one" = "{count} GIF";
+"lng_media_selected_gif#other" = "{count} GIFs";
 "lng_media_selected_video#one" = "{count} Video";
 "lng_media_selected_video#other" = "{count} Videos";
 "lng_media_selected_song#one" = "{count} Audio file";
@@ -936,6 +942,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_selected_link#one" = "{count} Shared link";
 "lng_media_selected_link#other" = "{count} Shared links";
 "lng_media_photo_empty" = "No photos here yet";
+"lng_media_gif_empty" = "No GIFs here yet";
 "lng_media_video_empty" = "No videos here yet";
 "lng_media_song_empty" = "No music files here yet";
 "lng_media_file_empty" = "No files here yet";
@@ -1494,6 +1501,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_saved_forward_here" = "Forward messages here for quick access";
 
 "lng_scheduled_messages" = "Scheduled Messages";
+"lng_scheduled_messages_empty" = "No scheduled messages here yet...";
 "lng_reminder_messages" = "Reminders";
 "lng_scheduled_date" = "Scheduled for {date}";
 "lng_scheduled_date_until_online" = "Scheduled until online";
@@ -2021,6 +2029,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_screen_share_start" = "Share Screen";
 "lng_group_call_screen_share_stop" = "Stop Sharing";
 "lng_group_call_screen_title" = "Screen {index}";
+"lng_group_call_screen_share_audio" = "Share System Audio";
 "lng_group_call_unmute_small" = "Unmute";
 "lng_group_call_more" = "More";
 "lng_group_call_unmute" = "Unmute";

Telegram/Resources/qrc/telegram/telegram.qrc

@@ -42,7 +42,7 @@
     <file alias="js/script.js">../../export_html/js/script.js</file>
   </qresource>
   <qresource prefix="/gui">
-    <file alias="art/bg.jpg">../../art/bg.jpg</file>
+    <file alias="art/background.jpg">../../art/background.jpg</file>
     <file alias="art/bg_initial.jpg">../../art/bg_initial.jpg</file>
     <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>

Telegram/Resources/tl/api.tl

@@ -376,6 +376,7 @@ updateChatParticipant#f3b3781f flags:# chat_id:int date:int actor_id:int user_id
 updateChannelParticipant#7fecb1ec flags:# channel_id:int date:int actor_id:int user_id:int prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
 updateBotStopped#7f9488a user_id:int date:int stopped:Bool qts:int = Update;
 updateGroupCallConnection#b783982 flags:# presentation:flags.0?true params:DataJSON = Update;
+updateBotCommands#cf7e0873 peer:Peer bot_id:int commands:Vector<BotCommand> = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -534,7 +535,7 @@ authorization#ad01d61d flags:# current:flags.0?true official_app:flags.1?true pa
 
 account.authorizations#1250abde authorizations:Vector<Authorization> = account.Authorizations;
 
-account.password#ad2641f8 flags:# has_recovery:flags.0?true has_secure_values:flags.1?true has_password:flags.2?true current_algo:flags.2?PasswordKdfAlgo srp_B:flags.2?bytes srp_id:flags.2?long hint:flags.3?string email_unconfirmed_pattern:flags.4?string new_algo:PasswordKdfAlgo new_secure_algo:SecurePasswordKdfAlgo secure_random:bytes = account.Password;
+account.password#185b184f flags:# has_recovery:flags.0?true has_secure_values:flags.1?true has_password:flags.2?true current_algo:flags.2?PasswordKdfAlgo srp_B:flags.2?bytes srp_id:flags.2?long hint:flags.3?string email_unconfirmed_pattern:flags.4?string new_algo:PasswordKdfAlgo new_secure_algo:SecurePasswordKdfAlgo secure_random:bytes pending_reset_date:flags.5?int = account.Password;
 
 account.passwordSettings#9a5c33e5 flags:# email:flags.0?string secure_settings:flags.1?SecureSecretSettings = account.PasswordSettings;
 
@@ -1205,7 +1206,7 @@ peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
 
 groupCallDiscarded#7780bcb4 id:long access_hash:long duration:int = GroupCall;
-groupCall#653dbaad flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int version:int = GroupCall;
+groupCall#d597650c flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int unmuted_video_count:flags.10?int unmuted_video_limit:int version:int = GroupCall;
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
@@ -1248,7 +1249,7 @@ phone.exportedGroupCallInvite#204bd158 link:string = phone.ExportedGroupCallInvi
 
 groupCallParticipantVideoSourceGroup#dcb118b7 semantics:string sources:Vector<int> = GroupCallParticipantVideoSourceGroup;
 
-groupCallParticipantVideo#78e41663 flags:# paused:flags.0?true endpoint:string source_groups:Vector<GroupCallParticipantVideoSourceGroup> = GroupCallParticipantVideo;
+groupCallParticipantVideo#67753ac8 flags:# paused:flags.0?true endpoint:string source_groups:Vector<GroupCallParticipantVideoSourceGroup> audio_source:flags.1?int = GroupCallParticipantVideo;
 
 stickers.suggestedShortName#85fea03f short_name:string = stickers.SuggestedShortName;
 
@@ -1260,6 +1261,10 @@ botCommandScopePeer#db9d897d peer:InputPeer = BotCommandScope;
 botCommandScopePeerAdmins#3fd863d1 peer:InputPeer = BotCommandScope;
 botCommandScopePeerUser#a1321f3 peer:InputPeer user_id:InputUser = BotCommandScope;
 
+account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordResult;
+account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
+account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1281,13 +1286,14 @@ auth.bindTempAuthKey#cdd42a05 perm_auth_key_id:long nonce:long expires_at:int en
 auth.importBotAuthorization#67a3ff2c flags:int api_id:int api_hash:string bot_auth_token:string = auth.Authorization;
 auth.checkPassword#d18b4d16 password:InputCheckPasswordSRP = auth.Authorization;
 auth.requestPasswordRecovery#d897bc66 = auth.PasswordRecovery;
-auth.recoverPassword#4ea56e92 code:string = auth.Authorization;
+auth.recoverPassword#37096c70 flags:# code:string new_settings:flags.0?account.PasswordInputSettings = auth.Authorization;
 auth.resendCode#3ef1a9bf phone_number:string phone_code_hash:string = auth.SentCode;
 auth.cancelCode#1f040578 phone_number:string phone_code_hash:string = Bool;
 auth.dropTempAuthKeys#8e48a188 except_auth_keys:Vector<long> = Bool;
 auth.exportLoginToken#b1b41517 api_id:int api_hash:string except_ids:Vector<int> = auth.LoginToken;
 auth.importLoginToken#95ac5ce4 token:bytes = auth.LoginToken;
 auth.acceptLoginToken#e894ad4d token:bytes = Authorization;
+auth.checkRecoveryPassword#d36bf79 code:string = Bool;
 
 account.registerDevice#68976c6f flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector<int> = Bool;
 account.unregisterDevice#3076c4bf token_type:int token:string other_uids:Vector<int> = Bool;
@@ -1357,6 +1363,8 @@ account.getMultiWallPapers#65ad71dc wallpapers:Vector<InputWallPaper> = Vector<W
 account.getGlobalPrivacySettings#eb2b4cf6 = GlobalPrivacySettings;
 account.setGlobalPrivacySettings#1edaaac2 settings:GlobalPrivacySettings = GlobalPrivacySettings;
 account.reportProfilePhoto#fa8cc6f5 peer:InputPeer photo_id:InputPhoto reason:ReportReason message:string = Bool;
+account.resetPassword#9308ce1b = account.ResetPasswordResult;
+account.declinePasswordReset#4c9409f6 = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#ca30a5b1 id:InputUser = UserFull;
@@ -1670,4 +1678,4 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel
 stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 
-// LAYER 130
+// LAYER 131

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.8.6.0" />
+    Version="2.8.12.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,6,0
- PRODUCTVERSION 2,8,6,0
+ FILEVERSION 2,8,12,0
+ PRODUCTVERSION 2,8,12,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.8.6.0"
+            VALUE "FileVersion", "2.8.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2021"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.6.0"
+            VALUE "ProductVersion", "2.8.12.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,6,0
- PRODUCTVERSION 2,8,6,0
+ FILEVERSION 2,8,12,0
+ PRODUCTVERSION 2,8,12,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.8.6.0"
+            VALUE "FileVersion", "2.8.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2021"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.6.0"
+            VALUE "ProductVersion", "2.8.12.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/_other/packer.cpp

@@ -160,8 +160,7 @@ int main(int argc, char *argv[])
 
 	QString remove;
 	int version = 0;
-	bool targetosx = false;
-	bool targetwin64 = false;
+	[[maybe_unused]] bool targetwin64 = false;
 	QFileInfoList files;
 	for (int i = 0; i < argc; ++i) {
 		if (string("-path") == argv[i] && i + 1 < argc) {
@@ -170,7 +169,6 @@ int main(int argc, char *argv[])
 			files.push_back(info);
 			if (remove.isEmpty()) remove = info.canonicalPath() + "/";
 		} else if (string("-target") == argv[i] && i + 1 < argc) {
-			targetosx = (string("osx") == argv[i + 1]);
 			targetwin64 = (string("win64") == argv[i + 1]);
 		} else if (string("-version") == argv[i] && i + 1 < argc) {
 			version = QString(argv[i + 1]).toInt();
@@ -496,7 +494,7 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_WIN
 	QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_MAC
-	QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
+	QString outName(QString("tmacupd%1").arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_UNIX
 #ifndef _LP64
 	QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));

Telegram/SourceFiles/api/api_attached_stickers.cpp

@@ -52,8 +52,10 @@ void AttachedStickers::request(
 		});
 
 		const auto setId = (setData->vid().v && setData->vaccess_hash().v)
-			? MTP_inputStickerSetID(setData->vid(), setData->vaccess_hash())
-			: MTP_inputStickerSetShortName(setData->vshort_name());
+			? StickerSetIdentifier{
+				.id = setData->vid().v,
+				.accessHash = setData->vaccess_hash().v }
+			: StickerSetIdentifier{ .shortName = qs(setData->vshort_name()) };
 		strongController->show(
 			Box<StickerSetBox>(strongController, setId),
 			Ui::LayerOption::KeepOther);

Telegram/SourceFiles/api/api_bot.cpp

@@ -156,7 +156,6 @@ void SendBotCallbackDataWithPassword(
 	const auto session = &history->session();
 	const auto owner = &history->owner();
 	const auto api = &session->api();
-	const auto bot = item->getMessageBot();
 	const auto fullId = item->fullId();
 	const auto getButton = [=] {
 		return HistoryMessageMarkupButton::Get(

Telegram/SourceFiles/api/api_hash.cpp

@@ -40,6 +40,7 @@ namespace {
 int32 CountStickersHash(
 		not_null<Main::Session*> session,
 		bool checkOutdatedInfo) {
+	using Flag = Data::StickersSetFlag;
 	auto result = HashInit();
 	bool foundOutdated = false;
 	const auto &sets = session->data().stickers().sets();
@@ -50,8 +51,8 @@ int32 CountStickersHash(
 			const auto set = it->second.get();
 			if (set->id == Data::Stickers::DefaultSetId) {
 				foundOutdated = true;
-			} else if (!(set->flags & MTPDstickerSet_ClientFlag::f_special)
-				&& !(set->flags & MTPDstickerSet::Flag::f_archived)) {
+			} else if (!(set->flags & Flag::Special)
+				&& !(set->flags & Flag::Archived)) {
 				HashUpdate(result, set->hash);
 			}
 		}
@@ -84,7 +85,7 @@ int32 CountFeaturedStickersHash(not_null<Main::Session*> session) {
 
 		const auto it = sets.find(setId);
 		if (it != sets.cend()
-			&& (it->second->flags & MTPDstickerSet_ClientFlag::f_unread)) {
+			&& (it->second->flags & Data::StickersSetFlag::Unread)) {
 			HashUpdate(result, 1);
 		}
 	}

Telegram/SourceFiles/api/api_media.cpp

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_media.h"
 
 #include "data/data_document.h"
+#include "data/stickers/data_stickers_set.h"
 #include "history/history_item.h"
 
 namespace Api {
@@ -47,7 +48,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 		attributes.push_back(MTP_documentAttributeSticker(
 			MTP_flags(0),
 			MTP_string(document->sticker()->alt),
-			document->sticker()->set,
+			Data::InputStickerSet(document->sticker()->set),
 			MTPMaskCoords()));
 	} else if (const auto song = document->song()) {
 		const auto flags = MTPDdocumentAttributeAudio::Flag::f_title

Telegram/SourceFiles/api/api_updates.cpp

@@ -474,7 +474,6 @@ void Updates::differenceDone(const MTPupdates_Difference &result) {
 		stateDone(d.vstate());
 	} break;
 	case mtpc_updates_differenceTooLong: {
-		auto &d = result.c_updates_differenceTooLong();
 		LOG(("API Error: updates.differenceTooLong is not supported by Telegram Desktop!"));
 	} break;
 	};
@@ -999,8 +998,8 @@ void Updates::handleSendActionUpdate(
 			const auto chat = peer->asChat();
 			const auto channel = peer->asChannel();
 			const auto active = chat
-				? (chat->flags() & MTPDchat::Flag::f_call_active)
-				: (channel->flags() & MTPDchannel::Flag::f_call_active);
+				? (chat->flags() & ChatDataFlag::CallActive)
+				: (channel->flags() & ChannelDataFlag::CallActive);
 			if (active) {
 				_pendingSpeakingCallParticipants.emplace(
 					peer).first->second[fromId] = now;
@@ -1030,9 +1029,6 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 		const auto &d = updates.c_updateShortMessage();
 		const auto flags = mtpCastFlags(d.vflags().v)
 			| MTPDmessage::Flag::f_from_id;
-		const auto peerUserId = d.is_out()
-			? d.vuser_id()
-			: MTP_int(_session->userId().bare); // #TODO ids
 		_session->data().addNewMessage(
 			MTP_message(
 				MTP_flags(flags),
@@ -1250,7 +1246,6 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 
 	case mtpc_updatePinnedMessages: {
 		const auto &d = update.c_updatePinnedMessages();
-		const auto peerId = peerFromMTP(d.vpeer());
 		for (const auto &msgId : d.vmessages().v) {
 			const auto item = session().data().message(0, msgId.v);
 			if (item) {
@@ -1607,7 +1602,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 				history->setUnreadMark(data.is_unread());
 			}
 		}, [&](const MTPDdialogPeerFolder &dialog) {
-			const auto id = dialog.vfolder_id().v; // #TODO archive
+			//const auto id = dialog.vfolder_id().v; // #TODO archive
 			//if (const auto folder = session().data().folderLoaded(id)) {
 			//	folder->setUnreadMark(data.is_unread());
 			//}
@@ -1817,11 +1812,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto &d = update.c_updatePeerSettings();
 		const auto peerId = peerFromMTP(d.vpeer());
 		if (const auto peer = session().data().peerLoaded(peerId)) {
-			const auto settings = d.vsettings().match([](
-					const MTPDpeerSettings &data) {
-				return data.vflags().v;
-			});
-			peer->setSettings(settings);
+			peer->setSettings(d.vsettings());
 		}
 	} break;
 
@@ -1872,19 +1863,15 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;
 
 	case mtpc_updateNewEncryptedMessage: {
-		auto &d = update.c_updateNewEncryptedMessage();
 	} break;
 
 	case mtpc_updateEncryptedChatTyping: {
-		auto &d = update.c_updateEncryptedChatTyping();
 	} break;
 
 	case mtpc_updateEncryption: {
-		auto &d = update.c_updateEncryption();
 	} break;
 
 	case mtpc_updateEncryptedMessagesRead: {
-		auto &d = update.c_updateEncryptedMessagesRead();
 	} break;
 
 	case mtpc_updatePhoneCall:
@@ -1902,6 +1889,26 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	case mtpc_updateBotCommands: {
+		const auto &d = update.c_updateBotCommands();
+		if (const auto peer = session().data().peerLoaded(peerFromMTP(d.vpeer()))) {
+			const auto botId = UserId(d.vbot_id().v);
+			if (const auto user = peer->asUser()) {
+				if (user->isBot() && user->id == peerFromUser(botId)) {
+					if (Data::UpdateBotCommands(user->botInfo->commands, d.vcommands())) {
+						session().data().botCommandsChanged(user);
+					}
+				}
+			} else if (const auto chat = peer->asChat()) {
+				chat->setBotCommands(botId, d.vcommands());
+			} else if (const auto megagroup = peer->asMegagroup()) {
+				if (megagroup->mgInfo->updateBotCommands(botId, d.vcommands())) {
+					session().data().botCommandsChanged(megagroup);
+				}
+			}
+		}
+	} break;
+
 	case mtpc_updateServiceNotification: {
 		const auto &d = update.c_updateServiceNotification();
 		const auto text = TextWithEntities {

Telegram/SourceFiles/apiwrap.cpp

@@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_cloud_themes.h"
 #include "data/data_chat_filters.h"
 #include "data/data_histories.h"
+#include "data/data_wall_paper.h"
 #include "data/stickers/data_stickers.h"
 #include "dialogs/dialogs_key.h"
 #include "core/core_cloud_password.h"
@@ -62,7 +63,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/notifications_manager.h"
 #include "window/window_lock_widgets.h"
 #include "window/window_session_controller.h"
-#include "window/themes/window_theme.h"
 #include "inline_bots/inline_bot_result.h"
 #include "chat_helpers/message_field.h"
 #include "ui/item_text_options.h"
@@ -1224,9 +1224,7 @@ void ApiWrap::requestPeerSettings(not_null<PeerData*> peer) {
 	request(MTPmessages_GetPeerSettings(
 		peer->input
 	)).done([=](const MTPPeerSettings &result) {
-		peer->setSettings(result.match([&](const MTPDpeerSettings &data) {
-			return data.vflags().v;
-		}));
+		peer->setSettings(result);
 		_requestedPeerSettings.erase(peer);
 	}).fail([=](const MTP::Error &error) {
 		_requestedPeerSettings.erase(peer);
@@ -1526,7 +1524,6 @@ void ApiWrap::applyLastParticipantsList(
 		| MegagroupInfo::LastParticipantsOnceReceived;
 
 	auto botStatus = channel->mgInfo->botStatus;
-	const auto emptyAdminRights = MTP_chatAdminRights(MTP_flags(0));
 	for (const auto &p : list) {
 		const auto participantId = p.match([](
 				const MTPDchannelParticipantBanned &data) {
@@ -1547,13 +1544,14 @@ void ApiWrap::applyLastParticipantsList(
 			? channel->amCreator()
 			: false;
 		const auto adminRights = (p.type() == mtpc_channelParticipantAdmin)
-			? p.c_channelParticipantAdmin().vadmin_rights()
+			? ChatAdminRightsInfo(p.c_channelParticipantAdmin().vadmin_rights())
 			: (p.type() == mtpc_channelParticipantCreator)
-			? p.c_channelParticipantCreator().vadmin_rights()
-			: emptyAdminRights;
+			? ChatAdminRightsInfo(p.c_channelParticipantCreator().vadmin_rights())
+			: ChatAdminRightsInfo();
 		const auto restrictedRights = (p.type() == mtpc_channelParticipantBanned)
-			? p.c_channelParticipantBanned().vbanned_rights()
-			: ChannelData::EmptyRestrictedRights(participant);
+			? ChatRestrictionsInfo(
+				p.c_channelParticipantBanned().vbanned_rights())
+			: ChatRestrictionsInfo();
 		if (p.type() == mtpc_channelParticipantCreator) {
 			Assert(user != nullptr);
 			const auto &creator = p.c_channelParticipantCreator();
@@ -1569,11 +1567,11 @@ void ApiWrap::applyLastParticipantsList(
 		if (user
 			&& !base::contains(channel->mgInfo->lastParticipants, user)) {
 			channel->mgInfo->lastParticipants.push_back(user);
-			if (adminRights.c_chatAdminRights().vflags().v) {
+			if (adminRights.flags) {
 				channel->mgInfo->lastAdmins.emplace(
 					user,
 					MegagroupInfo::Admin{ adminRights, adminCanEdit });
-			} else if (Data::ChatBannedRightsFlags(restrictedRights) != 0) {
+			} else if (restrictedRights.flags) {
 				channel->mgInfo->lastRestricted.emplace(
 					user,
 					MegagroupInfo::Restricted{ restrictedRights });
@@ -1731,7 +1729,7 @@ void ApiWrap::kickParticipant(
 void ApiWrap::kickParticipant(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &currentRights) {
+		ChatRestrictionsInfo currentRights) {
 	const auto kick = KickRequest(channel, participant);
 	if (_kickRequests.contains(kick)) return;
 
@@ -1739,7 +1737,10 @@ void ApiWrap::kickParticipant(
 	const auto requestId = request(MTPchannels_EditBanned(
 		channel->inputChannel,
 		participant->input,
-		rights
+		MTP_chatBannedRights(
+			MTP_flags(
+				MTPDchatBannedRights::Flags::from_raw(uint32(rights.flags))),
+			MTP_int(rights.until))
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
 
@@ -1763,7 +1764,7 @@ void ApiWrap::unblockParticipant(
 	const auto requestId = request(MTPchannels_EditBanned(
 		channel->inputChannel,
 		participant->input,
-		ChannelData::EmptyRestrictedRights(participant)
+		MTP_chatBannedRights(MTP_flags(0), MTP_int(0))
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
 
@@ -1945,9 +1946,7 @@ void ApiWrap::saveStickerSets(
 		? _session->data().stickers().maskSetsOrderRef()
 		: _session->data().stickers().setsOrderRef();
 
-	using Flag = MTPDstickerSet::Flag;
-	using ClientFlag = MTPDstickerSet_ClientFlag;
-
+	using Flag = Data::StickersSetFlag;
 	for (const auto removedSetId : localRemoved) {
 		if ((removedSetId == Data::Stickers::CloudRecentSetId)
 			|| (removedSetId == Data::Stickers::CloudRecentAttachedSetId)) {
@@ -1999,10 +1998,10 @@ void ApiWrap::saveStickerSets(
 					++i;
 				}
 			}
-			const auto archived = !!(set->flags & Flag::f_archived);
+			const auto archived = !!(set->flags & Flag::Archived);
 			if (!archived) {
-				const auto featured = !!(set->flags & ClientFlag::f_featured);
-				const auto special = !!(set->flags & ClientFlag::f_special);
+				const auto featured = !!(set->flags & Flag::Featured);
+				const auto special = !!(set->flags & Flag::Special);
 				const auto setId = set->mtpInput();
 
 				auto requestId = request(MTPmessages_UninstallStickerSet(
@@ -2025,8 +2024,7 @@ void ApiWrap::saveStickerSets(
 					if (archived) {
 						writeArchived = true;
 					}
-					set->flags &= ~(Flag::f_installed_date
-						| Flag::f_archived);
+					set->flags &= ~(Flag::Installed | Flag::Archived);
 					set->installDate = TimeId(0);
 				}
 			}
@@ -2035,10 +2033,10 @@ void ApiWrap::saveStickerSets(
 
 	// Clear all installed flags, set only for sets from order.
 	for (auto &[id, set] : sets) {
-		const auto archived = !!(set->flags & Flag::f_archived);
-		const auto masks = !!(set->flags & MTPDstickerSet::Flag::f_masks);
+		const auto archived = !!(set->flags & Flag::Archived);
+		const auto masks = !!(set->flags & Flag::Masks);
 		if (!archived && (setsMasks == masks)) {
-			set->flags &= ~Flag::f_installed_date;
+			set->flags &= ~Flag::Installed;
 		}
 	}
 
@@ -2049,7 +2047,7 @@ void ApiWrap::saveStickerSets(
 			continue;
 		}
 		const auto set = it->second.get();
-		const auto archived = !!(set->flags & Flag::f_archived);
+		const auto archived = !!(set->flags & Flag::Archived);
 		if (archived && !localRemoved.contains(set->id)) {
 			const auto mtpSetId = set->mtpInput();
 
@@ -2068,11 +2066,11 @@ void ApiWrap::saveStickerSets(
 
 			setDisenableRequests.insert(requestId);
 
-			set->flags &= ~Flag::f_archived;
+			set->flags &= ~Flag::Archived;
 			writeArchived = true;
 		}
 		orderRef.push_back(setId);
-		set->flags |= Flag::f_installed_date;
+		set->flags |= Flag::Installed;
 		if (!set->installDate) {
 			set->installDate = base::unixtime::now();
 		}
@@ -2080,10 +2078,10 @@ void ApiWrap::saveStickerSets(
 
 	for (auto it = sets.begin(); it != sets.cend();) {
 		const auto set = it->second.get();
-		if ((set->flags & ClientFlag::f_featured)
-			|| (set->flags & Flag::f_installed_date)
-			|| (set->flags & Flag::f_archived)
-			|| (set->flags & ClientFlag::f_special)) {
+		if ((set->flags & Flag::Featured)
+			|| (set->flags & Flag::Installed)
+			|| (set->flags & Flag::Archived)
+			|| (set->flags & Flag::Special)) {
 			++it;
 		} else {
 			it = sets.erase(it);
@@ -3027,11 +3025,16 @@ void ApiWrap::requestRecentStickersForce(bool attached) {
 	requestRecentStickersWithHash(0, attached);
 }
 
-void ApiWrap::setGroupStickerSet(not_null<ChannelData*> megagroup, const MTPInputStickerSet &set) {
+void ApiWrap::setGroupStickerSet(
+		not_null<ChannelData*> megagroup,
+		const StickerSetIdentifier &set) {
 	Expects(megagroup->mgInfo != nullptr);
 
 	megagroup->mgInfo->stickerSet = set;
-	request(MTPchannels_SetStickers(megagroup->inputChannel, set)).send();
+	request(MTPchannels_SetStickers(
+		megagroup->inputChannel,
+		Data::InputStickerSet(set)
+	)).send();
 	_session->data().stickers().notifyUpdated();
 }
 
@@ -3297,7 +3300,7 @@ void ApiWrap::readFeaturedSets() {
 	for (const auto setId : _featuredSetsRead) {
 		const auto it = sets.find(setId);
 		if (it != sets.cend()) {
-			it->second->flags &= ~MTPDstickerSet_ClientFlag::f_unread;
+			it->second->flags &= ~Data::StickersSetFlag::Unread;
 			wrappedIds.append(MTP_long(setId));
 			if (count) {
 				--count;
@@ -3871,7 +3874,6 @@ void ApiWrap::forwardMessages(
 			}
 		}
 		const auto newFrom = item->history()->peer;
-		const auto newGroupId = item->groupId();
 		if (forwardFrom != newFrom) {
 			sendAccumulated();
 			forwardFrom = newFrom;

Telegram/SourceFiles/apiwrap.h

@@ -20,6 +20,7 @@ struct MessageGroupId;
 struct SendingAlbum;
 enum class SendMediaType;
 struct FileLoadTo;
+struct ChatRestrictionsInfo;
 
 namespace Main {
 class Session;
@@ -107,7 +108,7 @@ QString RequestKey(Types &&...values) {
 
 } // namespace Api
 
-class ApiWrap : public MTP::Sender, private base::Subscriber {
+class ApiWrap final : public MTP::Sender {
 public:
 	using SendAction = Api::SendAction;
 	using MessageToSend = Api::MessageToSend;
@@ -264,7 +265,7 @@ public:
 	void kickParticipant(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &currentRights);
+		ChatRestrictionsInfo currentRights);
 	void unblockParticipant(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> participant);
@@ -287,7 +288,7 @@ public:
 	void requestRecentStickersForce(bool attached = false);
 	void setGroupStickerSet(
 		not_null<ChannelData*> megagroup,
-		const MTPInputStickerSet &set);
+		const StickerSetIdentifier &set);
 	std::vector<not_null<DocumentData*>> *stickersByEmoji(
 		not_null<EmojiPtr> emoji);
 

Telegram/SourceFiles/app.cpp

@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_location_manager.h"
 #include "history/history_item_components.h"
-#include "history/view/history_view_service_message.h"
+#include "history/view/history_view_element.h"
 #include "media/audio/media_audio.h"
 #include "ui/image/image.h"
 #include "ui/cached_round_corners.h"
@@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/update_checker.h"
 #include "core/sandbox.h"
 #include "core/application.h"
-#include "window/themes/window_theme.h"
 #include "window/notifications_manager.h"
 #include "window/window_controller.h"
 #include "platform/platform_notifications_manager.h"
@@ -99,16 +98,6 @@ namespace App {
 
 	void initMedia() {
 		Ui::StartCachedCorners();
-
-		using Update = Window::Theme::BackgroundUpdate;
-		static auto subscription = Window::Theme::Background()->add_subscription([](const Update &update) {
-			if (update.paletteChanged()) {
-				if (const auto m = App::main()) { // multi good
-					m->updateScrollColors();
-				}
-				HistoryView::serviceColorsUpdated();
-			}
-		});
 	}
 
 	void deinitMedia() {

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -158,7 +158,7 @@ void ShowAddParticipantsError(
 				auto box = Box<EditAdminBox>(
 					channel,
 					user,
-					MTP_chatAdminRights(MTP_flags(0)),
+					ChatAdminRightsInfo(),
 					QString());
 				box->setSaveCallback(saveCallback);
 				*weak = Ui::show(std::move(box));

Telegram/SourceFiles/boxes/add_contact_box.h

@@ -145,9 +145,7 @@ private:
 
 };
 
-class SetupChannelBox final
-	: public Ui::BoxContent
-	, private base::Subscriber {
+class SetupChannelBox final : public Ui::BoxContent {
 public:
 	SetupChannelBox(
 		QWidget*,
@@ -244,9 +242,7 @@ private:
 
 };
 
-class RevokePublicLinkBox final
-	: public Ui::BoxContent
-	, private base::Subscriber {
+class RevokePublicLinkBox final : public Ui::BoxContent {
 public:
 	RevokePublicLinkBox(
 		QWidget*,

Telegram/SourceFiles/boxes/background_box.cpp

@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_preview_box.h"
 #include "boxes/confirm_box.h"
 #include "window/window_session_controller.h"
+#include "window/themes/window_theme.h"
 #include "styles/style_overview.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -55,9 +56,7 @@ QImage TakeMiddleSample(QImage original, QSize size) {
 
 } // namespace
 
-class BackgroundBox::Inner final
-	: public Ui::RpWidget
-	, private base::Subscriber {
+class BackgroundBox::Inner final : public Ui::RpWidget {
 public:
 	Inner(
 		QWidget *parent,
@@ -203,16 +202,22 @@ BackgroundBox::Inner::Inner(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
+
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_check->invalidateCache();
+	}, lifetime());
+
 	using Update = Window::Theme::BackgroundUpdate;
-	subscribe(Window::Theme::Background(), [=](const Update &update) {
-		if (update.paletteChanged()) {
-			_check->invalidateCache();
-		} else if (update.type == Update::Type::New) {
+	Window::Theme::Background()->updates(
+	) | rpl::start_with_next([=](const Update &update) {
+		if (update.type == Update::Type::New) {
 			sortPapers();
 			requestPapers();
 			this->update();
 		}
-	});
+	}, lifetime());
+
 	setMouseTracking(true);
 }
 
@@ -234,8 +239,10 @@ void BackgroundBox::Inner::sortPapers() {
 		return std::make_tuple(
 			data.id() == current,
 			night ? data.isDark() : !data.isDark(),
-			!data.isDefault() && !data.isLocal(),
-			!data.isDefault() && data.isLocal());
+			Data::IsDefaultWallPaper(data),
+			!data.isDefault() && !Data::IsLegacy1DefaultWallPaper(data),
+			Data::IsLegacy2DefaultWallPaper(data),
+			Data::IsLegacy1DefaultWallPaper(data));
 	});
 	if (!_papers.empty() && _papers.front().data.id() == current) {
 		_papers.front().data = _papers.front().data.withParamsFrom(
@@ -361,6 +368,7 @@ void BackgroundBox::Inner::paintPaper(
 		_check->paint(p, checkLeft, checkTop, width());
 	} else if (Data::IsCloudWallPaper(paper.data)
 		&& !Data::IsDefaultWallPaper(paper.data)
+		&& !Data::IsLegacy2DefaultWallPaper(paper.data)
 		&& !v::is_null(over)
 		&& (&paper == &_papers[getSelectionIndex(over)])) {
 		const auto deleteSelected = v::is<DeleteSelected>(over);
@@ -390,6 +398,7 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		} else if (result >= _papers.size()) {
 			return Selection();
 		}
+		auto &data = _papers[result].data;
 		const auto deleteLeft = (column + 1) * (width + skip)
 			- st::stickerPanDeleteIconBg.width();
 		const auto deleteBottom = row * (height + skip) + skip
@@ -397,9 +406,10 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		const auto currentId = Window::Theme::Background()->id();
 		const auto inDelete = (x >= deleteLeft)
 			&& (y < deleteBottom)
-			&& Data::IsCloudWallPaper(_papers[result].data)
-			&& !Data::IsDefaultWallPaper(_papers[result].data)
-			&& (currentId != _papers[result].data.id());
+			&& Data::IsCloudWallPaper(data)
+			&& !Data::IsDefaultWallPaper(data)
+			&& !Data::IsLegacy2DefaultWallPaper(data)
+			&& (currentId != data.id());
 		return (result >= _papers.size())
 			? Selection()
 			: inDelete

Telegram/SourceFiles/boxes/background_preview_box.cpp

@@ -99,12 +99,10 @@ private:
 };
 
 ServiceCheck::Generator::Generator() {
-	*_lifetime.make_state<base::Subscription>() = Window::Theme::Background(
-	)->add_subscription([=](const Window::Theme::BackgroundUpdate &update) {
-		if (update.paletteChanged()) {
-			invalidate();
-		}
-	});
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		invalidate();
+	}, _lifetime);
 }
 
 auto ServiceCheck::Generator::framesForStyle(
@@ -624,6 +622,7 @@ void BackgroundPreviewBox::paintDate(Painter &p) {
 	if (!date || !_serviceBg) {
 		return;
 	}
+	auto hq = PainterHighQualityEnabler(p);
 	const auto text = date->text;
 	const auto bubbleHeight = st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
 	const auto bubbleTop = st::msgServiceMargin.top();
@@ -760,7 +759,7 @@ void BackgroundPreviewBox::checkLoadedDocument() {
 	};
 	_generating = Data::ReadImageAsync(
 		_media.get(),
-		Window::Theme::ProcessBackgroundImage,
+		Window::Theme::PreprocessBackgroundImage,
 		generateCallback);
 }
 

Telegram/SourceFiles/boxes/background_preview_box.h

@@ -9,11 +9,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/abstract_box.h"
 #include "base/binary_guard.h"
-#include "window/themes/window_theme.h"
 #include "history/admin_log/history_admin_log_item.h"
 #include "history/view/history_view_element.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/radial_animation.h"
+#include "data/data_wall_paper.h"
 
 namespace Data {
 class DocumentMedia;
@@ -29,8 +29,7 @@ class Checkbox;
 
 class BackgroundPreviewBox
 	: public Ui::BoxContent
-	, private HistoryView::SimpleElementDelegate
-	, private base::Subscriber {
+	, private HistoryView::SimpleElementDelegate {
 public:
 	BackgroundPreviewBox(
 		QWidget*,

Telegram/SourceFiles/boxes/confirm_box.cpp

@@ -901,7 +901,7 @@ void DeleteMessagesBox::deleteAndClear() {
 			_moderateInChannel->session().api().kickParticipant(
 				_moderateInChannel,
 				_moderateFrom,
-				ChannelData::EmptyRestrictedRights(_moderateFrom));
+				ChatRestrictionsInfo());
 		}
 		if (_reportSpam->checked()) {
 			_moderateInChannel->session().api().request(

Telegram/SourceFiles/boxes/confirm_box.h

@@ -141,7 +141,7 @@ public:
 
 };
 
-class MaxInviteBox : public Ui::BoxContent, private base::Subscriber {
+class MaxInviteBox final : public Ui::BoxContent {
 public:
 	MaxInviteBox(QWidget*, not_null<ChannelData*> channel);
 

Telegram/SourceFiles/boxes/create_poll_box.cpp

@@ -436,7 +436,6 @@ void Options::Option::updateFieldGeometry() {
 	const auto skip = st::defaultRadio.diameter
 		+ st::defaultCheckbox.textPosition.x();
 	const auto left = anim::interpolate(0, skip, shown);
-	const auto width = _content->width() - left;
 	_field->resizeToWidth(_content->width() - left);
 	_field->moveToLeft(left, 0);
 }

Telegram/SourceFiles/boxes/edit_caption_box.h

@@ -8,12 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
-#include "storage/storage_media_prepare.h"
-#include "ui/wrap/slide_wrap.h"
 #include "ui/chat/attach/attach_prepare.h"
 
-class Image;
-
 namespace ChatHelpers {
 class TabbedPanel;
 } // namespace ChatHelpers
@@ -23,36 +19,19 @@ class SessionController;
 } // namespace Window
 
 namespace Data {
-class Media;
 class PhotoMedia;
-class DocumentMedia;
 } // namespace Data
 
 namespace Ui {
-class AbstractButton;
+class AbstractSinglePreview;
 class InputField;
 class EmojiButton;
-class IconButton;
-class Checkbox;
+class VerticalLayout;
+class FadeShadow;
 enum class AlbumType;
-class AttachControlsWidget;
 } // namespace Ui
 
-namespace Window {
-class SessionController;
-} // namespace Window
-
-namespace Media {
-namespace Streaming {
-class Instance;
-class Document;
-struct Update;
-enum class Error;
-struct Information;
-} // namespace Streaming
-} // namespace Media
-
-class EditCaptionBox final : public Ui::BoxContent, private base::Subscriber {
+class EditCaptionBox final : public Ui::BoxContent {
 public:
 	EditCaptionBox(
 		QWidget*,
@@ -69,15 +48,15 @@ protected:
 	void keyPressEvent(QKeyEvent *e) override;
 
 private:
+	void rebuildPreview();
+	void setupEditEventHandler();
+	void setupPhotoEditorEventHandler();
+	void setupShadows();
+	void setupField();
+	void setupControls();
+
 	void updateBoxSize();
-	void prepareStreamedPreview();
-	void checkStreamedIsStarted();
-	void setupStreamedPreview(
-		std::shared_ptr<::Media::Streaming::Document> shared);
-	void handleStreamingUpdate(::Media::Streaming::Update &&update);
-	void handleStreamingError(::Media::Streaming::Error &&error);
-	void streamingReady(::Media::Streaming::Information &&info);
-	void startStreamedPlayer();
+	void captionResized();
 
 	void setupEmojiPanel();
 	void updateEmojiPanelGeometry();
@@ -86,74 +65,44 @@ private:
 	void setupDragArea();
 
 	void save();
-	void captionResized();
 
-	void setName(QString nameString, qint64 size);
 	bool fileFromClipboard(not_null<const QMimeData*> data);
-	void updateEditPreview();
-	void updateEditMediaButton();
-	void updateCaptionMaxHeight();
 
 	int errorTopSkip() const;
 
-	void createEditMediaButton();
 	bool setPreparedList(Ui::PreparedList &&list);
 
-	bool isThumbedLayout() const;
-
-	inline QString getNewMediaPath() {
-		return _preparedList.files.empty()
-			? QString()
-			: _preparedList.files.front().path;
-	}
-
 	const not_null<Window::SessionController*> _controller;
+	const not_null<HistoryItem*> _historyItem;
+	const bool _isAllowedEditMedia;
+	const Ui::AlbumType _albumType;
 
-	FullMsgId _msgId;
-	std::shared_ptr<Data::PhotoMedia> _photoMedia;
-	std::shared_ptr<Data::DocumentMedia> _documentMedia;
-	bool _thumbnailImageLoaded = false;
-	Fn<void()> _refreshThumbnail;
-	bool _animated = false;
-	bool _photo = false;
-	bool _doc = false;
+	const base::unique_qptr<Ui::VerticalLayout> _controls;
+	const base::unique_qptr<Ui::ScrollArea> _scroll;
+	const base::unique_qptr<Ui::InputField> _field;
+	const base::unique_qptr<Ui::EmojiButton> _emojiToggle;
+	const base::unique_qptr<Ui::FadeShadow> _topShadow, _bottomShadow;
 
-	QPixmap _thumb;
-	std::unique_ptr<::Media::Streaming::Instance> _streamed;
-
-	object_ptr<Ui::InputField> _field = { nullptr };
-	object_ptr<Ui::EmojiButton> _emojiToggle = { nullptr };
+	base::unique_qptr<Ui::AbstractSinglePreview> _content;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
-	base::unique_qptr<Ui::AbstractButton> _photoEditorButton;
 
-	int _thumbx = 0;
-	int _thumbw = 0;
-	int _thumbh = 0;
-	Ui::Text::String _name;
-	QString _status;
-	bool _isAudio = false;
-	bool _isImage = false;
-
-	int _gifw = 0;
-	int _gifh = 0;
-	int _gifx = 0;
+	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 
 	Ui::PreparedList _preparedList;
 
 	mtpRequestId _saveRequestId = 0;
 
-	object_ptr<Ui::AttachControlsWidget> _editMedia = nullptr;
-	object_ptr<Ui::IconButton> _editFile = nullptr;
-	Ui::SlideWrap<Ui::RpWidget> *_wayWrap = nullptr;
-	Ui::SlideWrap<Ui::RpWidget> *_hintLabel = nullptr;
-	QString _newMediaPath;
-	Ui::AlbumType _albumType = Ui::AlbumType();
-	bool _isAllowedEditMedia = false;
+	bool _isPhoto = false;
 	bool _asFile = false;
-	rpl::event_stream<> _editMediaClicks;
-	rpl::event_stream<> _photoEditorOpens;
 
 	QString _error;
 
+	rpl::variable<int> _footerHeight = 0;
+
+	rpl::event_stream<> _editMediaClicks;
+	rpl::event_stream<> _photoEditorOpens;
+	rpl::event_stream<> _previewRebuilds;
+	rpl::event_stream<int> _contentHeight;
+
 };

Telegram/SourceFiles/boxes/language_box.cpp

@@ -115,12 +115,12 @@ private:
 	const Rows::Row &rowBySelection(Selection selected) const;
 	std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		Selection selected);
-	const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
+	[[maybe_unused]] const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		Selection selected) const;
 	std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		not_null<Row*> row,
 		Selection selected);
-	const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
+	[[maybe_unused]] const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		not_null<const Row*> row,
 		Selection selected) const;
 	void addRipple(Selection selected, QPoint position);
@@ -216,7 +216,6 @@ std::pair<Languages, Languages> PrepareLists() {
 					Lang::GetInstance().nativeName()
 				};
 			};
-			const auto i = ranges::find(official, current, projId);
 			recent.insert(begin(recent), generate());
 		}
 	}

Telegram/SourceFiles/boxes/local_storage_box.cpp

@@ -516,7 +516,7 @@ void LocalStorageBox::updateMediaLabel() {
 }
 
 void LocalStorageBox::setupLimits(not_null<Ui::VerticalLayout*> container) {
-	const auto shadow = container->add(
+	container->add(
 		object_ptr<Ui::PlainShadow>(container),
 		st::localStorageRowPadding);
 

Telegram/SourceFiles/boxes/passcode_box.cpp

@@ -1062,7 +1062,9 @@ void RecoverBox::submit() {
 
 	const auto send = crl::guard(this, [=] {
 		_submitRequest = _api.request(MTPauth_RecoverPassword(
-			MTP_string(code)
+			MTP_flags(0),
+			MTP_string(code),
+			MTPaccount_PasswordInputSettings()
 		)).done([=](const MTPauth_Authorization &result) {
 			codeSubmitDone(result);
 		}).fail([=](const MTP::Error &error) {

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "base/unixtime.h"
-#include "window/themes/window_theme.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
@@ -738,11 +737,11 @@ PeerListContent::PeerListContent(
 		}
 	}, lifetime());
 
-	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
-		if (update.paletteChanged()) {
-			invalidatePixmapsCache();
-		}
-	});
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		invalidatePixmapsCache();
+	}, lifetime());
+
 	_repaintByStatus.setCallback([this] { update(); });
 }
 

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -527,9 +527,7 @@ struct PeerListState {
 	QString searchQuery;
 };
 
-class PeerListContent
-	: public Ui::RpWidget
-	, private base::Subscriber {
+class PeerListContent : public Ui::RpWidget {
 public:
 	PeerListContent(
 		QWidget *parent,

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -516,7 +516,7 @@ bool AddBotToGroupBoxController::needToCreateRow(
 		not_null<PeerData*> peer) const {
 	if (sharingBotGame()) {
 		if (!peer->canWrite()
-			|| peer->amRestricted(ChatRestriction::f_send_games)) {
+			|| peer->amRestricted(ChatRestriction::SendGames)) {
 			return false;
 		}
 		return true;

Telegram/SourceFiles/boxes/peers/add_participants_box.cpp

@@ -626,7 +626,7 @@ void AddSpecialBoxController::showAdmin(
 	// Finally show the admin.
 	const auto currentRights = adminRights
 		? *adminRights
-		: MTPChatAdminRights(MTP_chatAdminRights(MTP_flags(0)));
+		: ChatAdminRightsInfo();
 	auto box = Box<EditAdminBox>(
 		_peer,
 		user,
@@ -634,7 +634,7 @@ void AddSpecialBoxController::showAdmin(
 		_additional.adminRank(user));
 	if (_additional.canAddOrEditAdmin(user)) {
 		const auto done = crl::guard(this, [=](
-				const MTPChatAdminRights &newRights,
+				ChatAdminRightsInfo newRights,
 				const QString &rank) {
 			editAdminDone(user, newRights, rank);
 		});
@@ -650,7 +650,7 @@ void AddSpecialBoxController::showAdmin(
 
 void AddSpecialBoxController::editAdminDone(
 		not_null<UserData*> user,
-		const MTPChatAdminRights &rights,
+		ChatAdminRightsInfo rights,
 		const QString &rank) {
 	if (_editParticipantBox) {
 		_editParticipantBox->closeBox();
@@ -662,9 +662,11 @@ void AddSpecialBoxController::editAdminDone(
 		_additional.applyParticipant(MTP_channelParticipantCreator(
 			MTP_flags(rank.isEmpty() ? Flag(0) : Flag::f_rank),
 			peerToBareMTPInt(user->id),
-			rights,
+			MTP_chatAdminRights(
+				MTP_flags(MTPDchatAdminRights::Flags::from_raw(
+					uint32(rights.flags)))),
 			MTP_string(rank)));
-	} else if (rights.c_chatAdminRights().vflags().v == 0) {
+	} else if (!rights.flags) {
 		_additional.applyParticipant(MTP_channelParticipant(
 			peerToBareMTPInt(user->id),
 			MTP_int(date)));
@@ -680,7 +682,9 @@ void AddSpecialBoxController::editAdminDone(
 				? alreadyPromotedBy->id
 				: user->session().userPeerId()),
 			MTP_int(date),
-			rights,
+			MTP_chatAdminRights(
+				MTP_flags(MTPDchatAdminRights::Flags::from_raw(
+					uint32(rights.flags)))),
 			MTP_string(rank)));
 	}
 	if (const auto callback = _adminDoneCallback) {
@@ -730,7 +734,7 @@ void AddSpecialBoxController::showRestricted(
 	// Finally edit the restricted.
 	const auto currentRights = restrictedRights
 		? *restrictedRights
-		: ChannelData::EmptyRestrictedRights(user);
+		: ChatRestrictionsInfo();
 	auto box = Box<EditRestrictedBox>(
 		_peer,
 		user,
@@ -738,7 +742,7 @@ void AddSpecialBoxController::showRestricted(
 		currentRights);
 	if (_additional.canRestrictParticipant(user)) {
 		const auto done = crl::guard(this, [=](
-				const MTPChatBannedRights &newRights) {
+				ChatRestrictionsInfo newRights) {
 			editRestrictedDone(user, newRights);
 		});
 		const auto fail = crl::guard(this, [=] {
@@ -754,13 +758,13 @@ void AddSpecialBoxController::showRestricted(
 
 void AddSpecialBoxController::editRestrictedDone(
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &rights) {
+		ChatRestrictionsInfo rights) {
 	if (_editParticipantBox) {
 		_editParticipantBox->closeBox();
 	}
 
 	const auto date = base::unixtime::now(); // Incorrect, but ignored.
-	if (Data::ChatBannedRightsFlags(rights) == 0) {
+	if (!rights.flags) {
 		if (const auto user = participant->asUser()) {
 			_additional.applyParticipant(MTP_channelParticipant(
 				peerToBareMTPInt(user->id),
@@ -769,8 +773,7 @@ void AddSpecialBoxController::editRestrictedDone(
 			_additional.setExternal(participant);
 		}
 	} else {
-		const auto kicked = Data::ChatBannedRightsFlags(rights)
-			& ChatRestriction::f_view_messages;
+		const auto kicked = rights.flags & ChatRestriction::ViewMessages;
 		const auto alreadyRestrictedBy = _additional.restrictedBy(
 			participant);
 		_additional.applyParticipant(MTP_channelParticipantBanned(
@@ -782,7 +785,10 @@ void AddSpecialBoxController::editRestrictedDone(
 				? alreadyRestrictedBy->id
 				: participant->session().userPeerId()),
 			MTP_int(date),
-			rights));
+			MTP_chatBannedRights(
+				MTP_flags(MTPDchatBannedRights::Flags::from_raw(
+					uint32(rights.flags))),
+				MTP_int(rights.until))));
 	}
 	if (const auto callback = _bannedDoneCallback) {
 		callback(participant, rights);
@@ -839,10 +845,10 @@ void AddSpecialBoxController::kickUser(
 	const auto restrictedRights = _additional.restrictedRights(participant);
 	const auto currentRights = restrictedRights
 		? *restrictedRights
-		: ChannelData::EmptyRestrictedRights(participant);
+		: ChatRestrictionsInfo();
 
 	const auto done = crl::guard(this, [=](
-			const MTPChatBannedRights &newRights) {
+			ChatRestrictionsInfo newRights) {
 		editRestrictedDone(participant, newRights);
 	});
 	const auto fail = crl::guard(this, [=] {

Telegram/SourceFiles/boxes/peers/add_participants_box.h

@@ -10,6 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peer_list_controllers.h"
 #include "boxes/peers/edit_participants_box.h"
 
+struct ChatAdminRightsInfo;
+struct ChatRestrictionsInfo;
+
 namespace Window {
 class SessionNavigation;
 } // namespace Window
@@ -70,18 +73,17 @@ private:
 // with search + contacts search + global search.
 class AddSpecialBoxController
 	: public PeerListController
-	, private base::Subscriber
 	, public base::has_weak_ptr {
 public:
 	using Role = ParticipantsBoxController::Role;
 
 	using AdminDoneCallback = Fn<void(
 		not_null<UserData*> user,
-		const MTPChatAdminRights &adminRights,
+		ChatAdminRightsInfo adminRights,
 		const QString &rank)>;
 	using BannedDoneCallback = Fn<void(
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &bannedRights)>;
+		ChatRestrictionsInfo bannedRights)>;
 	AddSpecialBoxController(
 		not_null<PeerData*> peer,
 		Role role,
@@ -109,12 +111,12 @@ private:
 	void showAdmin(not_null<UserData*> user, bool sure = false);
 	void editAdminDone(
 		not_null<UserData*> user,
-		const MTPChatAdminRights &rights,
+		ChatAdminRightsInfo rights,
 		const QString &rank);
 	void showRestricted(not_null<UserData*> user, bool sure = false);
 	void editRestrictedDone(
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &rights);
+		ChatRestrictionsInfo rights);
 	void kickUser(not_null<PeerData*> participant, bool sure = false);
 	bool appendRow(not_null<PeerData*> participant);
 	bool prependRow(not_null<UserData*> user);
@@ -143,9 +145,7 @@ protected:
 };
 
 // Finds chat/channel members, then contacts, then global search results.
-class AddSpecialBoxSearchController
-	: public PeerListSearchController
-	, private base::Subscriber {
+class AddSpecialBoxSearchController : public PeerListSearchController {
 public:
 	using Role = ParticipantsBoxController::Role;
 

Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp

@@ -60,10 +60,9 @@ void SendRequest(
 			user->username);
 		user->session().api().applyUpdates(result);
 		if (const auto settings = user->settings()) {
-			using Flag = MTPDpeerSettings::Flag;
-			const auto flags = Flag::f_add_contact
-				| Flag::f_block_contact
-				| Flag::f_report_spam;
+			const auto flags = PeerSetting::AddContact
+				| PeerSetting::BlockContact
+				| PeerSetting::ReportSpam;
 			user->setSettings(*settings & ~flags);
 		}
 		if (box) {
@@ -241,9 +240,8 @@ void Controller::setupWarning() {
 
 void Controller::setupSharePhoneNumber() {
 	const auto settings = _user->settings();
-	using Setting = MTPDpeerSettings::Flag;
 	if (!settings
-		|| !((*settings) & Setting::f_need_contacts_exception)) {
+		|| !((*settings) & PeerSetting::NeedContactsException)) {
 		return;
 	}
 	_sharePhone = _box->addRow(

Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp

@@ -197,43 +197,45 @@ EditAdminBox::EditAdminBox(
 	QWidget*,
 	not_null<PeerData*> peer,
 	not_null<UserData*> user,
-	const MTPChatAdminRights &rights,
+	ChatAdminRightsInfo rights,
 	const QString &rank)
 : EditParticipantBox(
 	nullptr,
 	peer,
 	user,
-	(rights.c_chatAdminRights().vflags().v != 0))
+	(rights.flags != 0))
 , _oldRights(rights)
 , _oldRank(rank) {
 }
 
-MTPChatAdminRights EditAdminBox::defaultRights() const {
-	const auto flags = peer()->isChat()
+ChatAdminRightsInfo EditAdminBox::defaultRights() const {
+	using Flag = ChatAdminRight;
+
+	return peer()->isChat()
 		? peer()->asChat()->defaultAdminRights(user())
 		: peer()->isMegagroup()
-		? (Flag::f_change_info
-			| Flag::f_delete_messages
-			| Flag::f_ban_users
-			| Flag::f_invite_users
-			| Flag::f_pin_messages
-			| Flag::f_manage_call)
-		: (Flag::f_change_info
-			| Flag::f_post_messages
-			| Flag::f_edit_messages
-			| Flag::f_delete_messages
-			| Flag::f_invite_users
-			| Flag::f_manage_call);
-	return MTP_chatAdminRights(MTP_flags(flags));
+		? ChatAdminRightsInfo{ (Flag::ChangeInfo
+			| Flag::DeleteMessages
+			| Flag::BanUsers
+			| Flag::InviteUsers
+			| Flag::PinMessages
+			| Flag::ManageCall) }
+		: ChatAdminRightsInfo{ (Flag::ChangeInfo
+			| Flag::PostMessages
+			| Flag::EditMessages
+			| Flag::DeleteMessages
+			| Flag::InviteUsers
+			| Flag::ManageCall) };
 }
 
 void EditAdminBox::prepare() {
 	using namespace rpl::mappers;
+	using Flag = ChatAdminRight;
+	using Flags = ChatAdminRights;
 
 	EditParticipantBox::prepare();
 
-	auto hadRights = _oldRights.c_chatAdminRights().vflags().v;
-	setTitle(hadRights
+	setTitle(_oldRights.flags
 		? tr::lng_rights_edit_admin()
 		: tr::lng_channel_add_admin());
 
@@ -243,16 +245,18 @@ void EditAdminBox::prepare() {
 
 	const auto chat = peer()->asChat();
 	const auto channel = peer()->asChannel();
-	const auto prepareRights = hadRights ? _oldRights : defaultRights();
+	const auto prepareRights = _oldRights.flags
+		? _oldRights
+		: defaultRights();
 	const auto disabledByDefaults = (channel && !channel->isMegagroup())
-		? MTPDchatAdminRights::Flags(0)
+		? ChatAdminRights()
 		: DisabledByDefaultRestrictions(peer());
 	const auto filterByMyRights = canSave()
-		&& !hadRights
+		&& !_oldRights.flags
 		&& channel
 		&& !channel->amCreator();
 	const auto prepareFlags = disabledByDefaults
-		| (prepareRights.c_chatAdminRights().vflags().v
+		| (prepareRights.flags
 			& (filterByMyRights ? channel->adminRights() : ~Flag(0)));
 
 	const auto disabledMessages = [&] {
@@ -267,7 +271,7 @@ void EditAdminBox::prepare() {
 				tr::lng_rights_permission_for_all(tr::now));
 			if (amCreator() && user()->isSelf()) {
 				result.emplace(
-					~Flag::f_anonymous,
+					~Flag::Anonymous,
 					tr::lng_rights_permission_cant_edit(tr::now));
 			} else if (const auto channel = peer()->asChannel()) {
 				if (!channel->amCreator()) {
@@ -304,7 +308,7 @@ void EditAdminBox::prepare() {
 	rpl::duplicate(
 		selectedFlags
 	) | rpl::map(
-		(_1 & Flag::f_add_admins) != 0
+		(_1 & Flag::AddAdmins) != 0
 	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool checked) {
 		refreshAboutAddAdminsText(checked);
@@ -330,13 +334,13 @@ void EditAdminBox::prepare() {
 			if (!_saveCallback) {
 				return;
 			}
-			const auto newFlags = (value() | ChatAdminRight::f_other)
+			const auto newFlags = (value() | ChatAdminRight::Other)
 				& ((!channel || channel->amCreator())
 					? ~Flags(0)
 					: channel->adminRights());
 			_saveCallback(
 				_oldRights,
-				MTP_chatAdminRights(MTP_flags(newFlags)),
+				ChatAdminRightsInfo(newFlags),
 				rank ? rank->getLastText().trimmed() : QString());
 		});
 		addButton(tr::lng_cancel(), [=] { closeBox(); });
@@ -593,12 +597,15 @@ EditRestrictedBox::EditRestrictedBox(
 	not_null<PeerData*> peer,
 	not_null<UserData*> user,
 	bool hasAdminRights,
-	const MTPChatBannedRights &rights)
+	ChatRestrictionsInfo rights)
 : EditParticipantBox(nullptr, peer, user, hasAdminRights)
 , _oldRights(rights) {
 }
 
 void EditRestrictedBox::prepare() {
+	using Flag = ChatRestriction;
+	using Flags = ChatRestrictions;
+
 	EditParticipantBox::prepare();
 
 	setTitle(tr::lng_rights_user_restrictions());
@@ -612,14 +619,14 @@ void EditRestrictedBox::prepare() {
 	const auto defaultRestrictions = chat
 		? chat->defaultRestrictions()
 		: channel->defaultRestrictions();
-	const auto prepareRights = Data::ChatBannedRightsFlags(_oldRights)
+	const auto prepareRights = _oldRights.flags
 		? _oldRights
 		: defaultRights();
 	const auto prepareFlags = FixDependentRestrictions(
-		Data::ChatBannedRightsFlags(prepareRights)
+		prepareRights.flags
 		| defaultRestrictions
 		| ((channel && channel->isPublic())
-			? (Flag::f_change_info | Flag::f_pin_messages)
+			? (Flag::ChangeInfo | Flag::PinMessages)
 			: Flags(0)));
 	const auto disabledMessages = [&] {
 		auto result = std::map<Flags, QString>();
@@ -631,7 +638,7 @@ void EditRestrictedBox::prepare() {
 			const auto disabled = FixDependentRestrictions(
 				defaultRestrictions
 				| ((channel && channel->isPublic())
-					? (Flag::f_change_info | Flag::f_pin_messages)
+					? (Flag::ChangeInfo | Flag::PinMessages)
 					: Flags(0)));
 			result.emplace(
 				disabled,
@@ -647,7 +654,7 @@ void EditRestrictedBox::prepare() {
 		disabledMessages);
 	addControl(std::move(checkboxes), QMargins());
 
-	_until = Data::ChatBannedRightsUntilDate(prepareRights);
+	_until = prepareRights.until;
 	addControl(object_ptr<Ui::BoxContentDivider>(this), st::rightsUntilMargin);
 	addControl(
 		object_ptr<Ui::FlatLabel>(
@@ -670,9 +677,7 @@ void EditRestrictedBox::prepare() {
 			}
 			_saveCallback(
 				_oldRights,
-				MTP_chatBannedRights(
-					MTP_flags(value()),
-					MTP_int(getRealUntilValue())));
+				ChatRestrictionsInfo{ value(), getRealUntilValue() });
 		};
 		addButton(tr::lng_settings_save(), save);
 		addButton(tr::lng_cancel(), [=] { closeBox(); });
@@ -681,8 +686,8 @@ void EditRestrictedBox::prepare() {
 	}
 }
 
-MTPChatBannedRights EditRestrictedBox::defaultRights() const {
-	return MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
+ChatRestrictionsInfo EditRestrictedBox::defaultRights() const {
+	return ChatRestrictionsInfo();
 }
 
 void EditRestrictedBox::showRestrictUntil() {
@@ -767,7 +772,7 @@ void EditRestrictedBox::createUntilVariants() {
 		}
 	};
 	auto addCurrentVariant = [&](TimeId from, TimeId to) {
-		auto oldUntil = Data::ChatBannedRightsUntilDate(_oldRights);
+		auto oldUntil = _oldRights.until;
 		if (oldUntil < _until) {
 			addCustomVariant(oldUntil, from, to);
 		}

Telegram/SourceFiles/boxes/peers/edit_participant_box.h

@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/abstract_box.h"
 #include "base/unique_qptr.h"
+#include "data/data_peer.h"
 
 namespace MTP {
 class Error;
@@ -73,13 +74,13 @@ public:
 		QWidget*,
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
-		const MTPChatAdminRights &rights,
+		ChatAdminRightsInfo rights,
 		const QString &rank);
 
 	void setSaveCallback(
 			Fn<void(
-				MTPChatAdminRights,
-				MTPChatAdminRights,
+				ChatAdminRightsInfo,
+				ChatAdminRightsInfo,
 				const QString &rank)> callback) {
 		_saveCallback = std::move(callback);
 	}
@@ -88,10 +89,7 @@ protected:
 	void prepare() override;
 
 private:
-	using Flag = MTPDchatAdminRights::Flag;
-	using Flags = MTPDchatAdminRights::Flags;
-
-	[[nodiscard]] MTPChatAdminRights defaultRights() const;
+	[[nodiscard]] ChatAdminRightsInfo defaultRights() const;
 
 	not_null<Ui::InputField*> addRankInput();
 	void transferOwnership();
@@ -109,11 +107,11 @@ private:
 	bool canTransferOwnership() const;
 	not_null<Ui::SlideWrap<Ui::RpWidget>*> setupTransferButton(bool isGroup);
 
-	const MTPChatAdminRights _oldRights;
+	const ChatAdminRightsInfo _oldRights;
 	const QString _oldRank;
 	Fn<void(
-		MTPChatAdminRights,
-		MTPChatAdminRights,
+		ChatAdminRightsInfo,
+		ChatAdminRightsInfo,
 		const QString &rank)> _saveCallback;
 
 	QPointer<Ui::FlatLabel> _aboutAddAdmins;
@@ -132,10 +130,10 @@ public:
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		bool hasAdminRights,
-		const MTPChatBannedRights &rights);
+		ChatRestrictionsInfo rights);
 
 	void setSaveCallback(
-			Fn<void(MTPChatBannedRights, MTPChatBannedRights)> callback) {
+			Fn<void(ChatRestrictionsInfo, ChatRestrictionsInfo)> callback) {
 		_saveCallback = std::move(callback);
 	}
 
@@ -143,10 +141,7 @@ protected:
 	void prepare() override;
 
 private:
-	using Flag = MTPDchatBannedRights::Flag;
-	using Flags = MTPDchatBannedRights::Flags;
-
-	[[nodiscard]] MTPChatBannedRights defaultRights() const;
+	[[nodiscard]] ChatRestrictionsInfo defaultRights() const;
 
 	bool canSave() const {
 		return !!_saveCallback;
@@ -158,9 +153,9 @@ private:
 	void createUntilVariants();
 	TimeId getRealUntilValue() const;
 
-	const MTPChatBannedRights _oldRights;
+	const ChatRestrictionsInfo _oldRights;
 	TimeId _until = 0;
-	Fn<void(MTPChatBannedRights, MTPChatBannedRights)> _saveCallback;
+	Fn<void(ChatRestrictionsInfo, ChatRestrictionsInfo)> _saveCallback;
 
 	std::shared_ptr<Ui::RadiobuttonGroup> _untilGroup;
 	std::vector<base::unique_qptr<Ui::Radiobutton>> _untilVariants;

Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp

@@ -43,7 +43,7 @@ constexpr auto kSortByOnlineDelay = crl::time(1000);
 void RemoveAdmin(
 		not_null<ChannelData*> channel,
 		not_null<UserData*> user,
-		const MTPChatAdminRights &oldRights,
+		ChatAdminRightsInfo oldRights,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	const auto newRights = MTP_chatAdminRights(MTP_flags(0));
@@ -54,7 +54,7 @@ void RemoveAdmin(
 		MTP_string(QString())
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
-		channel->applyEditAdmin(user, oldRights, newRights, QString());
+		channel->applyEditAdmin(user, oldRights, ChatAdminRightsInfo(), QString());
 		if (onDone) {
 			onDone();
 		}
@@ -120,15 +120,16 @@ void SaveChatAdmin(
 void SaveChannelAdmin(
 		not_null<ChannelData*> channel,
 		not_null<UserData*> user,
-		const MTPChatAdminRights &oldRights,
-		const MTPChatAdminRights &newRights,
+		ChatAdminRightsInfo oldRights,
+		ChatAdminRightsInfo newRights,
 		const QString &rank,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	channel->session().api().request(MTPchannels_EditAdmin(
 		channel->inputChannel,
 		user->inputUser,
-		newRights,
+		MTP_chatAdminRights(MTP_flags(
+			MTPDchatAdminRights::Flags::from_raw(uint32(newRights.flags)))),
 		MTP_string(rank)
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
@@ -147,14 +148,17 @@ void SaveChannelAdmin(
 void SaveChannelRestriction(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &oldRights,
-		const MTPChatBannedRights &newRights,
+		ChatRestrictionsInfo oldRights,
+		ChatRestrictionsInfo newRights,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	channel->session().api().request(MTPchannels_EditBanned(
 		channel->inputChannel,
 		participant->input,
-		newRights
+		MTP_chatBannedRights(
+			MTP_flags(MTPDchatBannedRights::Flags::from_raw(
+				uint32(newRights.flags))),
+			MTP_int(newRights.until))
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
 		channel->applyEditBanned(participant, oldRights, newRights);
@@ -192,18 +196,18 @@ void SaveChatParticipantKick(
 } // namespace
 
 Fn<void(
-	const MTPChatAdminRights &oldRights,
-	const MTPChatAdminRights &newRights,
+	ChatAdminRightsInfo oldRights,
+	ChatAdminRightsInfo newRights,
 	const QString &rank)> SaveAdminCallback(
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
-			const MTPChatAdminRights &newRights,
+			ChatAdminRightsInfo newRights,
 			const QString &rank)> onDone,
 		Fn<void()> onFail) {
 	return [=](
-			const MTPChatAdminRights &oldRights,
-			const MTPChatAdminRights &newRights,
+			ChatAdminRightsInfo oldRights,
+			ChatAdminRightsInfo newRights,
 			const QString &rank) {
 		const auto done = [=] { if (onDone) onDone(newRights, rank); };
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
@@ -220,13 +224,10 @@ Fn<void(
 			const auto saveChatAdmin = [&](bool isAdmin) {
 				SaveChatAdmin(chat, user, isAdmin, done, onFail);
 			};
-			const auto flags = newRights.match([](
-					const MTPDchatAdminRights &data) {
-				return data.vflags().v;
-			});
-			if (flags == chat->defaultAdminRights(user) && rank.isEmpty()) {
+			if (newRights.flags == chat->defaultAdminRights(user).flags
+				&& rank.isEmpty()) {
 				saveChatAdmin(true);
-			} else if (!flags) {
+			} else if (!newRights.flags) {
 				saveChatAdmin(false);
 			} else {
 				peer->session().api().migrateChat(chat, saveForChannel);
@@ -240,15 +241,15 @@ Fn<void(
 }
 
 Fn<void(
-	const MTPChatBannedRights &oldRights,
-	const MTPChatBannedRights &newRights)> SaveRestrictedCallback(
+	ChatRestrictionsInfo oldRights,
+	ChatRestrictionsInfo newRights)> SaveRestrictedCallback(
 		not_null<PeerData*> peer,
 		not_null<PeerData*> participant,
-		Fn<void(const MTPChatBannedRights &newRights)> onDone,
+		Fn<void(ChatRestrictionsInfo newRights)> onDone,
 		Fn<void()> onFail) {
 	return [=](
-			const MTPChatBannedRights &oldRights,
-			const MTPChatBannedRights &newRights) {
+			ChatRestrictionsInfo oldRights,
+			ChatRestrictionsInfo newRights) {
 		const auto done = [=] { if (onDone) onDone(newRights); };
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
 			SaveChannelRestriction(
@@ -260,15 +261,14 @@ Fn<void(
 				onFail);
 		};
 		if (const auto chat = peer->asChatNotMigrated()) {
-			const auto flags = Data::ChatBannedRightsFlags(newRights);
 			if (participant->isUser()
-				&& (flags & MTPDchatBannedRights::Flag::f_view_messages)) {
+				&& (newRights.flags & ChatRestriction::ViewMessages)) {
 				SaveChatParticipantKick(
 					chat,
 					participant->asUser(),
 					done,
 					onFail);
-			} else if (!flags) {
+			} else if (!newRights.flags) {
 				done();
 			} else {
 				peer->session().api().migrateChat(chat, saveForChannel);
@@ -373,11 +373,10 @@ bool ParticipantsAdditionalData::canRemoveParticipant(
 
 auto ParticipantsAdditionalData::adminRights(
 	not_null<UserData*> user) const
--> std::optional<MTPChatAdminRights> {
+-> std::optional<ChatAdminRightsInfo> {
 	if (const auto chat = _peer->asChat()) {
 		return _admins.contains(user)
-			? std::make_optional(MTPChatAdminRights(MTP_chatAdminRights(
-				MTP_flags(chat->defaultAdminRights(user)))))
+			? std::make_optional(chat->defaultAdminRights(user))
 			: std::nullopt;
 	}
 	const auto i = _adminRights.find(user);
@@ -394,7 +393,7 @@ QString ParticipantsAdditionalData::adminRank(
 
 auto ParticipantsAdditionalData::restrictedRights(
 	not_null<PeerData*> participant) const
--> std::optional<MTPChatBannedRights> {
+-> std::optional<ChatRestrictionsInfo> {
 	if (_peer->isChat()) {
 		return std::nullopt;
 	}
@@ -589,7 +588,7 @@ UserData *ParticipantsAdditionalData::applyCreator(
 		const MTPDchannelParticipantCreator &data) {
 	if (const auto user = applyRegular(data.vuser_id())) {
 		_creator = user;
-		_adminRights[user] = data.vadmin_rights();
+		_adminRights[user] = ChatAdminRightsInfo(data.vadmin_rights());
 		if (user->isSelf()) {
 			_adminCanEdit.emplace(user);
 		} else {
@@ -620,7 +619,7 @@ UserData *ParticipantsAdditionalData::applyAdmin(
 	_restrictedRights.erase(user);
 	_kicked.erase(user);
 	_restrictedBy.erase(user);
-	_adminRights[user] = data.vadmin_rights();
+	_adminRights[user] = ChatAdminRightsInfo(data.vadmin_rights());
 	if (data.is_can_edit()) {
 		_adminCanEdit.emplace(user);
 	} else {
@@ -684,7 +683,8 @@ PeerData *ParticipantsAdditionalData::applyBanned(
 	} else {
 		_kicked.erase(participant);
 	}
-	_restrictedRights[participant] = data.vbanned_rights();
+	_restrictedRights[participant] = ChatRestrictionsInfo(
+		data.vbanned_rights());
 	if (const auto by = _peer->owner().userLoaded(data.vkicked_by())) {
 		const auto i = _restrictedBy.find(participant);
 		if (i == _restrictedBy.end()) {
@@ -703,9 +703,7 @@ void ParticipantsAdditionalData::migrate(
 	fillFromChannel(channel);
 
 	for (const auto user : _admins) {
-		_adminRights.emplace(
-			user,
-			MTP_chatAdminRights(MTP_flags(chat->defaultAdminRights(user))));
+		_adminRights.emplace(user, chat->defaultAdminRights(user));
 		if (channel->amCreator()) {
 			_adminCanEdit.emplace(user);
 		}
@@ -940,13 +938,13 @@ void ParticipantsBoxController::addNewItem() {
 	}
 	const auto adminDone = crl::guard(this, [=](
 			not_null<UserData*> user,
-			const MTPChatAdminRights &rights,
+			ChatAdminRightsInfo rights,
 			const QString &rank) {
 		editAdminDone(user, rights, rank);
 	});
 	const auto restrictedDone = crl::guard(this, [=](
 			not_null<PeerData*> participant,
-			const MTPChatBannedRights &rights) {
+			ChatRestrictionsInfo rights) {
 		editRestrictedDone(participant, rights);
 	});
 	const auto initBox = [](not_null<PeerListBox*> box) {
@@ -1457,7 +1455,6 @@ void ParticipantsBoxController::rowActionClicked(
 base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) {
-	const auto chat = _peer->asChat();
 	const auto channel = _peer->asChannel();
 	const auto participant = row->peer();
 	const auto user = participant->asUser();
@@ -1523,19 +1520,15 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 
 void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 	const auto adminRights = _additional.adminRights(user);
-	const auto currentRights = adminRights
-		? *adminRights
-		: MTPChatAdminRights(MTP_chatAdminRights(MTP_flags(0)));
+	const auto currentRights = adminRights.value_or(ChatAdminRightsInfo());
 	auto box = Box<EditAdminBox>(
 		_peer,
 		user,
 		currentRights,
 		_additional.adminRank(user));
-	const auto chat = _peer->asChat();
-	const auto channel = _peer->asChannel();
 	if (_additional.canAddOrEditAdmin(user)) {
 		const auto done = crl::guard(this, [=](
-				const MTPChatAdminRights &newRights,
+				ChatAdminRightsInfo newRights,
 				const QString &rank) {
 			editAdminDone(user, newRights, rank);
 		});
@@ -1551,7 +1544,7 @@ void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 
 void ParticipantsBoxController::editAdminDone(
 		not_null<UserData*> user,
-		const MTPChatAdminRights &rights,
+		ChatAdminRightsInfo rights,
 		const QString &rank) {
 	_addBox = nullptr;
 	if (_editParticipantBox) {
@@ -1564,9 +1557,11 @@ void ParticipantsBoxController::editAdminDone(
 		_additional.applyParticipant(MTP_channelParticipantCreator(
 			MTP_flags(rank.isEmpty() ? Flag(0) : Flag::f_rank),
 			peerToBareMTPInt(user->id),
-			rights,
+			MTP_chatAdminRights(
+				MTP_flags(MTPDchatAdminRights::Flags::from_raw(
+					uint32(rights.flags)))),
 			MTP_string(rank)));
-	} else if (rights.c_chatAdminRights().vflags().v == 0) {
+	} else if (!rights.flags) {
 		_additional.applyParticipant(MTP_channelParticipant(
 			peerToBareMTPInt(user->id),
 			MTP_int(date)));
@@ -1585,7 +1580,9 @@ void ParticipantsBoxController::editAdminDone(
 				? alreadyPromotedBy->id
 				: user->session().userPeerId()),
 			MTP_int(date),
-			rights,
+			MTP_chatAdminRights(
+				MTP_flags(MTPDchatAdminRights::Flags::from_raw(
+					uint32(rights.flags)))),
 			MTP_string(rank)));
 		if (_role == Role::Admins) {
 			prependRow(user);
@@ -1601,18 +1598,16 @@ void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
 	const auto restrictedRights = _additional.restrictedRights(user);
 	const auto currentRights = restrictedRights
 		? *restrictedRights
-		: ChannelData::EmptyRestrictedRights(user);
+		: ChatRestrictionsInfo();
 	const auto hasAdminRights = _additional.adminRights(user).has_value();
 	auto box = Box<EditRestrictedBox>(
 		_peer,
 		user,
 		hasAdminRights,
 		currentRights);
-	const auto chat = _peer->asChat();
-	const auto channel = _peer->asChannel();
 	if (_additional.canRestrictParticipant(user)) {
 		const auto done = crl::guard(this, [=](
-				const MTPChatBannedRights &newRights) {
+				ChatRestrictionsInfo newRights) {
 			editRestrictedDone(user, newRights);
 		});
 		const auto fail = crl::guard(this, [=] {
@@ -1628,7 +1623,7 @@ void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
 
 void ParticipantsBoxController::editRestrictedDone(
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &rights) {
+		ChatRestrictionsInfo rights) {
 	_addBox = nullptr;
 	if (_editParticipantBox) {
 		_editParticipantBox->closeBox();
@@ -1636,7 +1631,7 @@ void ParticipantsBoxController::editRestrictedDone(
 
 	const auto user = participant->asUser();
 	const auto date = base::unixtime::now(); // Incorrect, but ignored.
-	if (Data::ChatBannedRightsFlags(rights) == 0) {
+	if (!rights.flags) {
 		if (user) {
 			_additional.applyParticipant(MTP_channelParticipant(
 				peerToBareMTPInt(user->id),
@@ -1648,8 +1643,7 @@ void ParticipantsBoxController::editRestrictedDone(
 			removeRow(participant);
 		}
 	} else {
-		const auto kicked = Data::ChatBannedRightsFlags(rights)
-			& ChatRestriction::f_view_messages;
+		const auto kicked = rights.flags & ChatRestriction::ViewMessages;
 		const auto alreadyRestrictedBy = _additional.restrictedBy(
 			participant);
 		_additional.applyParticipant(MTP_channelParticipantBanned(
@@ -1661,7 +1655,10 @@ void ParticipantsBoxController::editRestrictedDone(
 				? alreadyRestrictedBy->id
 				: participant->session().userPeerId()),
 			MTP_int(date),
-			rights));
+			MTP_chatBannedRights(
+				MTP_flags(MTPDchatBannedRights::Flags::from_raw(
+					uint32(rights.flags))),
+				MTP_int(rights.until))));
 		if (kicked) {
 			if (_role == Role::Kicked) {
 				prependRow(participant);
@@ -1716,7 +1713,7 @@ void ParticipantsBoxController::kickParticipantSure(
 	const auto restrictedRights = _additional.restrictedRights(participant);
 	const auto currentRights = restrictedRights
 		? *restrictedRights
-		: ChannelData::EmptyRestrictedRights(participant);
+		: ChatRestrictionsInfo();
 
 	if (const auto row = delegate()->peerListFindRow(participant->id.value)) {
 		delegate()->peerListRemoveRow(row);
@@ -1749,7 +1746,7 @@ void ParticipantsBoxController::removeAdminSure(not_null<UserData*> user) {
 		SaveChatAdmin(chat, user, false, crl::guard(this, [=] {
 			editAdminDone(
 				user,
-				MTP_chatAdminRights(MTP_flags(0)),
+				ChatAdminRightsInfo(),
 				QString());
 		}), nullptr);
 	} else if (const auto channel = _peer->asChannel()) {
@@ -1760,7 +1757,7 @@ void ParticipantsBoxController::removeAdminSure(not_null<UserData*> user) {
 		RemoveAdmin(channel, user, *adminRights, crl::guard(this, [=] {
 			editAdminDone(
 				user,
-				MTP_chatAdminRights(MTP_flags(0)),
+				ChatAdminRightsInfo(),
 				QString());
 		}), nullptr);
 	}
@@ -1961,7 +1958,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
 	const auto isCreator = channel->amCreator();
 	channel->flagsValue(
 	) | rpl::filter([](const ChannelData::Flags::Change &change) {
-		return (change.diff & MTPDchannel::Flag::f_creator);
+		return (change.diff & ChannelDataFlag::Creator);
 	}) | rpl::filter([=] {
 		return (isCreator != channel->amCreator());
 	}) | rpl::start_with_next([=] {

Telegram/SourceFiles/boxes/peers/edit_participants_box.h

@@ -14,27 +14,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "info/profile/info_profile_members_controllers.h"
 
+struct ChatAdminRightsInfo;
+struct ChatRestrictionsInfo;
+
 namespace Window {
 class SessionNavigation;
 } // namespace Window
 
 Fn<void(
-	const MTPChatAdminRights &oldRights,
-	const MTPChatAdminRights &newRights,
+	ChatAdminRightsInfo oldRights,
+	ChatAdminRightsInfo newRights,
 	const QString &rank)> SaveAdminCallback(
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
-			const MTPChatAdminRights &newRights,
+			ChatAdminRightsInfo newRights,
 			const QString &rank)> onDone,
 		Fn<void()> onFail);
 
 Fn<void(
-	const MTPChatBannedRights &oldRights,
-	const MTPChatBannedRights &newRights)> SaveRestrictedCallback(
+	ChatRestrictionsInfo oldRights,
+	ChatRestrictionsInfo newRights)> SaveRestrictedCallback(
 		not_null<PeerData*> peer,
 		not_null<PeerData*> participant,
-		Fn<void(const MTPChatBannedRights &newRights)> onDone,
+		Fn<void(ChatRestrictionsInfo newRights)> onDone,
 		Fn<void()> onFail);
 
 void SubscribeToMigration(
@@ -92,10 +95,10 @@ public:
 		not_null<PeerData*> participant) const;
 	[[nodiscard]] bool canRemoveParticipant(
 		not_null<PeerData*> participant) const;
-	[[nodiscard]] std::optional<MTPChatAdminRights> adminRights(
+	[[nodiscard]] std::optional<ChatAdminRightsInfo> adminRights(
 		not_null<UserData*> user) const;
 	QString adminRank(not_null<UserData*> user) const;
-	[[nodiscard]] std::optional<MTPChatBannedRights> restrictedRights(
+	[[nodiscard]] std::optional<ChatRestrictionsInfo> restrictedRights(
 		not_null<PeerData*> participant) const;
 	[[nodiscard]] bool isCreator(not_null<UserData*> user) const;
 	[[nodiscard]] bool isExternal(not_null<PeerData*> participant) const;
@@ -122,11 +125,11 @@ private:
 	base::flat_set<not_null<UserData*>> _admins;
 
 	// Data for channels.
-	base::flat_map<not_null<UserData*>, MTPChatAdminRights> _adminRights;
+	base::flat_map<not_null<UserData*>, ChatAdminRightsInfo> _adminRights;
 	base::flat_map<not_null<UserData*>, QString> _adminRanks;
 	base::flat_set<not_null<UserData*>> _adminCanEdit;
 	base::flat_map<not_null<UserData*>, not_null<UserData*>> _adminPromotedBy;
-	std::map<not_null<PeerData*>, MTPChatBannedRights> _restrictedRights;
+	std::map<not_null<PeerData*>, ChatRestrictionsInfo> _restrictedRights;
 	std::set<not_null<PeerData*>> _kicked;
 	std::map<not_null<PeerData*>, not_null<UserData*>> _restrictedBy;
 	std::set<not_null<PeerData*>> _external;
@@ -221,12 +224,12 @@ private:
 	void showAdmin(not_null<UserData*> user);
 	void editAdminDone(
 		not_null<UserData*> user,
-		const MTPChatAdminRights &rights,
+		ChatAdminRightsInfo rights,
 		const QString &rank);
 	void showRestricted(not_null<UserData*> user);
 	void editRestrictedDone(
 		not_null<PeerData*> participant,
-		const MTPChatBannedRights &rights);
+		ChatRestrictionsInfo rights);
 	void removeKicked(
 		not_null<PeerListRow*> row,
 		not_null<PeerData*> participant);

Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp

@@ -64,8 +64,6 @@ void FillContent(
 		return;
 	}
 
-	const auto channel = peer->asChannel();
-
 	historyVisibility->setValue(savedValue);
 
 	const auto result = parent->add(

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -140,7 +140,7 @@ void AddButtonDelete(
 
 void SaveDefaultRestrictions(
 		not_null<PeerData*> peer,
-		MTPChatBannedRights rights,
+		ChatRestrictions rights,
 		Fn<void()> done) {
 	const auto api = &peer->session().api();
 	const auto key = Api::RequestKey("default_restrictions", peer->id);
@@ -148,7 +148,10 @@ void SaveDefaultRestrictions(
 	const auto requestId = api->request(
 		MTPmessages_EditChatDefaultBannedRights(
 			peer->input,
-			rights)
+			MTP_chatBannedRights(
+				MTP_flags(
+					MTPDchatBannedRights::Flags::from_raw(uint32(rights))),
+				MTP_int(0)))
 	).done([=](const MTPUpdates &result) {
 		api->clearModifyRequest(key);
 		api->applyUpdates(result);
@@ -215,52 +218,7 @@ void ShowEditPermissions(
 		const auto close = crl::guard(box, [=] { box->closeBox(); });
 		SaveDefaultRestrictions(
 			peer,
-			MTP_chatBannedRights(MTP_flags(result.rights), MTP_int(0)),
-			close);
-		if (const auto channel = peer->asChannel()) {
-			SaveSlowmodeSeconds(channel, result.slowmodeSeconds, close);
-		}
-	};
-	box->saveEvents(
-	) | rpl::start_with_next([=](EditPeerPermissionsBox::Result result) {
-		if (*saving) {
-			return;
-		}
-		*saving = true;
-
-		const auto saveFor = peer->migrateToOrMe();
-		const auto chat = saveFor->asChat();
-		if (!result.slowmodeSeconds || !chat) {
-			save(saveFor, result);
-			return;
-		}
-		const auto api = &peer->session().api();
-		api->migrateChat(chat, [=](not_null<ChannelData*> channel) {
-			save(channel, result);
-		}, [=](const MTP::Error &error) {
-			*saving = false;
-		});
-	}, box->lifetime());
-}
-
-void ShowEditInviteLinks(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer) {
-	auto content = Box<EditPeerPermissionsBox>(navigation, peer);
-	const auto box = QPointer<EditPeerPermissionsBox>(content.data());
-	navigation->parentController()->show(
-		std::move(content),
-		Ui::LayerOption::KeepOther);
-	const auto saving = box->lifetime().make_state<int>(0);
-	const auto save = [=](
-			not_null<PeerData*> peer,
-			EditPeerPermissionsBox::Result result) {
-		Expects(result.slowmodeSeconds == 0 || peer->isChannel());
-
-		const auto close = crl::guard(box, [=] { box->closeBox(); });
-		SaveDefaultRestrictions(
-			peer,
-			MTP_chatBannedRights(MTP_flags(result.rights), MTP_int(0)),
+			result.rights,
 			close);
 		if (const auto channel = peer->asChannel()) {
 			SaveSlowmodeSeconds(channel, result.slowmodeSeconds, close);
@@ -1355,7 +1313,6 @@ void Controller::saveLinkedChat() {
 		channel->setLinkedChat(*_savingData.linkedChat);
 		continueSave();
 	}).fail([=](const MTP::Error &error) {
-		const auto &type = error.type();
 		cancelSave();
 	}).send();
 }
@@ -1408,7 +1365,6 @@ void Controller::saveTitle() {
 }
 
 void Controller::saveDescription() {
-	const auto channel = _peer->asChannel();
 	if (!_savingData.description
 		|| *_savingData.description == _peer->about()) {
 		return continueSave();
@@ -1468,9 +1424,9 @@ void Controller::togglePreHistoryHidden(
 		// Update in the result doesn't contain the
 		// channelFull:flags field which holds this value.
 		// So after saving we need to update it manually.
-		const auto flags = channel->fullFlags();
-		const auto flag = MTPDchannelFull::Flag::f_hidden_prehistory;
-		channel->setFullFlags(hidden ? (flags | flag) : (flags & ~flag));
+		const auto flags = channel->flags();
+		const auto flag = ChannelDataFlag::PreHistoryHidden;
+		channel->setFlags(hidden ? (flags | flag) : (flags & ~flag));
 
 		done();
 	};

Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp

@@ -832,7 +832,6 @@ void CopyInviteLink(const QString &link) {
 }
 
 void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link) {
-	const auto session = &peer->session();
 	const auto sending = std::make_shared<bool>();
 	const auto box = std::make_shared<QPointer<ShareBox>>();
 
@@ -886,8 +885,6 @@ void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link) {
 		}
 		const auto owner = &peer->owner();
 		auto &api = peer->session().api();
-		auto &histories = owner->histories();
-		const auto requestType = Data::Histories::RequestType::Send;
 		for (const auto peer : result) {
 			const auto history = owner->history(peer);
 			auto message = ApiWrap::MessageToSend(history);
@@ -901,9 +898,6 @@ void ShareInviteLinkBox(not_null<PeerData*> peer, const QString &link) {
 			(*box)->closeBox();
 		}
 	};
-	auto filterCallback = [](PeerData *peer) {
-		return peer->canWrite();
-	};
 	*box = Ui::show(
 		Box<ShareBox>(ShareBox::Descriptor{
 			.session = &peer->session(),

Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp

@@ -33,7 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-constexpr auto kPreloadPages = 2;
 constexpr auto kFullArcLength = 360 * 16;
 
 enum class Color {

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp

@@ -133,26 +133,26 @@ std::vector<std::pair<ChatAdminRights, QString>> AdminRightLabels(
 
 	if (isGroup) {
 		return {
-			{ Flag::f_change_info, tr::lng_rights_group_info(tr::now) },
-			{ Flag::f_delete_messages, tr::lng_rights_group_delete(tr::now) },
-			{ Flag::f_ban_users, tr::lng_rights_group_ban(tr::now) },
-			{ Flag::f_invite_users, anyoneCanAddMembers
+			{ Flag::ChangeInfo, tr::lng_rights_group_info(tr::now) },
+			{ Flag::DeleteMessages, tr::lng_rights_group_delete(tr::now) },
+			{ Flag::BanUsers, tr::lng_rights_group_ban(tr::now) },
+			{ Flag::InviteUsers, anyoneCanAddMembers
 				? tr::lng_rights_group_invite_link(tr::now)
 				: tr::lng_rights_group_invite(tr::now) },
-			{ Flag::f_pin_messages, tr::lng_rights_group_pin(tr::now) },
-			{ Flag::f_manage_call, tr::lng_rights_group_manage_calls(tr::now) },
-			{ Flag::f_anonymous, tr::lng_rights_group_anonymous(tr::now) },
-			{ Flag::f_add_admins, tr::lng_rights_add_admins(tr::now) },
+			{ Flag::PinMessages, tr::lng_rights_group_pin(tr::now) },
+			{ Flag::ManageCall, tr::lng_rights_group_manage_calls(tr::now) },
+			{ Flag::Anonymous, tr::lng_rights_group_anonymous(tr::now) },
+			{ Flag::AddAdmins, tr::lng_rights_add_admins(tr::now) },
 		};
 	} else {
 		return {
-			{ Flag::f_change_info, tr::lng_rights_channel_info(tr::now) },
-			{ Flag::f_post_messages, tr::lng_rights_channel_post(tr::now) },
-			{ Flag::f_edit_messages, tr::lng_rights_channel_edit(tr::now) },
-			{ Flag::f_delete_messages, tr::lng_rights_channel_delete(tr::now) },
-			{ Flag::f_invite_users, tr::lng_rights_group_invite(tr::now) },
-			{ Flag::f_manage_call, tr::lng_rights_group_manage_calls(tr::now) },
-			{ Flag::f_add_admins, tr::lng_rights_add_admins(tr::now) }
+			{ Flag::ChangeInfo, tr::lng_rights_channel_info(tr::now) },
+			{ Flag::PostMessages, tr::lng_rights_channel_post(tr::now) },
+			{ Flag::EditMessages, tr::lng_rights_channel_edit(tr::now) },
+			{ Flag::DeleteMessages, tr::lng_rights_channel_delete(tr::now) },
+			{ Flag::InviteUsers, tr::lng_rights_group_invite(tr::now) },
+			{ Flag::ManageCall, tr::lng_rights_group_manage_calls(tr::now) },
+			{ Flag::AddAdmins, tr::lng_rights_add_admins(tr::now) }
 		};
 	}
 }
@@ -163,31 +163,31 @@ auto Dependencies(ChatRestrictions)
 
 	return {
 		// stickers <-> gifs
-		{ Flag::f_send_gifs, Flag::f_send_stickers },
-		{ Flag::f_send_stickers, Flag::f_send_gifs },
+		{ Flag::SendGifs, Flag::SendStickers },
+		{ Flag::SendStickers, Flag::SendGifs },
 
 		// stickers <-> games
-		{ Flag::f_send_games, Flag::f_send_stickers },
-		{ Flag::f_send_stickers, Flag::f_send_games },
+		{ Flag::SendGames, Flag::SendStickers },
+		{ Flag::SendStickers, Flag::SendGames },
 
 		// stickers <-> inline
-		{ Flag::f_send_inline, Flag::f_send_stickers },
-		{ Flag::f_send_stickers, Flag::f_send_inline },
+		{ Flag::SendInline, Flag::SendStickers },
+		{ Flag::SendStickers, Flag::SendInline },
 
-		// stickers -> send_media
-		{ Flag::f_send_stickers, Flag::f_send_messages },
+		// stickers -> send_messages
+		{ Flag::SendStickers, Flag::SendMessages },
 
-		// embed_links -> send_media
-		{ Flag::f_embed_links, Flag::f_send_messages },
+		// embed_links -> send_messages
+		{ Flag::EmbedLinks, Flag::SendMessages },
 
 		// send_media -> send_messages
-		{ Flag::f_send_media, Flag::f_send_messages },
+		{ Flag::SendMedia, Flag::SendMessages },
 
 		// send_polls -> send_messages
-		{ Flag::f_send_polls, Flag::f_send_messages },
+		{ Flag::SendPolls, Flag::SendMessages },
 
 		// send_messages -> view_messages
-		{ Flag::f_send_messages, Flag::f_view_messages },
+		{ Flag::SendMessages, Flag::ViewMessages },
 	};
 }
 
@@ -196,18 +196,18 @@ ChatRestrictions NegateRestrictions(ChatRestrictions value) {
 
 	return (~value) & (Flag(0)
 		// view_messages is always allowed, so it is never in restrictions.
-		//| Flag::f_view_messages
-		| Flag::f_change_info
-		| Flag::f_embed_links
-		| Flag::f_invite_users
-		| Flag::f_pin_messages
-		| Flag::f_send_games
-		| Flag::f_send_gifs
-		| Flag::f_send_inline
-		| Flag::f_send_media
-		| Flag::f_send_messages
-		| Flag::f_send_polls
-		| Flag::f_send_stickers);
+		//| Flag::ViewMessages
+		| Flag::ChangeInfo
+		| Flag::EmbedLinks
+		| Flag::InviteUsers
+		| Flag::PinMessages
+		| Flag::SendGames
+		| Flag::SendGifs
+		| Flag::SendInline
+		| Flag::SendMedia
+		| Flag::SendMessages
+		| Flag::SendPolls
+		| Flag::SendStickers);
 }
 
 auto Dependencies(ChatAdminRights)
@@ -236,15 +236,15 @@ ChatRestrictions DisabledByAdminRights(not_null<PeerData*> peer) {
 		Unexpected("User in DisabledByAdminRights.");
 	}();
 	return Flag(0)
-		| ((adminRights & Admin::f_pin_messages)
+		| ((adminRights & Admin::PinMessages)
 			? Flag(0)
-			: Flag::f_pin_messages)
-		| ((adminRights & Admin::f_invite_users)
+			: Flag::PinMessages)
+		| ((adminRights & Admin::InviteUsers)
 			? Flag(0)
-			: Flag::f_invite_users)
-		| ((adminRights & Admin::f_change_info)
+			: Flag::InviteUsers)
+		| ((adminRights & Admin::ChangeInfo)
 			? Flag(0)
-			: Flag::f_change_info);
+			: Flag::ChangeInfo);
 }
 
 } // namespace
@@ -262,21 +262,21 @@ ChatAdminRights DisabledByDefaultRestrictions(not_null<PeerData*> peer) {
 		Unexpected("User in DisabledByDefaultRestrictions.");
 	}());
 	return Flag(0)
-		| ((restrictions & Restriction::f_pin_messages)
+		| ((restrictions & Restriction::PinMessages)
 			? Flag(0)
-			: Flag::f_pin_messages)
+			: Flag::PinMessages)
 		//
 		// We allow to edit 'invite_users' admin right no matter what
 		// is chosen in default permissions for 'invite_users', because
 		// if everyone can 'invite_users' it handles invite link for admins.
 		//
-		//| ((restrictions & Restriction::f_invite_users)
+		//| ((restrictions & Restriction::InviteUsers)
 		//	? Flag(0)
-		//	: Flag::f_invite_users)
+		//	: Flag::InviteUsers)
 		//
-		| ((restrictions & Restriction::f_change_info)
+		| ((restrictions & Restriction::ChangeInfo)
 			? Flag(0)
-			: Flag::f_change_info);
+			: Flag::ChangeInfo);
 }
 
 ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions) {
@@ -284,15 +284,15 @@ ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions) {
 
 	// Fix iOS bug of saving send_inline like embed_links.
 	// We copy send_stickers to send_inline.
-	if (restrictions & ChatRestriction::f_send_stickers) {
-		restrictions |= ChatRestriction::f_send_inline;
+	if (restrictions & ChatRestriction::SendStickers) {
+		restrictions |= ChatRestriction::SendInline;
 	} else {
-		restrictions &= ~ChatRestriction::f_send_inline;
+		restrictions &= ~ChatRestriction::SendInline;
 	}
 
 	// Apply the strictest.
 	const auto fixOne = [&] {
-		for (const auto [first, second] : dependencies) {
+		for (const auto &[first, second] : dependencies) {
 			if ((restrictions & second) && !(restrictions & first)) {
 				restrictions |= first;
 				return true;
@@ -308,7 +308,7 @@ ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions) {
 ChatAdminRights AdminRightsForOwnershipTransfer(bool isGroup) {
 	auto result = ChatAdminRights();
 	for (const auto &[flag, label] : AdminRightLabels(isGroup, true)) {
-		if (!(flag & ChatAdminRight::f_anonymous)) {
+		if (!(flag & ChatAdminRight::Anonymous)) {
 			result |= flag;
 		}
 	}
@@ -407,7 +407,7 @@ void EditPeerPermissionsBox::prepare() {
 		} else if (const auto channel = _peer->asChannel()) {
 			return channel->defaultRestrictions()
 				| (channel->isPublic()
-					? (Flag::f_change_info | Flag::f_pin_messages)
+					? (Flag::ChangeInfo | Flag::PinMessages)
 					: Flags(0))
 				| disabledByAdminRights;
 		}
@@ -421,7 +421,7 @@ void EditPeerPermissionsBox::prepare() {
 		if (const auto channel = _peer->asChannel()) {
 			if (channel->isPublic()) {
 				result.emplace(
-					Flag::f_change_info | Flag::f_pin_messages,
+					Flag::ChangeInfo | Flag::PinMessages,
 					tr::lng_rights_permission_unavailable(tr::now));
 			}
 		}
@@ -533,7 +533,7 @@ Fn<int()> EditPeerPermissionsBox::addSlowmodeSlider(
 		return has ? aboutInterval : about;
 	});
 
-	const auto about = container->add(
+	container->add(
 		object_ptr<Ui::DividerLabel>(
 			container,
 			object_ptr<Ui::FlatLabel>(
@@ -753,11 +753,11 @@ EditFlagsControl<Flags> CreateEditFlags(
 	};
 }
 
-EditFlagsControl<MTPDchatBannedRights::Flags> CreateEditRestrictions(
+EditFlagsControl<ChatRestrictions> CreateEditRestrictions(
 		QWidget *parent,
 		rpl::producer<QString> header,
-		MTPDchatBannedRights::Flags restrictions,
-		std::map<MTPDchatBannedRights::Flags, QString> disabledMessages) {
+		ChatRestrictions restrictions,
+		std::map<ChatRestrictions, QString> disabledMessages) {
 	auto result = CreateEditFlags(
 		parent,
 		header,
@@ -774,11 +774,11 @@ EditFlagsControl<MTPDchatBannedRights::Flags> CreateEditRestrictions(
 	return result;
 }
 
-EditFlagsControl<MTPDchatAdminRights::Flags> CreateEditAdminRights(
+EditFlagsControl<ChatAdminRights> CreateEditAdminRights(
 		QWidget *parent,
 		rpl::producer<QString> header,
-		MTPDchatAdminRights::Flags rights,
-		std::map<MTPDchatAdminRights::Flags, QString> disabledMessages,
+		ChatAdminRights rights,
+		std::map<ChatAdminRights, QString> disabledMessages,
 		bool isGroup,
 		bool anyoneCanAddMembers) {
 	return CreateEditFlags(

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h

@@ -27,7 +27,7 @@ public:
 		not_null<PeerData*> peer);
 
 	struct Result {
-		MTPDchatBannedRights::Flags rights;
+		ChatRestrictions rights;
 		int slowmodeSeconds = 0;
 	};
 
@@ -59,17 +59,17 @@ struct EditFlagsControl {
 	rpl::producer<Flags> changes;
 };
 
-EditFlagsControl<MTPDchatBannedRights::Flags> CreateEditRestrictions(
+EditFlagsControl<ChatRestrictions> CreateEditRestrictions(
 	QWidget *parent,
 	rpl::producer<QString> header,
-	MTPDchatBannedRights::Flags restrictions,
-	std::map<MTPDchatBannedRights::Flags, QString> disabledMessages);
+	ChatRestrictions restrictions,
+	std::map<ChatRestrictions, QString> disabledMessages);
 
-EditFlagsControl<MTPDchatAdminRights::Flags> CreateEditAdminRights(
+EditFlagsControl<ChatAdminRights> CreateEditAdminRights(
 	QWidget *parent,
 	rpl::producer<QString> header,
-	MTPDchatAdminRights::Flags rights,
-	std::map<MTPDchatAdminRights::Flags, QString> disabledMessages,
+	ChatAdminRights rights,
+	std::map<ChatAdminRights, QString> disabledMessages,
 	bool isGroup,
 	bool anyoneCanAddMembers);
 

Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp

@@ -129,9 +129,6 @@ private:
 		const QString &text,
 		rpl::producer<QString> about);
 
-	bool inviteLinkShown();
-	QString inviteLinkText();
-
 	not_null<PeerData*> _peer;
 	bool _linkOnly = false;
 
@@ -308,15 +305,6 @@ QString Controller::getUsernameInput() {
 	return _controls.usernameInput->getLastText().trimmed();
 }
 
-QString Controller::inviteLinkText() {
-	if (const auto channel = _peer->asChannel()) {
-		return channel->inviteLink();
-	} else if (const auto chat = _peer->asChat()) {
-		return chat->inviteLink();
-	}
-	return QString();
-}
-
 object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 	Expects(_wrap != nullptr);
 
@@ -583,11 +571,6 @@ object_ptr<Ui::RpWidget> Controller::createInviteLinkBlock() {
 	return result;
 }
 
-bool Controller::inviteLinkShown() {
-	return !_controls.privacy
-		|| (_controls.privacy->value() == Privacy::NoUsername);
-}
-
 } // namespace
 
 EditPeerTypeBox::EditPeerTypeBox(

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -68,10 +68,6 @@ inline bool CanAddUrls(const QList<QUrl> &urls) {
 	return !urls.isEmpty() && ranges::all_of(urls, &QUrl::isLocalFile);
 }
 
-inline bool IsSingleItem(const Ui::PreparedList &list) {
-	return list.files.size() == 1;
-}
-
 void FileDialogCallback(
 		FileDialog::OpenResult &&result,
 		Fn<bool(const Ui::PreparedList&)> checkResult,
@@ -543,7 +539,6 @@ void SendFilesBox::pushBlock(int from, int till) {
 		return controller->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Layer);
 	};
-	const auto index = int(_blocks.size());
 	_blocks.emplace_back(
 		_inner.data(),
 		&_list.files,

Telegram/SourceFiles/boxes/share_box.cpp

@@ -27,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_message.h"
 #include "history/view/history_view_schedule_box.h"
-#include "window/themes/window_theme.h"
 #include "window/window_session_controller.h"
 #include "boxes/peer_list_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
@@ -42,7 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 
-class ShareBox::Inner final : public Ui::RpWidget, private base::Subscriber {
+class ShareBox::Inner final : public Ui::RpWidget {
 public:
 	Inner(QWidget *parent, const Descriptor &descriptor);
 
@@ -598,11 +597,10 @@ ShareBox::Inner::Inner(QWidget *parent, const Descriptor &descriptor)
 		update();
 	}, lifetime());
 
-	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
-		if (update.paletteChanged()) {
-			invalidateCache();
-		}
-	});
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		invalidateCache();
+	}, lifetime());
 }
 
 void ShareBox::Inner::invalidateCache() {
@@ -1113,7 +1111,6 @@ QString AppendShareGameScoreUrl(
 		? session->data().channelLoaded(fullId.channel)
 		: static_cast<ChannelData*>(nullptr);
 	auto channelAccessHash = uint64(channel ? channel->access : 0);
-	auto channelAccessHashInts = reinterpret_cast<int32*>(&channelAccessHash);
 	shareHashDataInts[0] = session->userId().bare;
 	shareHashDataInts[1] = fullId.channel.bare;
 	shareHashDataInts[2] = fullId.msg;

Telegram/SourceFiles/boxes/sticker_set_box.cpp

@@ -51,15 +51,16 @@ constexpr auto kStickersPanelPerRow = 5;
 using Data::StickersSet;
 using Data::StickersPack;
 using Data::StickersByEmojiMap;
+using SetFlag = Data::StickersSetFlag;
 
 } // namespace
 
-class StickerSetBox::Inner : public Ui::RpWidget, private base::Subscriber {
+class StickerSetBox::Inner final : public Ui::RpWidget {
 public:
 	Inner(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		const MTPInputStickerSet &set);
+		const StickerSetIdentifier &set);
 
 	bool loaded() const;
 	bool notInstalled() const;
@@ -77,7 +78,7 @@ public:
 	void archiveStickers();
 
 	bool isMasksSet() const {
-		return (_setFlags & MTPDstickerSet::Flag::f_masks);
+		return (_setFlags & SetFlag::Masks);
 	}
 
 	~Inner();
@@ -128,13 +129,13 @@ private:
 	QString _setTitle, _setShortName;
 	int _setCount = 0;
 	int32 _setHash = 0;
-	MTPDstickerSet::Flags _setFlags = 0;
+	Data::StickersSetFlags _setFlags;
 	TimeId _setInstallDate = TimeId(0);
 	ImageWithLocation _setThumbnail;
 
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
 
-	MTPInputStickerSet _input;
+	StickerSetIdentifier _input;
 
 	mtpRequestId _installRequest = 0;
 
@@ -153,7 +154,7 @@ private:
 StickerSetBox::StickerSetBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
-	const MTPInputStickerSet &set)
+	const StickerSetIdentifier &set)
 : _controller(controller)
 , _set(set) {
 }
@@ -162,7 +163,7 @@ QPointer<Ui::BoxContent> StickerSetBox::Show(
 		not_null<Window::SessionController*> controller,
 		not_null<DocumentData*> document) {
 	if (const auto sticker = document->sticker()) {
-		if (sticker->set.type() != mtpc_inputStickerSetEmpty) {
+		if (sticker->set) {
 			return controller->show(
 				Box<StickerSetBox>(controller, sticker->set),
 				Ui::LayerOption::KeepOther).data();
@@ -344,28 +345,21 @@ void StickerSetBox::resizeEvent(QResizeEvent *e) {
 StickerSetBox::Inner::Inner(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	const MTPInputStickerSet &set)
+	const StickerSetIdentifier &set)
 : RpWidget(parent)
 , _controller(controller)
 , _api(&_controller->session().mtp())
+, _setId(set.id)
+, _setAccess(set.accessHash)
+, _setShortName(set.shortName)
 , _pathGradient(std::make_unique<Ui::PathShiftGradient>(
 	st::windowBgRipple,
 	st::windowBgOver,
 	[=] { update(); }))
 , _input(set)
 , _previewTimer([=] { showPreview(); }) {
-	set.match([&](const MTPDinputStickerSetID &data) {
-		_setId = data.vid().v;
-		_setAccess = data.vaccess_hash().v;
-	}, [&](const MTPDinputStickerSetShortName &data) {
-		_setShortName = qs(data.vshort_name());
-	}, [](const MTPDinputStickerSetEmpty &) {
-	}, [](const MTPDinputStickerSetAnimatedEmoji &) {
-	}, [](const MTPDinputStickerSetDice &) {
-	});
-
 	_api.request(MTPmessages_GetStickerSet(
-		_input
+		Data::InputStickerSet(_input)
 	)).done([=](const MTPmessages_StickerSet &result) {
 		gotSet(result);
 	}).fail([=](const MTP::Error &error) {
@@ -428,7 +422,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			_setAccess = set.vaccess_hash().v;
 			_setCount = set.vcount().v;
 			_setHash = set.vhash().v;
-			_setFlags = set.vflags().v;
+			_setFlags = Data::ParseStickersSetFlags(set);
 			_setInstallDate = set.vinstalled_date().value_or(0);
 			_setThumbnail = [&] {
 				if (const auto thumbs = set.vthumbs()) {
@@ -448,12 +442,11 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			const auto it = sets.find(_setId);
 			if (it != sets.cend()) {
 				const auto set = it->second.get();
-				using ClientFlag = MTPDstickerSet_ClientFlag;
 				const auto clientFlags = set->flags
-					& (ClientFlag::f_featured
-						| ClientFlag::f_not_loaded
-						| ClientFlag::f_unread
-						| ClientFlag::f_special);
+					& (SetFlag::Featured
+						| SetFlag::NotLoaded
+						| SetFlag::Unread
+						| SetFlag::Special);
 				_setFlags |= clientFlags;
 				set->flags = _setFlags;
 				set->installDate = _setInstallDate;
@@ -499,7 +492,7 @@ void StickerSetBox::Inner::installDone(
 	auto &sets = stickers.setsRef();
 	const auto isMasks = isMasksSet();
 
-	const bool wasArchived = (_setFlags & MTPDstickerSet::Flag::f_archived);
+	const bool wasArchived = (_setFlags & SetFlag::Archived);
 	if (wasArchived) {
 		const auto index = (isMasks
 			? stickers.archivedMaskSetsOrderRef()
@@ -511,8 +504,8 @@ void StickerSetBox::Inner::installDone(
 		}
 	}
 	_setInstallDate = base::unixtime::now();
-	_setFlags &= ~MTPDstickerSet::Flag::f_archived;
-	_setFlags |= MTPDstickerSet::Flag::f_installed_date;
+	_setFlags &= ~SetFlag::Archived;
+	_setFlags |= SetFlag::Installed;
 	auto it = sets.find(_setId);
 	if (it == sets.cend()) {
 		it = sets.emplace(
@@ -695,8 +688,6 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 		return;
 	}
 
-	int32 rows = (_elements.size() / kStickersPanelPerRow)
-		+ ((_elements.size() % kStickersPanelPerRow) ? 1 : 0);
 	int32 from = qFloor(e->rect().top() / st::stickersSize.height()), to = qFloor(e->rect().bottom() / st::stickersSize.height()) + 1;
 
 	_pathGradient->startFrame(0, width(), width() / 2);
@@ -770,7 +761,6 @@ void StickerSetBox::Inner::visibleTopBottomUpdated(
 
 void StickerSetBox::Inner::setupLottie(int index) {
 	auto &element = _elements[index];
-	const auto document = element.document;
 
 	element.animated = ChatHelpers::LottieAnimationFromDocument(
 		getLottiePlayer(),
@@ -850,8 +840,8 @@ bool StickerSetBox::Inner::notInstalled() const {
 	const auto &sets = _controller->session().data().stickers().sets();
 	const auto it = sets.find(_setId);
 	if ((it == sets.cend())
-		|| !(it->second->flags & MTPDstickerSet::Flag::f_installed_date)
-		|| (it->second->flags & MTPDstickerSet::Flag::f_archived)) {
+		|| !(it->second->flags & SetFlag::Installed)
+		|| (it->second->flags & SetFlag::Archived)) {
 		return !_pack.empty();
 	}
 	return false;
@@ -881,7 +871,7 @@ void StickerSetBox::Inner::install() {
 		return;
 	}
 	_installRequest = _api.request(MTPmessages_InstallStickerSet(
-		_input,
+		Data::InputStickerSet(_input),
 		MTP_bool(false)
 	)).done([=](const MTPmessages_StickerSetInstallResult &result) {
 		installDone(result);
@@ -892,7 +882,7 @@ void StickerSetBox::Inner::install() {
 
 void StickerSetBox::Inner::archiveStickers() {
 	_api.request(MTPmessages_InstallStickerSet(
-		_input,
+		Data::InputStickerSet(_input),
 		MTP_boolTrue()
 	)).done([=](const MTPmessages_StickerSetInstallResult &result) {
 		if (result.type() == mtpc_messages_stickerSetInstallResultSuccess) {

Telegram/SourceFiles/boxes/sticker_set_box.h

@@ -26,7 +26,7 @@ public:
 	StickerSetBox(
 		QWidget*,
 		not_null<Window::SessionController*> controller,
-		const MTPInputStickerSet &set);
+		const StickerSetIdentifier &set);
 
 	static QPointer<Ui::BoxContent> Show(
 		not_null<Window::SessionController*> controller,
@@ -49,7 +49,7 @@ private:
 	void handleError(Error error);
 
 	const not_null<Window::SessionController*> _controller;
-	MTPInputStickerSet _set;
+	const StickerSetIdentifier _set;
 
 	class Inner;
 	QPointer<Inner> _inner;

Telegram/SourceFiles/boxes/stickers_box.cpp

@@ -45,6 +45,7 @@ namespace {
 using Data::StickersSet;
 using Data::StickersSetsOrder;
 using Data::StickersSetThumbnailView;
+using SetFlag = Data::StickersSetFlag;
 
 constexpr auto kArchivedLimitFirstRequest = 10;
 constexpr auto kArchivedLimitPerPage = 30;
@@ -233,7 +234,7 @@ private:
 	void rebuildMegagroupSet();
 	void fixupMegagroupSetAddress();
 	void handleMegagroupSetAddressChange();
-	void setMegagroupSelectedSet(const MTPInputStickerSet &set);
+	void setMegagroupSelectedSet(const StickerSetIdentifier &set);
 
 	int countMaxNameWidth() const;
 
@@ -284,7 +285,7 @@ private:
 
 	int _scrollbar = 0;
 	ChannelData *_megagroupSet = nullptr;
-	MTPInputStickerSet _megagroupSetInput = MTP_inputStickerSetEmpty();
+	StickerSetIdentifier _megagroupSetInput;
 	std::unique_ptr<Row> _megagroupSelectedSet;
 	object_ptr<AddressField> _megagroupSetField = { nullptr };
 	object_ptr<Ui::PlainShadow> _megagroupSelectedShadow = { nullptr };
@@ -429,8 +430,11 @@ void StickersBox::showAttachedStickers() {
 		if (const auto set = session().data().stickers().feedSet(*setData)) {
 			if (_attached.widget()->appendSet(set)) {
 				addedSet = true;
-				if (set->stickers.isEmpty() || (set->flags & MTPDstickerSet_ClientFlag::f_not_loaded)) {
-					session().api().scheduleStickerSetRequest(set->id, set->access);
+				if (set->stickers.isEmpty()
+					|| (set->flags & SetFlag::NotLoaded)) {
+					session().api().scheduleStickerSetRequest(
+						set->id,
+						set->access);
 				}
 			}
 		}
@@ -495,8 +499,11 @@ void StickersBox::getArchivedDone(
 			}
 			if (_archived.widget()->appendSet(set)) {
 				addedSet = true;
-				if (set->stickers.isEmpty() || (set->flags & MTPDstickerSet_ClientFlag::f_not_loaded)) {
-					session().api().scheduleStickerSetRequest(set->id, set->access);
+				if (set->stickers.isEmpty()
+					|| (set->flags & SetFlag::NotLoaded)) {
+					session().api().scheduleStickerSetRequest(
+						set->id,
+						set->access);
 				}
 			}
 		}
@@ -682,7 +689,7 @@ void StickersBox::loadMoreArchived() {
 		--setIt;
 		auto it = sets.find(*setIt);
 		if (it != sets.cend()) {
-			if (it->second->flags & MTPDstickerSet::Flag::f_archived) {
+			if (it->second->flags & SetFlag::Archived) {
 				lastId = it->second->id;
 				break;
 			}
@@ -834,8 +841,8 @@ void StickersBox::installSet(uint64 setId) {
 			}
 		}
 	}
-	if (!(set->flags & MTPDstickerSet::Flag::f_installed_date)
-		|| (set->flags & MTPDstickerSet::Flag::f_archived)) {
+	if (!(set->flags & SetFlag::Installed)
+		|| (set->flags & SetFlag::Archived)) {
 		_api.request(MTPmessages_InstallStickerSet(
 			set->mtpInput(),
 			MTP_boolFalse()
@@ -896,7 +903,8 @@ void StickersBox::requestArchivedSets() {
 		auto it = sets.find(setId);
 		if (it != sets.cend()) {
 			const auto set = it->second.get();
-			if (set->stickers.isEmpty() && (set->flags & MTPDstickerSet_ClientFlag::f_not_loaded)) {
+			if (set->stickers.isEmpty()
+				&& (set->flags & SetFlag::NotLoaded)) {
 				session().api().scheduleStickerSetRequest(setId, set->access);
 			}
 		}
@@ -1042,7 +1050,7 @@ bool StickersBox::Inner::Row::isRecentSet() const {
 }
 
 bool StickersBox::Inner::Row::isMasksSet() const {
-	return (set->flags & MTPDstickerSet::Flag::f_masks);
+	return (set->flags & SetFlag::Masks);
 }
 
 StickersBox::Inner::Inner(
@@ -1694,7 +1702,6 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 			_installSetCallback(_rows[_actionDown]->set->id);
 		}
 	} else if (_dragging >= 0) {
-		QPoint local(mapFromGlobal(_mouse));
 		_rows[_dragging]->yadd.start(0.);
 		_aboveShadowFadeStart = _shiftingStartTimes[_dragging] = crl::now();
 		_aboveShadowFadeOpacity = anim::value(aboveShadowOpacity(), 0);
@@ -1713,14 +1720,14 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 		const auto showSetByRow = [&](const Row &row) {
 			setSelected(SelectedRow());
 			_controller->show(
-				Box<StickerSetBox>(_controller, row.set->mtpInput()),
+				Box<StickerSetBox>(_controller, row.set->identifier()),
 				Ui::LayerOption::KeepOther);
 		};
 		if (selectedIndex >= 0 && !_inDragArea) {
 			const auto row = _rows[selectedIndex].get();
 			if (!row->isRecentSet()) {
 				if (_megagroupSet) {
-					setMegagroupSelectedSet(row->set->mtpInput());
+					setMegagroupSelectedSet(row->set->identifier());
 				} else {
 					showSetByRow(*row);
 				}
@@ -1735,12 +1742,8 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 void StickersBox::Inner::saveGroupSet() {
 	Expects(_megagroupSet != nullptr);
 
-	auto oldId = (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetID)
-		? _megagroupSet->mgInfo->stickerSet.c_inputStickerSetID().vid().v
-		: 0;
-	auto newId = (_megagroupSetInput.type() == mtpc_inputStickerSetID)
-		? _megagroupSetInput.c_inputStickerSetID().vid().v
-		: 0;
+	auto oldId = _megagroupSet->mgInfo->stickerSet.id;
+	auto newId = _megagroupSetInput.id;
 	if (newId != oldId) {
 		session().api().setGroupStickerSet(_megagroupSet, _megagroupSetInput);
 		session().data().stickers().notifyStickerSetInstalled(
@@ -1877,7 +1880,7 @@ void StickersBox::Inner::handleMegagroupSetAddressChange() {
 			const auto &sets = session().data().stickers().sets();
 			const auto it = sets.find(_megagroupSelectedSet->set->id);
 			if (it != sets.cend() && !it->second->shortName.isEmpty()) {
-				setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
+				setMegagroupSelectedSet({});
 			}
 		}
 	} else if (!_megagroupSetRequestId) {
@@ -1886,12 +1889,10 @@ void StickersBox::Inner::handleMegagroupSetAddressChange() {
 		)).done([=](const MTPmessages_StickerSet &result) {
 			_megagroupSetRequestId = 0;
 			auto set = session().data().stickers().feedSetFull(result);
-			setMegagroupSelectedSet(MTP_inputStickerSetID(
-				MTP_long(set->id),
-				MTP_long(set->access)));
+			setMegagroupSelectedSet(set->identifier());
 		}).fail([=](const MTP::Error &error) {
 			_megagroupSetRequestId = 0;
-			setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
+			setMegagroupSelectedSet({});
 		}).send();
 	} else {
 		_megagroupSetAddressChangedTimer.callOnce(kHandleMegagroupSetAddressChangeTimeout);
@@ -1900,7 +1901,8 @@ void StickersBox::Inner::handleMegagroupSetAddressChange() {
 
 void StickersBox::Inner::rebuildMegagroupSet() {
 	Expects(_megagroupSet != nullptr);
-	if (_megagroupSetInput.type() != mtpc_inputStickerSetID) {
+
+	if (!_megagroupSetInput.id) {
 		if (_megagroupSelectedSet) {
 			_megagroupSetField->setText(QString());
 			_megagroupSetField->finishAnimating();
@@ -1910,15 +1912,14 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 		_megagroupSelectedShadow.destroy();
 		return;
 	}
-	auto &inputId = _megagroupSetInput.c_inputStickerSetID();
-	auto setId = inputId.vid().v;
+	auto setId = _megagroupSetInput.id;
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
 	if (it == sets.cend()
-		|| (it->second->flags & MTPDstickerSet_ClientFlag::f_not_loaded)) {
+		|| (it->second->flags & SetFlag::NotLoaded)) {
 		session().api().scheduleStickerSetRequest(
-			inputId.vid().v,
-			inputId.vaccess_hash().v);
+			_megagroupSetInput.id,
+			_megagroupSetInput.accessHash);
 		return;
 	}
 
@@ -1954,7 +1955,7 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 		_megagroupSelectedRemove.create(this, st::groupStickersRemove);
 		_megagroupSelectedRemove->show(anim::type::instant);
 		_megagroupSelectedRemove->setClickedCallback([this] {
-			setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
+			setMegagroupSelectedSet({});
 		});
 		_megagroupSelectedShadow.create(this);
 		updateControlsGeometry();
@@ -2017,7 +2018,7 @@ void StickersBox::Inner::rebuild(bool masks) {
 		rebuildAppendSet(set, maxNameWidth);
 
 		if (set->stickers.isEmpty()
-			|| (set->flags & MTPDstickerSet_ClientFlag::f_not_loaded)) {
+			|| (set->flags & SetFlag::NotLoaded)) {
 			session().api().scheduleStickerSetRequest(set->id, set->access);
 		}
 	}
@@ -2025,7 +2026,7 @@ void StickersBox::Inner::rebuild(bool masks) {
 	updateSize();
 }
 
-void StickersBox::Inner::setMegagroupSelectedSet(const MTPInputStickerSet &set) {
+void StickersBox::Inner::setMegagroupSelectedSet(const StickerSetIdentifier &set) {
 	_megagroupSetInput = set;
 	rebuild(false);
 	_scrollsToY.fire(0);
@@ -2232,11 +2233,11 @@ void StickersBox::Inner::fillSetFlags(
 		bool *outOfficial,
 		bool *outUnread,
 		bool *outArchived) {
-	*outInstalled = (set->flags & MTPDstickerSet::Flag::f_installed_date);
-	*outOfficial = (set->flags & MTPDstickerSet::Flag::f_official);
-	*outArchived = (set->flags & MTPDstickerSet::Flag::f_archived);
+	*outInstalled = (set->flags & SetFlag::Installed);
+	*outOfficial = (set->flags & SetFlag::Official);
+	*outArchived = (set->flags & SetFlag::Archived);
 	if (_section == Section::Featured) {
-		*outUnread = (set->flags & MTPDstickerSet_ClientFlag::f_unread);
+		*outUnread = (set->flags & SetFlag::Unread);
 	} else {
 		*outUnread = false;
 	}

Telegram/SourceFiles/boxes/stickers_box.h

@@ -49,7 +49,7 @@ namespace Stickers {
 class Set;
 } // namespace Stickers
 
-class StickersBox final : public Ui::BoxContent, private base::Subscriber {
+class StickersBox final : public Ui::BoxContent {
 public:
 	enum class Section {
 		Installed,

Telegram/SourceFiles/calls/calls.style

@@ -1184,6 +1184,16 @@ desktopCaptureSubmit: RoundButton(desktopCaptureCancel) {
 		color: shadowFg;
 	}
 }
+desktopCaptureWithAudio: Checkbox(defaultCheckbox) {
+	textFg: groupCallMembersFg;
+	textFgActive: groupCallMembersFg;
+	rippleBg: groupCallMembersBgRipple;
+	rippleBgActive: groupCallMembersBgRipple;
+	style: semiboldTextStyle;
+}
+desktopCaptureWithAudioCheck: Check(defaultCheck) {
+	untoggledFg: groupCallActiveFg;
+}
 
 groupCallNarrowSkip: 9px;
 groupCallNarrowMembersWidth: 204px;

Telegram/SourceFiles/calls/calls_box_controller.h

@@ -16,7 +16,7 @@ class SessionController;
 
 namespace Calls {
 
-class BoxController : public PeerListController, private base::Subscriber {
+class BoxController : public PeerListController {
 public:
 	explicit BoxController(not_null<Window::SessionController*> window);
 

Telegram/SourceFiles/calls/calls_instance.h

@@ -43,7 +43,7 @@ class GroupCall;
 class Panel;
 struct DhConfig;
 
-class Instance : private base::Subscriber, public base::has_weak_ptr {
+class Instance final : public base::has_weak_ptr {
 public:
 	Instance();
 	~Instance();

Telegram/SourceFiles/calls/calls_panel.cpp

@@ -116,9 +116,7 @@ void Panel::replaceCall(not_null<Call*> call) {
 void Panel::initWindow() {
 	window()->setAttribute(Qt::WA_OpaquePaintEvent);
 	window()->setAttribute(Qt::WA_NoSystemBackground);
-	window()->setWindowIcon(
-		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
-	window()->setTitle(u" "_q);
+	window()->setTitle(_user->name);
 	window()->setTitleStyle(st::callTitle);
 
 	window()->events(

Telegram/SourceFiles/calls/calls_top_bar.cpp

@@ -48,7 +48,6 @@ enum class BarState {
 
 namespace {
 
-constexpr auto kMaxUsersInBar = 3;
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
 constexpr auto kSwitchStateDuration = 120;
 

Telegram/SourceFiles/calls/calls_video_incoming.cpp

@@ -210,8 +210,8 @@ void Panel::Incoming::RendererGL::paint(
 		if (upload) {
 			uploadTexture(
 				f,
-				GL_RGBA,
-				GL_RGBA,
+				Ui::GL::kFormatRGBA,
+				Ui::GL::kFormatRGBA,
 				data.original.size(),
 				_rgbaSize,
 				data.original.bytesPerLine() / 4,
@@ -223,7 +223,6 @@ void Panel::Incoming::RendererGL::paint(
 		Assert(data.format == Webrtc::FrameFormat::YUV420);
 		Assert(!data.yuv420->size.isEmpty());
 		const auto yuv = data.yuv420;
-		const auto format = Ui::GL::CurrentSingleComponentFormat();
 
 		f.glActiveTexture(GL_TEXTURE0);
 		_textures.bind(f, 1);
@@ -231,8 +230,8 @@ void Panel::Incoming::RendererGL::paint(
 			f.glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->size,
 				_lumaSize,
 				yuv->y.stride,
@@ -244,8 +243,8 @@ void Panel::Incoming::RendererGL::paint(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				_chromaSize,
 				yuv->u.stride,
@@ -256,8 +255,8 @@ void Panel::Incoming::RendererGL::paint(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				_chromaSize,
 				yuv->v.stride,