Version 2.4.5: Fix build on Xcode 12 and Linux.

- Pin several messages in any chat, including one-on-one chats.
- Jump between pinned messages or open them all on a separate page.
- Send several music tracks as a playlist.
- Send several files as an album in one chat bubble.
- Send a 🎰 emoji to any chat to see if you hit the jackpot.
- Hide Telegram taskbar icon on Linux in Settings > Advanced.

.github/stale.yml

@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels: []
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: |
+  Hey there!
+
+  This issue was inactive for a long time and will be automatically closed in 30 days if there isn't any further activity. We therefore assume that the user has lost interest or resolved the problem on their own.
+
+  Don't worry though; if this is an error, let us know with a comment and we'll be happy to reopen the issue.
+
+  Thanks!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+# Process only issues
+only: issues

.github/workflows/docker.yml

@@ -0,0 +1,25 @@
+name: Docker.
+
+on:
+  push:
+    paths:
+      - '.github/workflows/docker.yml'
+      - 'Telegram/build/docker/centos_env/**'
+  pull_request:
+    paths:
+      - '.github/workflows/docker.yml'
+      - 'Telegram/build/docker/centos_env/**'
+
+jobs:
+  docker:
+    name: Ubuntu
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone.
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Docker image build.
+        run: docker build -t telegram_desktop Telegram/build/docker/centos_env

.github/workflows/issue_closer.yml

@@ -12,7 +12,7 @@ jobs:
         run: |
           tag=$(git ls-remote --tags git://github.com/$GITHUB_REPOSITORY | cut -f 2 | tail -n1)
           echo $tag
-          echo ::set-env name=LATEST_TAG::$tag
+          echo "LATEST_TAG=$tag" >> $GITHUB_ENV
 
       - name: Get the latest macOS version.
         shell: python
@@ -28,7 +28,7 @@ jobs:
           ver = itemlist[0].attributes['sparkle:shortVersionString'].value;
           print(ver);
 
-          subprocess.check_call("echo ::set-env name=%s::%s" % ("LATEST_MACOS", ver), shell=True);
+          open(os.environ['GITHUB_ENV'], "a").write("LATEST_MACOS=" + ver);
 
       - name: Check a version from an issue.
         uses: actions/github-script@0.4.0

.github/workflows/linux.yml

@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Get repository name.
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Disable man for further package installs.
         run: |
@@ -97,7 +97,7 @@ jobs:
           autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
           libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
           libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
-          libxcb-screensaver0-dev libjpeg-dev \
+          libxcb-screensaver0-dev libjpeg-dev ninja-build \
           libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
           libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
           libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
@@ -129,11 +129,11 @@ jobs:
             echo `md5sum $thisFile | cut -c -32` >> CACHE_KEY.txt
           fi
           md5cache=$(md5sum CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=CACHE_KEY::$md5cache
+          echo "CACHE_KEY=$md5cache" >> $GITHUB_ENV
 
           mkdir -p Libraries
           cd Libraries
-          echo ::set-env name=LibrariesPath::`pwd`
+          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
       - name: Patches.
         run: |
@@ -157,6 +157,22 @@ jobs:
 
           cmake --version
 
+      - name: MozJPEG.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b v4.0.1-rc2 $GIT/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake -B build . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_JPEG8=ON \
+          -DPNG_SUPPORTED=OFF
+          cmake --build build -j$(nproc)
+          sudo cmake --install build
+          cd ..
+          rm -rf mozjpeg
+
       - name: Opus cache.
         id: cache-opus
         uses: actions/cache@v2
@@ -182,7 +198,7 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/01org/libva.git
+          git clone $GIT/intel/libva.git
           cd libva
           ./autogen.sh --enable-static
           make -j$(nproc)
@@ -222,7 +238,6 @@ jobs:
           --disable-network \
           --disable-autodetect \
           --disable-everything \
-          --disable-neon \
           --disable-alsa \
           --disable-iconv \
           --enable-libopus \
@@ -440,10 +455,10 @@ jobs:
           -confirm-license \
           -qt-zlib \
           -qt-libpng \
-          -qt-libjpeg \
           -qt-harfbuzz \
           -qt-pcre \
           -qt-xcb \
+          -no-icu \
           -no-gtk \
           -static \
           -dbus-runtime \
@@ -518,48 +533,33 @@ jobs:
         id: cache-webrtc
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/webrtc
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          # # OpenSSL.
-          # opensslDir=openssl_${OPENSSL_VER}
-          # mkdir $opensslDir
-          # cp -R $OPENSSL_PREFIX/ $opensslDir/
-          # cd openssl-cache
-          # cp $(find . | grep libssl.a) $LibrariesPath/$opensslDir
-          # cp $(find . | grep libcrypto.a) $LibrariesPath/$opensslDir
-
-          # cd $LibrariesPath
-
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-          export PATH=`pwd`/depot_tools:$PATH
-
-          mkdir webrtc
-          cd webrtc
-          cp ../patches/webrtc/.gclient ./
-          git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
-          gclient sync --no-history
-
-          applyPatch() {
-            cd $LibrariesPath/webrtc/$1
-            git apply $LibrariesPath/patches/webrtc/$(basename $1).diff
-          }
-          applyPatch src
-          applyPatch src/build
-          applyPatch src/third_party
-          applyPatch src/third_party/libsrtp
-
-          cd $LibrariesPath/webrtc/src
-          ../../patches/webrtc/configure.sh
-
-          ninja -C out/Debug webrtc
+          git clone $GIT/desktop-app/tg_owt.git
+          mkdir -p tg_owt/out/Debug
+          cd tg_owt/out/Debug
+          cmake -G Ninja \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DTG_OWT_SPECIAL_TARGET=linux \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
+          -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
+          ../..
+          ninja
 
           # Cleanup.
-          ../../patches/webrtc/cleanup_webrtc.sh
+          cd $LibrariesPath/tg_owt
+          mv out/Debug/libtg_owt.a libtg_owt.a
+          rm -rf out
+          mkdir -p out/Debug
+          mv libtg_owt.a out/Debug/libtg_owt.a
+
           rm -rf $LibrariesPath/openssl_${OPENSSL_VER}
 
       - name: Telegram Desktop build.
@@ -571,9 +571,9 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
           ./configure.sh \

.github/workflows/mac.yml

@@ -69,7 +69,7 @@ jobs:
 
     steps:
       - name: Get repository name.
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
         uses: actions/checkout@v2
@@ -94,13 +94,13 @@ jobs:
             thisFile=$REPO_NAME/.github/workflows/mac.yml
             echo `md5 -q $thisFile` >> CACHE_KEY.txt
           fi
-          echo ::set-env name=CACHE_KEY::`md5 -q CACHE_KEY.txt`
+          echo "CACHE_KEY=`md5 -q CACHE_KEY.txt`" >> $GITHUB_ENV
 
-          echo ::add-path::$PWD/Libraries/depot_tools
+          echo "$PWD/Libraries/depot_tools" >> $GITHUB_PATH
 
           mkdir -p Libraries/macos
           cd Libraries/macos
-          echo ::set-env name=LibrariesPath::`pwd`
+          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
       - name: Patches.
         run: |
@@ -132,6 +132,20 @@ jobs:
           make -j$(nproc)
           sudo make install
 
+      - name: MozJPEG.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b v4.0.1-rc2 $GIT/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake -B build . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
+          -DWITH_JPEG8=ON \
+          -DPNG_SUPPORTED=OFF
+          cmake --build build -j$(nproc)
+          sudo cmake --install build
+
       - name: OpenSSL cache.
         id: cache-openssl
         uses: actions/cache@v2
@@ -154,7 +168,7 @@ jobs:
           $MIN_MAC
           make build_libs -j$(nproc)
 
-          SSL_DIR=$LibrariesPath/openssl_${{ env.OPENSSL_VER }}
+          SSL_DIR=$LibrariesPath/openssl_$OPENSSL_VER
           mkdir -p $SSL_DIR/include
           copyLib() {
             cp $1.a $SSL_DIR/$1.a
@@ -167,7 +181,7 @@ jobs:
         id: cache-opus
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/opus
+          path: ${{ env.LibrariesPath }}/opus-cache
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
       - name: Opus.
         if: steps.cache-opus.outputs.cache-hit != 'true'
@@ -180,16 +194,17 @@ jobs:
           ./autogen.sh
           CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --prefix=$PREFIX
           make -j$(nproc)
+          sudo make DESTDIR="$LibrariesPath/opus-cache" install
       - name: Opus install.
         run: |
-          cd $LibrariesPath/opus
-          sudo make install
+          cd $LibrariesPath
+          sudo cp -R opus-cache/. /
 
       - name: Libiconv cache.
         id: cache-libiconv
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/${{ env.LIBICONV_VER }}
+          path: ${{ env.LibrariesPath }}/libiconv-cache
           key: ${{ runner.OS }}-${{ env.LIBICONV_VER }}-${{ env.CACHE_KEY }}
       - name: Libiconv.
         if: steps.cache-libiconv.outputs.cache-hit != 'true'
@@ -201,10 +216,11 @@ jobs:
           cd $LIBICONV_VER
           CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --enable-static --prefix=$PREFIX
           make -j$(nproc)
+          sudo make DESTDIR="$LibrariesPath/libiconv-cache" install
       - name: Libiconv install.
         run: |
-          cd $LibrariesPath/$LIBICONV_VER
-          sudo make install
+          cd $LibrariesPath
+          sudo cp -R libiconv-cache/. /
 
       - name: FFmpeg cache.
         id: cache-ffmpeg
@@ -441,7 +457,10 @@ jobs:
           -securetransport \
           -nomake examples \
           -nomake tests \
-          -platform macx-clang
+          -platform macx-clang \
+          -I "/usr/local/macos/include" \
+          LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
+          ZLIB_LIBS="/usr/local/macos/lib/libz.a"
 
           make -j$(nproc)
           sudo make install
@@ -453,36 +472,31 @@ jobs:
         id: cache-webrtc
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/webrtc
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-          export PATH=`pwd`/depot_tools:$PATH
+          git clone $GIT/desktop-app/tg_owt.git
+          mkdir -p tg_owt/out/Debug
+          cd tg_owt/out/Debug
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
+          -DTG_OWT_SPECIAL_TARGET=mac \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \
+          -DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
+          ../..
+          ninja
 
-          mkdir webrtc
-          cd webrtc
-          cp ../patches/webrtc/.gclient ./
-          git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
-          gclient sync --no-history
-
-          applyPatch() {
-            cd $LibrariesPath/webrtc/$1
-            git apply $LibrariesPath/patches/webrtc/$(basename $1).diff
-          }
-          applyPatch src
-          applyPatch src/build
-          applyPatch src/third_party
-          applyPatch src/third_party/libsrtp
-
-          cd $LibrariesPath/webrtc/src
-          ../../patches/webrtc/configure.sh
-
-          ninja -C out/Debug webrtc
-          ../../patches/webrtc/cleanup_webrtc.sh
+          # Cleanup.
+          cd $LibrariesPath/tg_owt
+          mv out/Debug/libtg_owt.a libtg_owt.a
+          rm -rf out
+          mkdir -p out/Debug
+          mv libtg_owt.a out/Debug/libtg_owt.a
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
@@ -493,9 +507,9 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
           ./configure.sh \

.github/workflows/snap.yml

@@ -12,7 +12,6 @@ on:
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
       - 'Telegram/Patches/**'
-      - '!Telegram/Patches/ffmpeg.diff'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -31,7 +30,6 @@ on:
       - '!.github/workflows/snap.yml'
       - 'Telegram/build/**'
       - 'Telegram/Patches/**'
-      - '!Telegram/Patches/ffmpeg.diff'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -43,8 +41,8 @@ on:
 jobs:
 
   linux:
-    name: Ubuntu 20.04
-    runs-on: ubuntu-20.04
+    name: Ubuntu
+    runs-on: ubuntu-latest
 
     env:
       UPLOAD_ARTIFACT: "false"
@@ -57,7 +55,10 @@ jobs:
 
       - name: First set up.
         run: |
+          sudo apt-get purge --autoremove lxd
+
           sudo snap install --classic snapcraft
+          sudo snap install lxd
 
           # Workaround for snapcraft
           # See https://forum.snapcraft.io/t/13258
@@ -75,7 +76,7 @@ jobs:
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
           artifact_name=$(echo telegram-desktop_*.snap)
-          echo ::set-env name=ARTIFACT_NAME::$artifact_name
+          echo "ARTIFACT_NAME=$artifact_name" >> $GITHUB_ENV
 
           mkdir artifact
           mv $artifact_name artifact

.github/workflows/user_agent_updater.yml

@@ -0,0 +1,154 @@
+name: User-agent updater.
+
+on:
+  repository_dispatch:
+    types: ["Restart user_agent_updater workflow."]
+  schedule:
+    # At 00:00 on day-of-month 1.
+    - cron: '0 0 1 * *'
+  pull_request_target:
+    types: [closed]
+
+jobs:
+  User-agent:
+    runs-on: ubuntu-latest
+
+    env:
+      codeFile: "Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp"
+      headBranchPrefix: "chrome_"
+      baseBranch: "dev"
+      isPull: "0"
+
+    steps:
+      - name: Set env.
+        if: startsWith(github.event_name, 'pull_request')
+        run: |
+          echo "isPull=1" >> $GITHUB_ENV
+
+      - name: Clone.
+        uses: actions/checkout@v2
+
+      - name: Set up git.
+        run: |
+          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
+          if [ -z "${token}" ]; then
+              echo "Token is unset. Nothing to do."
+              exit 1
+          fi
+
+          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
+
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+
+          git remote set-url origin $url
+
+      - name: Delete branch.
+        if: |
+          env.isPull == '1'
+            && github.event.action == 'closed'
+            && startsWith(github.head_ref, env.headBranchPrefix)
+        run: |
+          git push origin --delete ${{ github.head_ref }}
+
+      - name: Write a new version of Google Chrome to the user-agent for DNS.
+        if: env.isPull == '0'
+        shell: python
+        run: |
+          import subprocess, os, re;
+
+          regExpVersion = "[0-9]+.[0-9]+.[0-9]+.[0-9]+";
+          chrome = "Chrome/";
+
+          def newVersion():
+            output = subprocess.check_output(["google-chrome", "--version"]);
+            version = re.search(regExpVersion, output);
+            if not version:
+              print("Can't find a Chrome version.");
+              exit();
+            return version.group(0);
+
+          newChromeVersion = newVersion();
+          print(newChromeVersion);
+
+          def setEnv(value):
+            open(os.environ['GITHUB_ENV'], "a").write(value);
+
+          def writeUserAgent():
+            p = os.environ['codeFile'];
+            w = open(p, "r");
+            content = w.read();
+            w.close();
+
+            regExpChrome = chrome + regExpVersion;
+
+            version = re.search(regExpChrome, content);
+            if not version:
+              print("Can't find an user-agent in the code.");
+              exit();
+            content = re.sub(regExpChrome, chrome + newChromeVersion, content);
+
+            w = open(p, "w");
+            w.write(content);
+
+            setEnv("ChromeVersion=" + newChromeVersion);
+
+          writeUserAgent();
+
+      - name: Push to a new branch.
+        if: env.isPull == '0' && env.ChromeVersion != ''
+        run: |
+          git diff > git_diff.txt
+          if [[ ! -s git_diff.txt ]]; then
+            echo "Nothing to commit."
+            exit 0
+          fi
+
+          git checkout -b $headBranchPrefix$ChromeVersion
+          git add $codeFile
+          git commit -m "Update User-Agent for DNS to Chrome $ChromeVersion."
+
+          git push origin $headBranchPrefix$ChromeVersion
+          echo "Done!"
+
+      - name: Close previous pull requests.
+        if: env.isPull == '0' && env.ChromeVersion != ''
+        uses: actions/github-script@0.4.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const common = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            };
+
+            github.pulls.list(common).then(response => {
+              response.data.forEach((item, _) => {
+                if (item.head.ref.startsWith(process.env.headBranchPrefix)) {
+                  console.log(`Close ${item.title} #${item.number}.`);
+                  github.pulls.update({
+                    pull_number: item.number,
+                    state: "closed",
+                    ...common
+                  });
+                }
+              });
+            });
+
+      - name: Create a new pull request.
+        if: env.isPull == '0' && env.ChromeVersion != ''
+        uses: actions/github-script@0.4.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const version = process.env.ChromeVersion;
+            const title = `Update User-Agent for DNS to Chrome ${version}.`;
+
+            github.pulls.create({
+              title: title,
+              body: "",
+              head: `${process.env.headBranchPrefix}${version}`,
+              base: process.env.baseBranch,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            });

.github/workflows/win.yml

@@ -68,10 +68,31 @@ jobs:
       DOC_PATH: "docs/building-msvc.md"
       AUTO_CACHING: "1"
 
+    defaults:
+      run:
+        shell: cmd
+
     steps:
       - name: Get repository name.
         shell: bash
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
+
+      - name: Set up environment paths.
+        shell: bash
+        run: |
+          echo "C:\\Strawberry\\perl\\bin\\" >> $GITHUB_PATH
+          echo "C:\\Program Files\\NASM\\" >> $GITHUB_PATH
+          echo "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\" >> $GITHUB_PATH
+
+          mkdir Libraries && cd Libraries
+          echo "Convert unix path to win path."
+          p=`pwd | sed 's#^/[d]#d:#g' |sed 's#/#\\\\#g'`
+          echo "LibrariesPath=$p" >> $GITHUB_ENV
+
+      - name: Save msbuild version.
+        run: |
+          call vcvars32.bat
+          msbuild -version > CACHE_KEY.txt
 
       - name: Clone.
         uses: actions/checkout@v2
@@ -79,38 +100,18 @@ jobs:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
 
-      - name: Set up environment variables.
-        shell: cmd
-        run: |
-          echo ::add-path::C:\Strawberry\perl\bin\
-          echo ::add-path::"%programfiles%\NASM"
-
-          C:
-          cd "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\"
-          echo ::add-path::%cd%
-
-          call vcvars32.bat
-          D:
-          cd %GITHUB_WORKSPACE%
-          msbuild -version > CACHE_KEY.txt
-          echo %MANUAL_CACHING% >> CACHE_KEY.txt
-
-          mkdir Libraries
-          cd Libraries
-          echo ::set-env name=LibrariesPath::%cd%
-
       - name: Generate cache key.
         shell: bash
         run: |
+          echo $MANUAL_CACHING >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" == "1" ]; then
             thisFile=$REPO_NAME/.github/workflows/win.yml
             echo `md5sum $thisFile | awk '{ print $1 }'` >> CACHE_KEY.txt
           fi
-          echo ::set-env name=CACHE_KEY::`md5sum CACHE_KEY.txt | awk '{ print $1 }'`
+          echo "CACHE_KEY=`md5sum CACHE_KEY.txt | awk '{ print $1 }'`" >> $GITHUB_ENV
 
       - name: Choco installs.
-        run: |
-          choco install --no-progress -y nasm yasm jom ninja
+        run: choco install --no-progress -y nasm yasm jom ninja
 
       - name: Patches.
         shell: bash
@@ -123,21 +124,18 @@ jobs:
           eval $checkoutCommit
 
       - name: Find any version of Python 2.
-        shell: cmd
+        shell: bash
         run: |
-          echo Find any version of Python 2.
-          for /D %%a in (C:\hostedtoolcache\windows\Python\2.*) do (
-            SET PY2=%%a\x64
-          )
-          if [%PY2%] == [] (
-            echo Python 2 is not found.
+          echo "Find any version of Python 2."
+          p=`ls /c/hostedtoolcache/windows/python | grep 2 | tail -1`
+          if [ -z "$p" ]; then
+            echo "Python 2 is not found."
             exit 1
-          )
-          echo Found %PY2%.
-          echo ::set-env name=PY2::%PY2%
+          fi
+          echo "PY2=C:\\hostedtoolcache\\windows\\Python\\$p\\x64" >> $GITHUB_ENV
+          echo "Found $p."
 
       - name: LZMA.
-        shell: cmd
         run: |
           %VC%
 
@@ -154,7 +152,6 @@ jobs:
           key: ${{ runner.OS }}-${{ env.CACHE_KEY }}-${{ env.OPENSSL_VER }}
       - name: OpenSSL.
         if: steps.cache-openssl.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -169,7 +166,7 @@ jobs:
           move ossl_static.pdb out32.dbg\ossl_static
           nmake clean
           move out32.dbg\ossl_static out32.dbg\ossl_static.pdb
-          perl Configure no-shared VC-WIN32
+          perl Configure no-shared no-tests VC-WIN32
           nmake
           mkdir out32
           move libcrypto.lib out32
@@ -180,7 +177,6 @@ jobs:
           rmdir /S /Q .git
 
       - name: Zlib.
-        shell: cmd
         run: |
           %VC%
 
@@ -190,6 +186,20 @@ jobs:
           cd contrib\vstudio\vc14
           msbuild -m zlibstat.vcxproj /property:Configuration=Debug
 
+      - name: MozJPEG.
+        shell: cmd
+        run: |
+          %VC%
+
+          git clone -b v4.0.1-rc2 %GIT%/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake . ^
+          -G "Visual Studio 16 2019" ^
+          -A Win32 ^
+          -DWITH_JPEG8=ON ^
+          -DPNG_SUPPORTED=OFF
+          cmake --build . --config Debug
+
       - name: OpenAL Soft cache.
         id: cache-openal
         uses: actions/cache@v2
@@ -197,7 +207,6 @@ jobs:
           path: ${{ env.LibrariesPath }}/openal-soft
           key: ${{ runner.OS }}-openal-soft-${{ env.CACHE_KEY }}
       - name: OpenAL Soft.
-        shell: cmd
         if: steps.cache-openal.outputs.cache-hit != 'true'
         run: |
           %VC%
@@ -206,11 +215,12 @@ jobs:
           cd openal-soft
           git checkout fix_capture
           cd build
-          cmake ^
+          cmake .. ^
           -G "Visual Studio 16 2019" ^
           -A Win32 ^
           -D LIBTYPE:STRING=STATIC ^
-          -D FORCE_STATIC_VCRT:STRING=ON ..
+          -D FORCE_STATIC_VCRT=ON ^
+          -D ALSOFT_BACKEND_WASAPI=OFF
 
           msbuild -m OpenAL.vcxproj /property:Configuration=Debug
 
@@ -224,7 +234,6 @@ jobs:
         env:
           GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\'
           GYP_MSVS_VERSION: 2019
-        shell: cmd
         if: steps.cache-breakpad.outputs.cache-hit != 'true'
         run: |
           cd %LibrariesPath%
@@ -261,7 +270,6 @@ jobs:
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
       - name: Opus.
         if: steps.cache-opus.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -280,7 +288,6 @@ jobs:
           key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}-2-${{ hashFiles('**/build_ffmpeg_win.sh') }}
       - name: FFmpeg.
         if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
           choco install --no-progress -y msys2
@@ -302,7 +309,6 @@ jobs:
           key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
       - name: Configure Qt 5.12.8.
         if: steps.cache-qt.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -316,7 +322,7 @@ jobs:
           for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
           cd ..
 
-          SET SSL=%LibrariesPath%\openssl_1_1_1
+          SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
           SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
 
           configure ^
@@ -334,10 +340,12 @@ jobs:
           -mp ^
           -nomake examples ^
           -nomake tests ^
-          -platform win32-msvc
+          -platform win32-msvc ^
+          -I "%LibrariesPath%\mozjpeg" ^
+          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
       - name: Qt 5.12.8 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
           cd qt_%QT%
@@ -352,59 +360,33 @@ jobs:
         id: cache-webrtc
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/webrtc
-          key: ${{ runner.OS }}-webrtc-2-${{ env.CACHE_KEY }}-${{ hashFiles('**/patches/webrtc/*') }}
+          path: ${{ env.LibrariesPath }}/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
-          # Qt libjpeg.
-          mkdir qt_%QT%
-          cd qt_%QT%
-          git clone -b %QT_VER% https://github.com/qt/qtbase
+          git clone %GIT%/desktop-app/tg_owt.git
+          mkdir tg_owt\out\Debug
+          cd tg_owt\out\Debug
+          cmake -G Ninja ^
+          -DCMAKE_BUILD_TYPE=Debug ^
+          -DTG_OWT_SPECIAL_TARGET=win ^
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
+          -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_%OPENSSL_VER%/include ^
+          -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
+          -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ^
+          ../..
 
-          move qtbase\src\3rdparty\libjpeg ..
-          cd ..
-          dir
-          rmdir /S /Q qt_%QT%
-          mkdir qt_%QT%\qtbase\src\3rdparty\
-          move libjpeg qt_%QT%\qtbase\src\3rdparty\
+          ninja
 
-          # Depot tools.
-          cd %LibrariesPath%
-
-          curl -O https://storage.googleapis.com/chrome-infra/depot_tools.zip
-          7z x depot_tools.zip
-          cd depot_tools
-          SET PATH=%PY2%;%cd%;%PATH%
-          SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-          # WebRTC.
-          cd %LibrariesPath%
-
-          mkdir webrtc
-          cd webrtc
-          copy ..\patches\webrtc\.gclient .gclient
-          git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src
-          gclient sync --no-history
-          cd src
-          git apply ..\..\patches\webrtc\src.diff
-          cd build
-          git apply ..\..\..\patches\webrtc\build.diff
-          cd ..\third_party
-          git apply ..\..\..\patches\webrtc\third_party.diff
-          cd libsrtp
-          git apply ..\..\..\..\patches\webrtc\libsrtp.diff
-          cd ..\..
-          ..\..\patches\webrtc\configure.bat
-          ninja -C out/Debug webrtc
-
-          # Cleanup.
-          ..\..\patches\webrtc\cleanup_webrtc.bat
-          cd %LibrariesPath%
-          rmdir /S /Q qt_%QT%
+          :: Cleanup.
+          cd %LibrariesPath%\tg_owt
+          move out\Debug\tg_owt.lib tg_owt.lib
+          rmdir /S /Q out
+          mkdir out\Debug
+          move tg_owt.lib out\Debug\tg_owt.lib
 
       - name: Read defines.
         shell: bash
@@ -413,15 +395,14 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
-          echo "::set-env name=TDESKTOP_BUILD_DEFINE::$DEFINE"
+          echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
-        shell: cmd
         run: |
           cd %REPO_NAME%\Telegram
 
@@ -438,7 +419,6 @@ jobs:
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
-        shell: cmd
         run: |
           cd %REPO_NAME%\out\Debug
           mkdir artifact

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "Telegram/ThirdParty/libtgvoip"]
 	path = Telegram/ThirdParty/libtgvoip
 	url = https://github.com/telegramdesktop/libtgvoip
-[submodule "Telegram/ThirdParty/variant"]
-	path = Telegram/ThirdParty/variant
-	url = https://github.com/desktop-app/variant.git
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
 	url = https://github.com/Microsoft/GSL.git
@@ -85,12 +82,6 @@
 [submodule "Telegram/ThirdParty/qt5ct"]
 	path = Telegram/ThirdParty/qt5ct
 	url = https://github.com/desktop-app/qt5ct.git
-[submodule "Telegram/ThirdParty/lxqt-qtplugin"]
-	path = Telegram/ThirdParty/lxqt-qtplugin
-	url = https://github.com/lxqt/lxqt-qtplugin.git
-[submodule "Telegram/ThirdParty/libqtxdg"]
-	path = Telegram/ThirdParty/libqtxdg
-	url = https://github.com/lxqt/libqtxdg.git
 [submodule "Telegram/ThirdParty/fcitx5-qt"]
 	path = Telegram/ThirdParty/fcitx5-qt
 	url = https://github.com/fcitx/fcitx5-qt.git

CMakeLists.txt

@@ -36,5 +36,9 @@ include(cmake/options.cmake)
 
 include(cmake/external/qt/package.cmake)
 
+set(desktop_app_skip_libs
+    variant
+)
+
 add_subdirectory(cmake)
 add_subdirectory(Telegram)

README.md

@@ -34,6 +34,7 @@ Version **1.8.15** was the last that supports older systems
 
 * Qt 5.12.8, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
 * OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
+* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/src/LICENSE))
 * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))
 * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
 * liblzma ([public domain](http://tukaani.org/xz/))
@@ -45,7 +46,6 @@ Version **1.8.15** was the last that supports older systems
 * Opus codec ([BSD License](http://www.opus-codec.org/license/))
 * FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html))
 * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
-* Mapbox Variant ([BSD License](https://github.com/mapbox/variant/blob/master/LICENSE))
 * Range-v3 ([Boost License](https://github.com/ericniebler/range-v3/blob/master/LICENSE.txt))
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
 * Vazir font ([License](https://github.com/rastikerdar/vazir-font/blob/master/LICENSE))
@@ -59,7 +59,7 @@ Version **1.8.15** was the last that supports older systems
 ## Build instructions
 
 * [Visual Studio 2019][msvc]
-* [Xcode 11][xcode]
+* [Xcode 12][xcode]
 * [CMake on GNU/Linux][cmake]
 
 [//]: # (LINKS)

Telegram/CMakeLists.txt

@@ -21,51 +21,18 @@ add_subdirectory(lib_qr)
 add_subdirectory(lib_webrtc)
 add_subdirectory(codegen)
 
-include(CheckCXXSourceCompiles)
-include(lib_ui/cmake/generate_styles.cmake)
-include(cmake/generate_lang.cmake)
-include(cmake/generate_numbers.cmake)
-
 get_filename_component(src_loc SourceFiles REALPATH)
 get_filename_component(res_loc Resources REALPATH)
 
 include(cmake/telegram_options.cmake)
-include(cmake/lib_export.cmake)
 include(cmake/lib_ffmpeg.cmake)
-include(cmake/lib_mtproto.cmake)
-include(cmake/lib_scheme.cmake)
 include(cmake/lib_tgvoip.cmake)
 include(cmake/lib_tgcalls.cmake)
-
-set(style_files
-    boxes/boxes.style
-    calls/calls.style
-    chat_helpers/chat_helpers.style
-    dialogs/dialogs.style
-    export/view/export.style
-    history/history.style
-    info/info.style
-    intro/intro.style
-    media/view/media_view.style
-    media/player/media_player.style
-    overview/overview.style
-    passport/passport.style
-    profile/profile.style
-    settings/settings.style
-    ui/filter_icons.style
-    window/window.style
-)
-
-set(dependent_style_files
-    ${submodules_loc}/lib_ui/ui/colors.palette
-    ${submodules_loc}/lib_ui/ui/basic.style
-    ${submodules_loc}/lib_ui/ui/layers/layers.style
-    ${submodules_loc}/lib_ui/ui/widgets/widgets.style
-)
-
-generate_styles(Telegram ${src_loc} "${style_files}" "${dependent_style_files}")
-generate_lang(Telegram ${res_loc}/langs/lang.strings)
-generate_numbers(Telegram ${res_loc}/numbers.txt)
+include(cmake/td_export.cmake)
+include(cmake/td_mtproto.cmake)
+include(cmake/td_lang.cmake)
+include(cmake/td_scheme.cmake)
+include(cmake/td_ui.cmake)
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
 
@@ -74,9 +41,11 @@ PRIVATE
     tdesktop::lib_tgcalls_legacy
     tdesktop::lib_tgcalls
     tdesktop::lib_tgvoip
-    tdesktop::lib_mtproto
-    tdesktop::lib_scheme
-    tdesktop::lib_export
+    tdesktop::td_export
+    tdesktop::td_mtproto
+    tdesktop::td_lang
+    tdesktop::td_scheme
+    tdesktop::td_ui
     desktop-app::lib_webrtc
     desktop-app::lib_base
     desktop-app::lib_crl
@@ -104,17 +73,12 @@ if (LINUX)
         desktop-app::external_materialdecoration
         desktop-app::external_nimf_qt5
         desktop-app::external_qt5ct_support
+        desktop-app::external_xcb_screensaver
+        desktop-app::external_xcb
+        desktop-app::external_glib
     )
 
     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        # conflicts with Qt static link
-        if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
-            target_link_libraries(Telegram
-            PRIVATE
-                desktop-app::external_lxqt_qtplugin
-            )
-        endif()
-
         target_link_libraries(Telegram
         PRIVATE
             desktop-app::external_statusnotifieritem
@@ -135,36 +99,6 @@ if (LINUX)
         )
     endif()
 
-    if (DESKTOP_APP_USE_PACKAGED)
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(XCB_SCREENSAVER REQUIRED IMPORTED_TARGET xcb-screensaver)
-        pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb)
-
-        target_link_libraries(Telegram
-        PRIVATE
-            PkgConfig::XCB_SCREENSAVER
-            PkgConfig::XCB
-        )
-    else()
-        target_link_static_libraries(Telegram PRIVATE xcb-screensaver)
-        target_link_libraries(Telegram PRIVATE xcb)
-    endif()
-
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
-    pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0)
-    pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-
-    target_link_libraries(Telegram
-    PRIVATE
-        PkgConfig::GLIB2
-        PkgConfig::GOBJECT
-        PkgConfig::GIO
-    )
-
-    target_compile_definitions(Telegram PRIVATE G_LOG_DOMAIN="Telegram")
-    target_compile_options(Telegram PRIVATE -Wno-register)
-
     if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
         find_package(PkgConfig REQUIRED)
 
@@ -190,6 +124,10 @@ nice_target_sources(Telegram ${src_loc}
 PRIVATE
     ${style_files}
 
+    api/api_attached_stickers.cpp
+    api/api_attached_stickers.h
+    api/api_authorizations.cpp
+    api/api_authorizations.h
     api/api_bot.cpp
     api/api_bot.h
     api/api_chat_filters.cpp
@@ -391,8 +329,6 @@ PRIVATE
     core/launcher.h
     core/local_url_handlers.cpp
     core/local_url_handlers.h
-    core/mime_type.cpp
-    core/mime_type.h
     core/sandbox.cpp
     core/sandbox.h
     core/shortcuts.cpp
@@ -468,6 +404,8 @@ PRIVATE
     data/data_poll.h
     data/data_pts_waiter.cpp
     data/data_pts_waiter.h
+    data/data_replies_list.cpp
+    data/data_replies_list.h
     data/data_reply_preview.cpp
     data/data_reply_preview.h
     data/data_search_controller.cpp
@@ -568,6 +506,8 @@ PRIVATE
     history/view/media/history_view_photo.cpp
     history/view/media/history_view_poll.h
     history/view/media/history_view_poll.cpp
+    history/view/media/history_view_slot_machine.h
+    history/view/media/history_view_slot_machine.cpp
     history/view/media/history_view_sticker.h
     history/view/media/history_view_sticker.cpp
     history/view/media/history_view_theme_document.h
@@ -589,10 +529,20 @@ PRIVATE
     history/view/history_view_message.cpp
     history/view/history_view_message.h
     history/view/history_view_object.h
+    history/view/history_view_pinned_bar.cpp
+    history/view/history_view_pinned_bar.h
+    history/view/history_view_pinned_section.cpp
+    history/view/history_view_pinned_section.h
+    history/view/history_view_pinned_tracker.cpp
+    history/view/history_view_pinned_tracker.h
+    history/view/history_view_replies_section.cpp
+    history/view/history_view_replies_section.h
     history/view/history_view_schedule_box.cpp
     history/view/history_view_schedule_box.h
     history/view/history_view_scheduled_section.cpp
     history/view/history_view_scheduled_section.h
+    history/view/history_view_send_action.cpp
+    history/view/history_view_send_action.h
     history/view/history_view_service_message.cpp
     history/view/history_view_service_message.h
     history/view/history_view_top_bar_widget.cpp
@@ -712,23 +662,12 @@ PRIVATE
     intro/intro_widget.h
     lang/lang_cloud_manager.cpp
     lang/lang_cloud_manager.h
-    lang/lang_file_parser.cpp
-    lang/lang_file_parser.h
-    lang/lang_hardcoded.h
     lang/lang_instance.cpp
     lang/lang_instance.h
-    lang/lang_keys.cpp
-    lang/lang_keys.h
     lang/lang_numbers_animation.cpp
     lang/lang_numbers_animation.h
-    lang/lang_tag.cpp
-    lang/lang_tag.h
-    lang/lang_text_entity.cpp
-    lang/lang_text_entity.h
     lang/lang_translator.cpp
     lang/lang_translator.h
-    lang/lang_values.cpp
-    lang/lang_values.h
     main/main_account.cpp
     main/main_account.h
     main/main_app_config.cpp
@@ -755,14 +694,6 @@ PRIVATE
     media/audio/media_child_ffmpeg_loader.h
     media/audio/media_openal_functions.cpp
     media/audio/media_openal_functions.h
-    media/clip/media_clip_check_streaming.cpp
-    media/clip/media_clip_check_streaming.h
-    media/clip/media_clip_ffmpeg.cpp
-    media/clip/media_clip_ffmpeg.h
-    media/clip/media_clip_implementation.cpp
-    media/clip/media_clip_implementation.h
-    media/clip/media_clip_reader.cpp
-    media/clip/media_clip_reader.h
     media/player/media_player_button.cpp
     media/player/media_player_button.h
     media/player/media_player_float.cpp
@@ -1054,8 +985,8 @@ PRIVATE
     ui/filter_icons.h
     ui/filter_icon_panel.cpp
     ui/filter_icon_panel.h
-    ui/grouped_layout.cpp
-    ui/grouped_layout.h
+    ui/item_text_options.cpp
+    ui/item_text_options.h
     ui/resize_area.h
     ui/search_field_controller.cpp
     ui/search_field_controller.h
@@ -1063,8 +994,6 @@ PRIVATE
     ui/special_buttons.h
     ui/special_fields.cpp
     ui/special_fields.h
-    ui/text_options.cpp
-    ui/text_options.h
     ui/unread_badge.cpp
     ui/unread_badge.h
     window/main_window.cpp
@@ -1142,6 +1071,7 @@ PRIVATE
     qt_static_plugins.cpp
     settings.cpp
     settings.h
+    stdafx.h
 )
 
 if (NOT LINUX)
@@ -1291,6 +1221,7 @@ target_compile_definitions(Telegram
 PRIVATE
     TDESKTOP_API_ID=${TDESKTOP_API_ID}
     TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
+    G_LOG_DOMAIN="Telegram"
 )
 
 if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")

Telegram/Patches/ffmpeg.diff

@@ -1,225 +0,0 @@
-diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
-index 00f93bf59f..52da7036f3 100644
---- a/libavcodec/aarch64/Makefile
-+++ b/libavcodec/aarch64/Makefile
-@@ -6,6 +6,7 @@ OBJS-$(CONFIG_H264DSP)                  += aarch64/h264dsp_init_aarch64.o
- OBJS-$(CONFIG_H264PRED)                 += aarch64/h264pred_init.o
- OBJS-$(CONFIG_H264QPEL)                 += aarch64/h264qpel_init_aarch64.o
- OBJS-$(CONFIG_HPELDSP)                  += aarch64/hpeldsp_init_aarch64.o
-+OBJS-$(CONFIG_IDCTDSP)                  += aarch64/idctdsp_init_aarch64.o
- OBJS-$(CONFIG_MPEGAUDIODSP)             += aarch64/mpegaudiodsp_init.o
- OBJS-$(CONFIG_NEON_CLOBBER_TEST)        += aarch64/neontest.o
- OBJS-$(CONFIG_VIDEODSP)                 += aarch64/videodsp_init.o
-@@ -21,6 +22,7 @@ OBJS-$(CONFIG_VC1DSP)                   += aarch64/vc1dsp_init_aarch64.o
- OBJS-$(CONFIG_VORBIS_DECODER)           += aarch64/vorbisdsp_init.o
- OBJS-$(CONFIG_VP9_DECODER)              += aarch64/vp9dsp_init_10bpp_aarch64.o \
-                                            aarch64/vp9dsp_init_12bpp_aarch64.o \
-+                                           aarch64/vp9mc_aarch64.o             \
-                                            aarch64/vp9dsp_init_aarch64.o
- 
- # ARMv8 optimizations
-@@ -41,8 +43,7 @@ NEON-OBJS-$(CONFIG_H264PRED)            += aarch64/h264pred_neon.o
- NEON-OBJS-$(CONFIG_H264QPEL)            += aarch64/h264qpel_neon.o             \
-                                            aarch64/hpeldsp_neon.o
- NEON-OBJS-$(CONFIG_HPELDSP)             += aarch64/hpeldsp_neon.o
--NEON-OBJS-$(CONFIG_IDCTDSP)             += aarch64/idctdsp_init_aarch64.o      \
--                                           aarch64/simple_idct_neon.o
-+NEON-OBJS-$(CONFIG_IDCTDSP)             += aarch64/simple_idct_neon.o
- NEON-OBJS-$(CONFIG_MDCT)                += aarch64/mdct_neon.o
- NEON-OBJS-$(CONFIG_MPEGAUDIODSP)        += aarch64/mpegaudiodsp_neon.o
- NEON-OBJS-$(CONFIG_VP8DSP)              += aarch64/vp8dsp_neon.o
-diff --git a/libavcodec/aarch64/idctdsp_init_aarch64.c b/libavcodec/aarch64/idctdsp_init_aarch64.c
-index 0406e60830..742a3372e3 100644
---- a/libavcodec/aarch64/idctdsp_init_aarch64.c
-+++ b/libavcodec/aarch64/idctdsp_init_aarch64.c
-@@ -21,6 +21,8 @@
-  */
- 
- #include "libavutil/attributes.h"
-+#include "libavutil/cpu.h"
-+#include "libavutil/arm/cpu.h"
- #include "libavcodec/avcodec.h"
- #include "libavcodec/idctdsp.h"
- #include "idct.h"
-@@ -28,7 +30,9 @@
- av_cold void ff_idctdsp_init_aarch64(IDCTDSPContext *c, AVCodecContext *avctx,
-                                      unsigned high_bit_depth)
- {
--    if (!avctx->lowres && !high_bit_depth) {
-+    int cpu_flags = av_get_cpu_flags();
-+
-+    if (have_neon(cpu_flags) && !avctx->lowres && !high_bit_depth) {
-         if (avctx->idct_algo == FF_IDCT_AUTO ||
-             avctx->idct_algo == FF_IDCT_SIMPLEAUTO ||
-             avctx->idct_algo == FF_IDCT_SIMPLENEON) {
-diff --git a/libavcodec/aarch64/vp9mc_16bpp_neon.S b/libavcodec/aarch64/vp9mc_16bpp_neon.S
-index cac6428709..53b372c262 100644
---- a/libavcodec/aarch64/vp9mc_16bpp_neon.S
-+++ b/libavcodec/aarch64/vp9mc_16bpp_neon.S
-@@ -25,31 +25,6 @@
- //                            const uint8_t *ref, ptrdiff_t ref_stride,
- //                            int h, int mx, int my);
- 
--function ff_vp9_copy128_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        ldp             x9,  x10, [x2, #32]
--        stp             x7,  x8,  [x0, #16]
--        subs            w4,  w4,  #1
--        ldp             x11, x12, [x2, #48]
--        stp             x9,  x10, [x0, #32]
--        stp             x11, x12, [x0, #48]
--        ldp             x5,  x6,  [x2, #64]
--        ldp             x7,  x8,  [x2, #80]
--        stp             x5,  x6,  [x0, #64]
--        ldp             x9,  x10, [x2, #96]
--        stp             x7,  x8,  [x0, #80]
--        ldp             x11, x12, [x2, #112]
--        stp             x9,  x10, [x0, #96]
--        stp             x11, x12, [x0, #112]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg64_16_neon, export=1
-         mov             x5,  x0
-         sub             x1,  x1,  #64
-diff --git a/libavcodec/aarch64/vp9mc_aarch64.S b/libavcodec/aarch64/vp9mc_aarch64.S
-new file mode 100644
-index 0000000000..f17a8cf04a
---- /dev/null
-+++ b/libavcodec/aarch64/vp9mc_aarch64.S
-@@ -0,0 +1,81 @@
-+/*
-+ * Copyright (c) 2016 Google Inc.
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "libavutil/aarch64/asm.S"
-+
-+// All public functions in this file have the following signature:
-+// typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
-+//                            const uint8_t *ref, ptrdiff_t ref_stride,
-+//                            int h, int mx, int my);
-+
-+function ff_vp9_copy128_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        ldp             x9,  x10, [x2, #32]
-+        stp             x7,  x8,  [x0, #16]
-+        subs            w4,  w4,  #1
-+        ldp             x11, x12, [x2, #48]
-+        stp             x9,  x10, [x0, #32]
-+        stp             x11, x12, [x0, #48]
-+        ldp             x5,  x6,  [x2, #64]
-+        ldp             x7,  x8,  [x2, #80]
-+        stp             x5,  x6,  [x0, #64]
-+        ldp             x9,  x10, [x2, #96]
-+        stp             x7,  x8,  [x0, #80]
-+        ldp             x11, x12, [x2, #112]
-+        stp             x9,  x10, [x0, #96]
-+        stp             x11, x12, [x0, #112]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-+
-+function ff_vp9_copy64_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        ldp             x9,  x10, [x2, #32]
-+        stp             x7,  x8,  [x0, #16]
-+        subs            w4,  w4,  #1
-+        ldp             x11, x12, [x2, #48]
-+        stp             x9,  x10, [x0, #32]
-+        stp             x11, x12, [x0, #48]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-+
-+function ff_vp9_copy32_aarch64, export=1
-+1:
-+        ldp             x5,  x6,  [x2]
-+        ldp             x7,  x8,  [x2, #16]
-+        stp             x5,  x6,  [x0]
-+        subs            w4,  w4,  #1
-+        stp             x7,  x8,  [x0, #16]
-+        add             x2,  x2,  x3
-+        add             x0,  x0,  x1
-+        b.ne            1b
-+        ret
-+endfunc
-diff --git a/libavcodec/aarch64/vp9mc_neon.S b/libavcodec/aarch64/vp9mc_neon.S
-index f67624ca04..abf2bae9db 100644
---- a/libavcodec/aarch64/vp9mc_neon.S
-+++ b/libavcodec/aarch64/vp9mc_neon.S
-@@ -25,23 +25,6 @@
- //                            const uint8_t *ref, ptrdiff_t ref_stride,
- //                            int h, int mx, int my);
- 
--function ff_vp9_copy64_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        ldp             x9,  x10, [x2, #32]
--        stp             x7,  x8,  [x0, #16]
--        subs            w4,  w4,  #1
--        ldp             x11, x12, [x2, #48]
--        stp             x9,  x10, [x0, #32]
--        stp             x11, x12, [x0, #48]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg64_neon, export=1
-         mov             x5,  x0
- 1:
-@@ -64,19 +47,6 @@ function ff_vp9_avg64_neon, export=1
-         ret
- endfunc
- 
--function ff_vp9_copy32_aarch64, export=1
--1:
--        ldp             x5,  x6,  [x2]
--        ldp             x7,  x8,  [x2, #16]
--        stp             x5,  x6,  [x0]
--        subs            w4,  w4,  #1
--        stp             x7,  x8,  [x0, #16]
--        add             x2,  x2,  x3
--        add             x0,  x0,  x1
--        b.ne            1b
--        ret
--endfunc
--
- function ff_vp9_avg32_neon, export=1
- 1:
-         ld1             {v2.16b, v3.16b},  [x2], x3

Telegram/Resources/langs/lang.strings

@@ -161,13 +161,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_deleted" = "Deleted Account";
 "lng_deleted_message" = "Deleted message";
 "lng_pinned_message" = "Pinned message";
+"lng_pinned_previous" = "Previous message";
 "lng_pinned_poll" = "Pinned poll";
 "lng_pinned_quiz" = "Pinned quiz";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
 "lng_pinned_pin_sure" = "Would you like to pin this message?";
+"lng_pinned_pin_sure_group" = "Do you want to pin this message for all members in the group?";
+"lng_pinned_pin_old_sure" = "Do you want to pin an older message while leaving a more recent one pinned?";
 "lng_pinned_pin" = "Pin";
 "lng_pinned_unpin" = "Unpin";
 "lng_pinned_notify" = "Notify all members";
+"lng_pinned_also_for_other" = "Also pin for {user}";
+"lng_pinned_messages_title#one" = "{count} pinned message";
+"lng_pinned_messages_title#other" = "{count} pinned messages";
+"lng_pinned_hide_all" = "Don't show pinned messages";
+"lng_pinned_unpin_all#one" = "Unpin {count} message";
+"lng_pinned_unpin_all#other" = "Unpin all {count} messages";
+"lng_pinned_unpin_all_sure" = "Do you want to unpin all messages?";
+"lng_pinned_hide_all_sure" = "Do you want to hide the pinned messages bar? It will stay hidden until a new message is pinned.";
+"lng_pinned_hide_all_hide" = "Hide";
 
 "lng_edit_media_album_error" = "This file cannot be saved as a part of an album.";
 "lng_edit_media_invalid_file" = "Sorry, no way to use this file.";
@@ -812,6 +824,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_set_group_photo" = "Set Photo";
 "lng_profile_add_participant" = "Add Members";
 "lng_profile_view_channel" = "View Channel";
+"lng_profile_view_discussion" = "View discussion";
 "lng_profile_join_channel" = "Join Channel";
 "lng_profile_join_group" = "Join Group";
 "lng_profile_delete_and_exit" = "Leave";
@@ -1102,6 +1115,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_secure_proof_of_address" = "proof of address";
 "lng_action_secure_phone" = "phone number";
 "lng_action_secure_email" = "email address";
+"lng_action_proximity_reached" = "{from} is now within {distance} from {user}";
+"lng_action_proximity_reached_you" = "{from} is now within {distance} from you";
+"lng_action_you_proximity_reached" = "You are now within {distance} from {user}";
+"lng_action_proximity_distance_m#one" = "{count} meter";
+"lng_action_proximity_distance_m#other" = "{count} metres";
+"lng_action_proximity_distance_km#one" = "{count} km";
+"lng_action_proximity_distance_km#other" = "{count} km";
 
 "lng_ttl_photo_received" = "{from} sent you a self-destructing photo. Please view it on your mobile.";
 "lng_ttl_photo_sent" = "You sent a self-destructing photo.";
@@ -1319,6 +1339,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_message_ph" = "Write a message...";
 "lng_broadcast_ph" = "Broadcast a message...";
 "lng_broadcast_silent_ph" = "Silent broadcast...";
+"lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
 "lng_will_be_notified" = "Members will be notified when you post";
 "lng_wont_be_notified" = "Members will not be notified when you post";
@@ -1330,7 +1351,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_restart_button" = "Restart";
 "lng_channel_mute" = "Mute";
 "lng_channel_unmute" = "Unmute";
-"lng_channel_discuss" = "Discuss";
 "lng_saved_messages" = "Saved Messages";
 "lng_saved_short" = "Save";
 "lng_saved_forward_here" = "Forward messages here for quick access";
@@ -1344,6 +1364,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_scheduled_send_now_many#one" = "Send {count} message now?";
 "lng_scheduled_send_now_many#other" = "Send {count} messages now?";
 
+"lng_replies_view#one" = "View {count} Reply";
+"lng_replies_view#other" = "View {count} Replies";
+"lng_replies_view_thread" = "View Thread";
+"lng_replies_header#one" = "{count} reply";
+"lng_replies_header#other" = "{count} replies";
+"lng_replies_header_none" = "Replies";
+"lng_comments_header#one" = "{count} comment";
+"lng_comments_header#other" = "{count} comments";
+"lng_comments_header_none" = "Comments";
+"lng_comments_open_count#one" = "{count} comment";
+"lng_comments_open_count#other" = "{count} comments";
+"lng_comments_open_none" = "Leave a comment";
+"lng_replies_view_original" = "View in chat";
+"lng_replies_messages" = "Replies";
+"lng_replies_discussion_started" = "Discussion started";
+"lng_replies_no_comments" = "No comments here yet...";
+
 "lng_archived_name" = "Archived chats";
 "lng_archived_add" = "Archive";
 "lng_archived_remove" = "Unarchive";
@@ -1439,6 +1476,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_unpin_from_top" = "Unpin from top";
 "lng_context_mark_unread" = "Mark as unread";
 "lng_context_mark_read" = "Mark as read";
+"lng_context_mark_read_sure" = "Are you sure you want to mark all chats from this folder as read?";
+"lng_context_mark_read_all" = "Mark all chats as read";
+"lng_context_mark_read_all_sure" = "Are you sure you want to mark all chats as read?";
 "lng_context_archive_expand" = "Expand";
 "lng_context_archive_collapse" = "Collapse";
 "lng_context_archive_to_menu" = "Move to main menu";
@@ -1502,9 +1542,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_files_selected#other" = "{count} files selected";
 "lng_send_files#one" = "Send {count} file";
 "lng_send_files#other" = "Send {count} files";
-"lng_send_album" = "Send as an album";
-"lng_send_photo" = "Send as a photo";
-"lng_send_file" = "Send as a file";
+"lng_send_grouped" = "Group items";
+"lng_send_compressed" = "Compress images";
 "lng_send_media_invalid_files" = "Sorry, no valid files found.";
 
 "lng_forward_choose" = "Choose recipient...";
@@ -1821,6 +1860,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_group_invite" = "Add users";
 "lng_rights_group_pin" = "Pin messages";
 "lng_rights_group_delete" = "Delete messages";
+"lng_rights_group_anonymous" = "Remain Anonymous";
 "lng_rights_add_admins" = "Add new admins";
 "lng_rights_chat_read" = "Read messages";
 "lng_rights_chat_send_text" = "Send messages";
@@ -1853,6 +1893,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_transfer_done_group" = "{user} is now the owner of the group.";
 "lng_rights_transfer_done_channel" = "{user} is now the owner of the channel.";
 
+"lng_bots_password_confirm_check_about" = "You can finish this action only if you have:";
+"lng_bots_password_confirm_title" = "Two-step verification";
+"lng_bots_password_confirm_description" = "Please enter your password to confirm the action.";
+
 "lng_restricted_send_message" = "The admins of this group restricted you from writing here.";
 "lng_restricted_send_media" = "The admins of this group restricted you from posting media content here.";
 "lng_restricted_send_stickers" = "The admins of this group restricted you from posting stickers here.";
@@ -2245,6 +2289,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_language_not_ready_link" = "translations platform";
 
 "lng_launch_exe_warning" = "This file has a {extension} extension.\nAre you sure you want to run it?";
+"lng_launch_svg_warning" = "Opening this file can potentially expose your IP address to its sender. Continue?";
 "lng_launch_exe_sure" = "Run";
 "lng_launch_exe_dont_ask" = "Don't ask me again";
 

Telegram/Resources/qrc/telegram/telegram.qrc

@@ -49,6 +49,13 @@
     <file alias="art/sunrise.jpg">../../art/sunrise.jpg</file>
     <file alias="art/dice_idle.tgs">../../art/dice_idle.tgs</file>
     <file alias="art/dart_idle.tgs">../../art/dart_idle.tgs</file>
+    <file alias="art/bball_idle.tgs">../../art/bball_idle.tgs</file>
+    <file alias="art/fball_idle.tgs">../../art/fball_idle.tgs</file>
+    <file alias="art/slot_0_idle.tgs">../../art/slot_0_idle.tgs</file>
+    <file alias="art/slot_1_idle.tgs">../../art/slot_1_idle.tgs</file>
+    <file alias="art/slot_2_idle.tgs">../../art/slot_2_idle.tgs</file>
+    <file alias="art/slot_back.tgs">../../art/slot_back.tgs</file>
+    <file alias="art/slot_pull.tgs">../../art/slot_pull.tgs</file>
     <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
     <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
     <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>

Telegram/Resources/tl/api.tl

@@ -69,7 +69,7 @@ inputMediaPhotoExternal#e5bbfe1a flags:# url:string ttl_seconds:flags.0?int = In
 inputMediaDocumentExternal#fb52dc99 flags:# url:string ttl_seconds:flags.0?int = InputMedia;
 inputMediaGame#d33f43f3 id:InputGame = InputMedia;
 inputMediaInvoice#f4e096c3 flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:string provider_data:DataJSON start_param:string = InputMedia;
-inputMediaGeoLive#ce4e82fd flags:# stopped:flags.0?true geo_point:InputGeoPoint period:flags.1?int = InputMedia;
+inputMediaGeoLive#971fa843 flags:# stopped:flags.0?true geo_point:InputGeoPoint heading:flags.2?int period:flags.1?int proximity_notification_radius:flags.3?int = InputMedia;
 inputMediaPoll#f94e5f1 flags:# poll:Poll correct_answers:flags.0?Vector<bytes> solution:flags.1?string solution_entities:flags.1?Vector<MessageEntity> = InputMedia;
 inputMediaDice#e66fbf7b emoticon:string = InputMedia;
 
@@ -78,7 +78,7 @@ inputChatUploadedPhoto#c642724e flags:# file:flags.0?InputFile video:flags.1?Inp
 inputChatPhoto#8953ad37 id:InputPhoto = InputChatPhoto;
 
 inputGeoPointEmpty#e4c123d6 = InputGeoPoint;
-inputGeoPoint#f3b7acc9 lat:double long:double = InputGeoPoint;
+inputGeoPoint#48222faf flags:# lat:double long:double accuracy_radius:flags.0?int = InputGeoPoint;
 
 inputPhotoEmpty#1cd7bf0d = InputPhoto;
 inputPhoto#3bb3b94a id:long access_hash:long file_reference:bytes = InputPhoto;
@@ -128,7 +128,7 @@ channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
-channelFull#f0e6672a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int = ChatFull;
+channelFull#f0e6672a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int = ChatFull;
 
 chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
 chatParticipantCreator#da13538a user_id:int = ChatParticipant;
@@ -141,8 +141,8 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#d20b9f3c flags:# has_video:flags.0?true photo_small:FileLocation photo_big:FileLocation dc_id:int = ChatPhoto;
 
 messageEmpty#83e5de54 id:int = Message;
-message#452c0e65 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true id:int from_id:flags.8?int to_id:Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to_msg_id:flags.3?int date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long restriction_reason:flags.22?Vector<RestrictionReason> = Message;
-messageService#9e19a1f6 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?int to_id:Peer reply_to_msg_id:flags.3?int date:int action:MessageAction = Message;
+message#58ae39c9 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true id:int from_id:flags.8?Peer peer_id:Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long restriction_reason:flags.22?Vector<RestrictionReason> = Message;
+messageService#286fa604 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction = Message;
 
 messageMediaEmpty#3ded6320 = MessageMedia;
 messageMediaPhoto#695150d7 flags:# photo:flags.0?Photo ttl_seconds:flags.2?int = MessageMedia;
@@ -154,7 +154,7 @@ messageMediaWebPage#a32dd600 webpage:WebPage = MessageMedia;
 messageMediaVenue#2ec0533f geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string = MessageMedia;
 messageMediaGame#fdb19008 game:Game = MessageMedia;
 messageMediaInvoice#84551347 flags:# shipping_address_requested:flags.1?true test:flags.3?true title:string description:string photo:flags.0?WebDocument receipt_msg_id:flags.2?int currency:string total_amount:long start_param:string = MessageMedia;
-messageMediaGeoLive#7c3c2609 geo:GeoPoint period:int = MessageMedia;
+messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
 messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
 messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
 
@@ -181,6 +181,7 @@ messageActionBotAllowed#abe9affe domain:string = MessageAction;
 messageActionSecureValuesSentMe#1b287353 values:Vector<SecureValue> credentials:SecureCredentialsEncrypted = MessageAction;
 messageActionSecureValuesSent#d95c6154 types:Vector<SecureValueType> = MessageAction;
 messageActionContactSignUp#f3f25f76 = MessageAction;
+messageActionGeoProximityReached#98e0d697 from_id:Peer to_id:Peer distance:int = MessageAction;
 
 dialog#2c171f72 flags:# pinned:flags.2?true unread_mark:flags.3?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
@@ -192,9 +193,10 @@ photoSizeEmpty#e17e23c type:string = PhotoSize;
 photoSize#77bfb61b type:string location:FileLocation w:int h:int size:int = PhotoSize;
 photoCachedSize#e9a734fa type:string location:FileLocation w:int h:int bytes:bytes = PhotoSize;
 photoStrippedSize#e0b0bc2e type:string bytes:bytes = PhotoSize;
+photoSizeProgressive#5aa86a51 type:string location:FileLocation w:int h:int sizes:Vector<int> = PhotoSize;
 
 geoPointEmpty#1117dd5f = GeoPoint;
-geoPoint#296f104 long:double lat:double access_hash:long = GeoPoint;
+geoPoint#b2a2f663 flags:# long:double lat:double access_hash:long accuracy_radius:flags.0?int = GeoPoint;
 
 auth.sentCode#5e002502 flags:# type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode;
 
@@ -231,8 +233,6 @@ contact#f911c994 user_id:int mutual:Bool = Contact;
 
 importedContact#d0028438 user_id:int client_id:long = ImportedContact;
 
-contactBlocked#561bc879 user_id:int date:int = ContactBlocked;
-
 contactStatus#d3680c61 user_id:int status:UserStatus = ContactStatus;
 
 contacts.contactsNotModified#b74ba9d2 = contacts.Contacts;
@@ -240,16 +240,16 @@ contacts.contacts#eae87e42 contacts:Vector<Contact> saved_count:int users:Vector
 
 contacts.importedContacts#77d01c3b imported:Vector<ImportedContact> popular_invites:Vector<PopularContact> retry_contacts:Vector<long> users:Vector<User> = contacts.ImportedContacts;
 
-contacts.blocked#1c138d15 blocked:Vector<ContactBlocked> users:Vector<User> = contacts.Blocked;
-contacts.blockedSlice#900802a1 count:int blocked:Vector<ContactBlocked> users:Vector<User> = contacts.Blocked;
+contacts.blocked#ade1591 blocked:Vector<PeerBlocked> chats:Vector<Chat> users:Vector<User> = contacts.Blocked;
+contacts.blockedSlice#e1664194 count:int blocked:Vector<PeerBlocked> chats:Vector<Chat> users:Vector<User> = contacts.Blocked;
 
 messages.dialogs#15ba6c40 dialogs:Vector<Dialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Dialogs;
 messages.dialogsSlice#71e094f3 count:int dialogs:Vector<Dialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Dialogs;
 messages.dialogsNotModified#f0e3e596 count:int = messages.Dialogs;
 
 messages.messages#8c718e87 messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.messagesSlice#c8edce1e flags:# inexact:flags.1?true count:int next_rate:flags.0?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.channelMessages#99262e37 flags:# inexact:flags.1?true pts:int count:int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.messagesSlice#3a54685e flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.channelMessages#64479808 flags:# inexact:flags.1?true pts:int count:int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.messagesNotModified#74535f21 count:int = messages.Messages;
 
 messages.chats#64ff9fd5 chats:Vector<Chat> = messages.Chats;
@@ -275,6 +275,7 @@ inputMessagesFilterRoundVideo#b549da53 = MessagesFilter;
 inputMessagesFilterMyMentions#c1f8e69a = MessagesFilter;
 inputMessagesFilterGeo#e7026d0d = MessagesFilter;
 inputMessagesFilterContacts#e062db83 = MessagesFilter;
+inputMessagesFilterPinned#1bb00451 = MessagesFilter;
 
 updateNewMessage#1f2b0afd message:Message pts:int pts_count:int = Update;
 updateMessageID#4e90bfd6 id:int random_id:long = Update;
@@ -292,7 +293,6 @@ updateEncryptedMessagesRead#38fe25b7 chat_id:int max_date:int date:int = Update;
 updateChatParticipantAdd#ea4b0e5c chat_id:int user_id:int inviter_id:int date:int version:int = Update;
 updateChatParticipantDelete#6e5f8c22 chat_id:int user_id:int version:int = Update;
 updateDcOptions#8e5e9873 dc_options:Vector<DcOption> = Update;
-updateUserBlocked#80ece81a user_id:int blocked:Bool = Update;
 updateNotifySettings#bec268ef peer:NotifyPeer notify_settings:PeerNotifySettings = Update;
 updateServiceNotification#ebe46819 flags:# popup:flags.0?true inbox_date:flags.1?int type:string message:string media:MessageMedia entities:Vector<MessageEntity> = Update;
 updatePrivacy#ee3b272a key:PrivacyKey rules:Vector<PrivacyRule> = Update;
@@ -315,7 +315,6 @@ updateSavedGifs#9375341e = Update;
 updateBotInlineQuery#54826690 flags:# query_id:long user_id:int query:string geo:flags.0?GeoPoint offset:string = Update;
 updateBotInlineSend#e48f964 flags:# user_id:int query:string geo:flags.0?GeoPoint id:string msg_id:flags.1?InputBotInlineMessageID = Update;
 updateEditChannelMessage#1b3f4df7 message:Message pts:int pts_count:int = Update;
-updateChannelPinnedMessage#98592475 channel_id:int id:int = Update;
 updateBotCallbackQuery#e73547e1 flags:# query_id:long user_id:int peer:Peer msg_id:int chat_instance:long data:flags.0?bytes game_short_name:flags.1?string = Update;
 updateEditMessage#e40370a3 message:Message pts:int pts_count:int = Update;
 updateInlineBotCallbackQuery#f9d27a5a flags:# query_id:long user_id:int msg_id:InputBotInlineMessageID chat_instance:long data:flags.0?bytes game_short_name:flags.1?string = Update;
@@ -340,8 +339,6 @@ updateChannelReadMessagesContents#89893b45 channel_id:int messages:Vector<int> =
 updateContactsReset#7084a7be = Update;
 updateChannelAvailableMessages#70db6837 channel_id:int available_min_id:int = Update;
 updateDialogUnreadMark#e16459c3 flags:# unread:flags.0?true peer:DialogPeer = Update;
-updateUserPinnedMessage#4c43da18 user_id:int id:int = Update;
-updateChatPinnedMessage#e10db349 chat_id:int id:int version:int = Update;
 updateMessagePoll#aca1657b flags:# poll_id:long poll:flags.0?Poll results:PollResults = Update;
 updateChatDefaultBannedRights#54c01850 peer:Peer default_banned_rights:ChatBannedRights version:int = Update;
 updateFolderPeers#19360dc0 folder_peers:Vector<FolderPeer> pts:int pts_count:int = Update;
@@ -358,6 +355,13 @@ updateDialogFilterOrder#a5d72105 order:Vector<int> = Update;
 updateDialogFilters#3504914f = Update;
 updatePhoneCallSignalingData#2661bf09 phone_call_id:long data:bytes = Update;
 updateChannelParticipant#65d2b464 flags:# channel_id:int date:int user_id:int prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant qts:int = Update;
+updateChannelMessageForwards#6e8a84df channel_id:int id:int forwards:int = Update;
+updateReadChannelDiscussionInbox#1cc7de54 flags:# channel_id:int top_msg_id:int read_max_id:int broadcast_id:flags.0?int broadcast_post:flags.0?int = Update;
+updateReadChannelDiscussionOutbox#4638a26c channel_id:int top_msg_id:int read_max_id:int = Update;
+updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
+updateChannelUserTyping#ff2abe9f flags:# channel_id:int top_msg_id:flags.0?int user_id:int action:SendMessageAction = Update;
+updatePinnedMessages#ed85eab5 flags:# pinned:flags.0?true peer:Peer messages:Vector<int> pts:int pts_count:int = Update;
+updatePinnedChannelMessages#8588878b flags:# pinned:flags.0?true channel_id:int messages:Vector<int> pts:int pts_count:int = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -367,8 +371,8 @@ updates.differenceSlice#a8fb1981 new_messages:Vector<Message> new_encrypted_mess
 updates.differenceTooLong#4afe8f6d pts:int = updates.Difference;
 
 updatesTooLong#e317af7e = Updates;
-updateShortMessage#914fbf11 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true id:int user_id:int message:string pts:int pts_count:int date:int fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to_msg_id:flags.3?int entities:flags.7?Vector<MessageEntity> = Updates;
-updateShortChatMessage#16812688 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true id:int from_id:int chat_id:int message:string pts:int pts_count:int date:int fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to_msg_id:flags.3?int entities:flags.7?Vector<MessageEntity> = Updates;
+updateShortMessage#2296d2c8 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true id:int user_id:int message:string pts:int pts_count:int date:int fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to:flags.3?MessageReplyHeader entities:flags.7?Vector<MessageEntity> = Updates;
+updateShortChatMessage#402d5dbb flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true id:int from_id:int chat_id:int message:string pts:int pts_count:int date:int fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to:flags.3?MessageReplyHeader entities:flags.7?Vector<MessageEntity> = Updates;
 updateShort#78d4dec1 update:Update date:int = Updates;
 updatesCombined#725b04c3 updates:Vector<Update> users:Vector<User> chats:Vector<Chat> date:int seq_start:int seq:int = Updates;
 updates#74ae4240 updates:Vector<Update> users:Vector<User> chats:Vector<Chat> date:int seq:int = Updates;
@@ -547,7 +551,7 @@ botInfo#98e81d3a user_id:int description:string commands:Vector<BotCommand> = Bo
 
 keyboardButton#a2fa4880 text:string = KeyboardButton;
 keyboardButtonUrl#258aff05 text:string url:string = KeyboardButton;
-keyboardButtonCallback#683a5e46 text:string data:bytes = KeyboardButton;
+keyboardButtonCallback#35bbdb6b flags:# requires_password:flags.0?true text:string data:bytes = KeyboardButton;
 keyboardButtonRequestPhone#b16a6c29 text:string = KeyboardButton;
 keyboardButtonRequestGeoLocation#fc796b3f text:string = KeyboardButton;
 keyboardButtonSwitchInline#568a748 flags:# same_peer:flags.0?true text:string query:string = KeyboardButton;
@@ -601,9 +605,10 @@ channelMessagesFilter#cd77d957 flags:# exclude_new_messages:flags.1?true ranges:
 
 channelParticipant#15ebac1d user_id:int date:int = ChannelParticipant;
 channelParticipantSelf#a3289a6d user_id:int inviter_id:int date:int = ChannelParticipant;
-channelParticipantCreator#808d15a4 flags:# user_id:int rank:flags.0?string = ChannelParticipant;
+channelParticipantCreator#447dca4b flags:# user_id:int admin_rights:ChatAdminRights rank:flags.0?string = ChannelParticipant;
 channelParticipantAdmin#ccbebbaf flags:# can_edit:flags.0?true self:flags.1?true user_id:int inviter_id:flags.1?int promoted_by:int date:int admin_rights:ChatAdminRights rank:flags.2?string = ChannelParticipant;
 channelParticipantBanned#1c0facaf flags:# left:flags.0?true user_id:int kicked_by:int date:int banned_rights:ChatBannedRights = ChannelParticipant;
+channelParticipantLeft#c3c6796b user_id:int = ChannelParticipant;
 
 channelParticipantsRecent#de3f3c79 = ChannelParticipantsFilter;
 channelParticipantsAdmins#b4608969 = ChannelParticipantsFilter;
@@ -612,6 +617,7 @@ channelParticipantsBots#b0d1865b = ChannelParticipantsFilter;
 channelParticipantsBanned#1427a5e1 q:string = ChannelParticipantsFilter;
 channelParticipantsSearch#656ac4b q:string = ChannelParticipantsFilter;
 channelParticipantsContacts#bb6ae88d q:string = ChannelParticipantsFilter;
+channelParticipantsMentions#e04b5ceb flags:# q:flags.0?string top_msg_id:flags.1?int = ChannelParticipantsFilter;
 
 channels.channelParticipants#f56ee2a8 count:int participants:Vector<ChannelParticipant> users:Vector<User> = channels.ChannelParticipants;
 channels.channelParticipantsNotModified#f0173fe9 = channels.ChannelParticipants;
@@ -625,7 +631,7 @@ messages.savedGifs#2e0709a5 hash:int gifs:Vector<Document> = messages.SavedGifs;
 
 inputBotInlineMessageMediaAuto#3380c786 flags:# message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageText#3dcd7a87 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
-inputBotInlineMessageMediaGeo#c1b15d65 flags:# geo_point:InputGeoPoint period:int reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
+inputBotInlineMessageMediaGeo#96929a85 flags:# geo_point:InputGeoPoint heading:flags.0?int period:flags.1?int proximity_notification_radius:flags.3?int reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaVenue#417bbf11 flags:# geo_point:InputGeoPoint title:string address:string provider:string venue_id:string venue_type:string reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaContact#a6edbffd flags:# phone_number:string first_name:string last_name:string vcard:string reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageGame#4b425864 flags:# reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
@@ -637,7 +643,7 @@ inputBotInlineResultGame#4fa417f2 id:string short_name:string send_message:Input
 
 botInlineMessageMediaAuto#764cf810 flags:# message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageText#8c7f65e2 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
-botInlineMessageMediaGeo#b722de65 flags:# geo:GeoPoint period:int reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
+botInlineMessageMediaGeo#51846fd flags:# geo:GeoPoint heading:flags.0?int period:flags.1?int proximity_notification_radius:flags.3?int reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaVenue#8a86659c flags:# geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaContact#18d1cdc2 flags:# phone_number:string first_name:string last_name:string vcard:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 
@@ -648,7 +654,7 @@ messages.botResults#947ca848 flags:# gallery:flags.0?true query_id:long next_off
 
 exportedMessageLink#5dab1af4 link:string html:string = ExportedMessageLink;
 
-messageFwdHeader#353a686b flags:# from_id:flags.0?int from_name:flags.5?string date:int channel_id:flags.1?int channel_post:flags.2?int post_author:flags.3?string saved_from_peer:flags.4?Peer saved_from_msg_id:flags.4?int psa_type:flags.6?string = MessageFwdHeader;
+messageFwdHeader#5f777dce flags:# from_id:flags.0?Peer from_name:flags.5?string date:int channel_post:flags.2?int post_author:flags.3?string saved_from_peer:flags.4?Peer saved_from_msg_id:flags.4?int psa_type:flags.6?string = MessageFwdHeader;
 
 auth.codeTypeSms#72a3158c = auth.CodeType;
 auth.codeTypeCall#741cd3e3 = auth.CodeType;
@@ -1029,7 +1035,7 @@ chatOnlines#f041e250 onlines:int = ChatOnlines;
 
 statsURL#47a971e0 url:string = StatsURL;
 
-chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true = ChatAdminRights;
+chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true anonymous:flags.10?true = ChatAdminRights;
 
 chatBannedRights#9f120418 flags:# view_messages:flags.0?true send_messages:flags.1?true send_media:flags.2?true send_stickers:flags.3?true send_gifs:flags.4?true send_games:flags.5?true send_inline:flags.6?true embed_links:flags.7?true send_polls:flags.8?true change_info:flags.10?true invite_users:flags.15?true pin_messages:flags.17?true until_date:int = ChatBannedRights;
 
@@ -1150,6 +1156,27 @@ stats.megagroupStats#ef7ff916 period:StatsDateRangeDays members:StatsAbsValueAnd
 
 globalPrivacySettings#bea2f424 flags:# archive_and_mute_new_noncontact_peers:flags.0?Bool = GlobalPrivacySettings;
 
+help.countryCode#4203c5ef flags:# country_code:string prefixes:flags.0?Vector<string> patterns:flags.1?Vector<string> = help.CountryCode;
+
+help.country#c3878e23 flags:# hidden:flags.0?true iso2:string default_name:string name:flags.1?string country_codes:Vector<help.CountryCode> = help.Country;
+
+help.countriesListNotModified#93cc1f32 = help.CountriesList;
+help.countriesList#87d0759e countries:Vector<help.Country> hash:int = help.CountriesList;
+
+messageViews#455b853d flags:# views:flags.0?int forwards:flags.1?int replies:flags.2?MessageReplies = MessageViews;
+
+messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> users:Vector<User> = messages.MessageViews;
+
+messages.discussionMessage#f5dd8f9d flags:# messages:Vector<Message> max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
+
+messageReplyHeader#a6d57763 flags:# reply_to_msg_id:int reply_to_peer_id:flags.0?Peer reply_to_top_id:flags.1?int = MessageReplyHeader;
+
+messageReplies#4128faac flags:# comments:flags.0?true replies:int replies_pts:int recent_repliers:flags.1?Vector<Peer> channel_id:flags.0?int max_id:flags.2?int read_max_id:flags.3?int = MessageReplies;
+
+peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
+
+stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1257,8 +1284,8 @@ contacts.getContacts#c023849f hash:int = contacts.Contacts;
 contacts.importContacts#2c800be5 contacts:Vector<InputContact> = contacts.ImportedContacts;
 contacts.deleteContacts#96a0e00 id:Vector<InputUser> = Updates;
 contacts.deleteByPhones#1013fd9e phones:Vector<string> = Bool;
-contacts.block#332b49fc id:InputUser = Bool;
-contacts.unblock#e54100bd id:InputUser = Bool;
+contacts.block#68cc1411 id:InputPeer = Bool;
+contacts.unblock#bea65d50 id:InputPeer = Bool;
 contacts.getBlocked#f57c350f offset:int limit:int = contacts.Blocked;
 contacts.search#11f812d8 q:string limit:int = contacts.Found;
 contacts.resolveUsername#f93ccba3 username:string = contacts.ResolvedPeer;
@@ -1270,19 +1297,20 @@ contacts.toggleTopPeers#8514bdda enabled:Bool = Bool;
 contacts.addContact#e8f463d0 flags:# add_phone_privacy_exception:flags.0?true id:InputUser first_name:string last_name:string phone:string = Updates;
 contacts.acceptContact#f831a20f id:InputUser = Updates;
 contacts.getLocated#d348bc44 flags:# background:flags.1?true geo_point:InputGeoPoint self_expires:flags.0?int = Updates;
+contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_history:flags.1?true report_spam:flags.2?true msg_id:int = Updates;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0ee3b73 flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:int = messages.Dialogs;
 messages.getHistory#dcbb8260 peer:InputPeer offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
-messages.search#8614ef68 flags:# peer:InputPeer q:string from_id:flags.0?InputUser filter:MessagesFilter min_date:int max_date:int offset_id:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
+messages.search#c352eec flags:# peer:InputPeer q:string from_id:flags.0?InputPeer top_msg_id:flags.1?int filter:MessagesFilter min_date:int max_date:int offset_id:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
 messages.readHistory#e306d3a peer:InputPeer max_id:int = messages.AffectedMessages;
 messages.deleteHistory#1c015b09 flags:# just_clear:flags.0?true revoke:flags.1?true peer:InputPeer max_id:int = messages.AffectedHistory;
 messages.deleteMessages#e58e95d2 flags:# revoke:flags.0?true id:Vector<int> = messages.AffectedMessages;
 messages.receivedMessages#5a954c0 max_id:int = Vector<ReceivedNotifyMessage>;
-messages.setTyping#a3825e50 peer:InputPeer action:SendMessageAction = Bool;
+messages.setTyping#58943ee2 flags:# peer:InputPeer top_msg_id:flags.0?int action:SendMessageAction = Bool;
 messages.sendMessage#520c3870 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true peer:InputPeer reply_to_msg_id:flags.0?int message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int = Updates;
 messages.sendMedia#3491eba9 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true peer:InputPeer reply_to_msg_id:flags.0?int media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int = Updates;
-messages.forwardMessages#d9fee60e flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true grouped:flags.9?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer schedule_date:flags.10?int = Updates;
+messages.forwardMessages#d9fee60e flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer schedule_date:flags.10?int = Updates;
 messages.reportSpam#cf1592db peer:InputPeer = Bool;
 messages.getPeerSettings#3672e09c peer:InputPeer = PeerSettings;
 messages.report#bd82b658 peer:InputPeer id:Vector<int> reason:ReportReason = Bool;
@@ -1299,8 +1327,8 @@ messages.acceptEncryption#3dbc0415 peer:InputEncryptedChat g_b:bytes key_fingerp
 messages.discardEncryption#edd923c5 chat_id:int = Bool;
 messages.setEncryptedTyping#791451ed peer:InputEncryptedChat typing:Bool = Bool;
 messages.readEncryptedHistory#7f4b690a peer:InputEncryptedChat max_date:int = Bool;
-messages.sendEncrypted#a9776773 peer:InputEncryptedChat random_id:long data:bytes = messages.SentEncryptedMessage;
-messages.sendEncryptedFile#9a901b66 peer:InputEncryptedChat random_id:long data:bytes file:InputEncryptedFile = messages.SentEncryptedMessage;
+messages.sendEncrypted#44fa7a15 flags:# silent:flags.0?true peer:InputEncryptedChat random_id:long data:bytes = messages.SentEncryptedMessage;
+messages.sendEncryptedFile#5559481d flags:# silent:flags.0?true peer:InputEncryptedChat random_id:long data:bytes file:InputEncryptedFile = messages.SentEncryptedMessage;
 messages.sendEncryptedService#32d439a4 peer:InputEncryptedChat random_id:long data:bytes = messages.SentEncryptedMessage;
 messages.receivedQueue#55a5bb66 max_qts:int = Vector<long>;
 messages.reportEncryptedSpam#4b0c8c0f peer:InputEncryptedChat = Bool;
@@ -1315,10 +1343,10 @@ messages.getStickerSet#2619a90e stickerset:InputStickerSet = messages.StickerSet
 messages.installStickerSet#c78fe460 stickerset:InputStickerSet archived:Bool = messages.StickerSetInstallResult;
 messages.uninstallStickerSet#f96e55de stickerset:InputStickerSet = Bool;
 messages.startBot#e6df7378 bot:InputUser peer:InputPeer random_id:long start_param:string = Updates;
-messages.getMessagesViews#c4c8a55d peer:InputPeer id:Vector<int> increment:Bool = Vector<int>;
+messages.getMessagesViews#5784d3e1 peer:InputPeer id:Vector<int> increment:Bool = messages.MessageViews;
 messages.editChatAdmin#a9e69f2e chat_id:int user_id:InputUser is_admin:Bool = Bool;
 messages.migrateChat#15a3b8e3 chat_id:int = Updates;
-messages.searchGlobal#bf7225a4 flags:# folder_id:flags.0?int q:string offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
+messages.searchGlobal#4bc6589a flags:# folder_id:flags.0?int q:string filter:MessagesFilter min_date:int max_date:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 messages.reorderStickerSets#78337739 flags:# masks:flags.0?true order:Vector<long> = Bool;
 messages.getDocumentByHash#338e2464 sha256:bytes size:int mime_type:string = Document;
 messages.getSavedGifs#83bf3d52 hash:int = messages.SavedGifs;
@@ -1329,7 +1357,7 @@ messages.sendInlineBotResult#220815b0 flags:# silent:flags.5?true background:fla
 messages.getMessageEditData#fda68d36 peer:InputPeer id:int = messages.MessageEditData;
 messages.editMessage#48f71778 flags:# no_webpage:flags.1?true peer:InputPeer id:int message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.15?int = Updates;
 messages.editInlineBotMessage#83557dba flags:# no_webpage:flags.1?true id:InputBotInlineMessageID message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> = Bool;
-messages.getBotCallbackAnswer#810a9fec flags:# game:flags.1?true peer:InputPeer msg_id:int data:flags.0?bytes = messages.BotCallbackAnswer;
+messages.getBotCallbackAnswer#9342ca07 flags:# game:flags.1?true peer:InputPeer msg_id:int data:flags.0?bytes password:flags.2?InputCheckPasswordSRP = messages.BotCallbackAnswer;
 messages.setBotCallbackAnswer#d58f130a flags:# alert:flags.1?true query_id:long message:flags.0?string url:flags.2?string cache_time:int = Bool;
 messages.getPeerDialogs#e470bcfd peers:Vector<InputDialogPeer> = messages.PeerDialogs;
 messages.saveDraft#bc39e14b flags:# no_webpage:flags.1?true reply_to_msg_id:flags.0?int peer:InputPeer message:string entities:flags.3?Vector<MessageEntity> = Bool;
@@ -1368,7 +1396,7 @@ messages.getSplitRanges#1cff7e08 = Vector<MessageRange>;
 messages.markDialogUnread#c286d98f flags:# unread:flags.0?true peer:InputDialogPeer = Bool;
 messages.getDialogUnreadMarks#22e24e22 = Vector<DialogPeer>;
 messages.clearAllDrafts#7e58ee9c = Bool;
-messages.updatePinnedMessage#d2aaf7ec flags:# silent:flags.0?true peer:InputPeer id:int = Updates;
+messages.updatePinnedMessage#d2aaf7ec flags:# silent:flags.0?true unpin:flags.1?true pm_oneside:flags.2?true peer:InputPeer id:int = Updates;
 messages.sendVote#10ea6184 peer:InputPeer msg_id:int options:Vector<bytes> = Updates;
 messages.getPollResults#73bb643b peer:InputPeer msg_id:int = Updates;
 messages.getOnlines#6e2be050 peer:InputPeer = ChatOnlines;
@@ -1394,6 +1422,10 @@ messages.getSuggestedDialogFilters#a29cd42c = Vector<DialogFilterSuggested>;
 messages.updateDialogFilter#1ad4a04a flags:# id:int filter:flags.0?DialogFilter = Bool;
 messages.updateDialogFiltersOrder#c563c1e4 order:Vector<int> = Bool;
 messages.getOldFeaturedStickers#5fe7025b offset:int limit:int hash:int = messages.FeaturedStickers;
+messages.getReplies#24b581ba peer:InputPeer msg_id:int offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
+messages.getDiscussionMessage#446972fd peer:InputPeer msg_id:int = messages.DiscussionMessage;
+messages.readDiscussion#f731a9f4 peer:InputPeer msg_id:int read_max_id:int = Bool;
+messages.unpinAllMessages#f025bc8b peer:InputPeer = messages.AffectedHistory;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
@@ -1434,6 +1466,7 @@ help.editUserInfo#66b91b70 user_id:InputUser message:string entities:Vector<Mess
 help.getPromoData#c0977421 = help.PromoData;
 help.hidePromoData#1e251c95 peer:InputPeer = Bool;
 help.dismissSuggestion#77fa99f suggestion:string = Bool;
+help.getCountriesList#735787a8 lang_code:string hash:int = help.CountriesList;
 
 channels.readHistory#cc104937 channel:InputChannel max_id:int = Bool;
 channels.deleteMessages#84c1fd4e channel:InputChannel id:Vector<int> = messages.AffectedMessages;
@@ -1454,7 +1487,7 @@ channels.joinChannel#24b524c5 channel:InputChannel = Updates;
 channels.leaveChannel#f836aa95 channel:InputChannel = Updates;
 channels.inviteToChannel#199f3a6c channel:InputChannel users:Vector<InputUser> = Updates;
 channels.deleteChannel#c0111fe3 channel:InputChannel = Updates;
-channels.exportMessageLink#ceb77163 channel:InputChannel id:int grouped:Bool = ExportedMessageLink;
+channels.exportMessageLink#e63fadeb flags:# grouped:flags.0?true thread:flags.1?true channel:InputChannel id:int = ExportedMessageLink;
 channels.toggleSignatures#1f69b606 channel:InputChannel enabled:Bool = Updates;
 channels.getAdminedPublicChannels#f8b036af flags:# by_location:flags.0?true check_limit:flags.1?true = messages.Chats;
 channels.editBanned#72796912 channel:InputChannel user_id:InputUser banned_rights:ChatBannedRights = Updates;
@@ -1511,5 +1544,7 @@ folders.deleteFolder#1c295881 folder_id:int = Updates;
 stats.getBroadcastStats#ab42441a flags:# dark:flags.0?true channel:InputChannel = stats.BroadcastStats;
 stats.loadAsyncGraph#621d5fa0 flags:# token:string x:flags.0?long = StatsGraph;
 stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel = stats.MegagroupStats;
+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 117
+// LAYER 120

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.3.1.0" />
+    Version="2.4.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,5,0
+ PRODUCTVERSION 2,4,5,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.3.1.0"
+            VALUE "FileVersion", "2.4.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.3.1.0"
+            VALUE "ProductVersion", "2.4.5.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,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,5,0
+ PRODUCTVERSION 2,4,5,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.3.1.0"
+            VALUE "FileVersion", "2.4.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.3.1.0"
+            VALUE "ProductVersion", "2.4.5.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/api/api_attached_stickers.cpp

@@ -0,0 +1,82 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_attached_stickers.h"
+
+#include "apiwrap.h"
+#include "boxes/confirm_box.h"
+#include "boxes/sticker_set_box.h"
+#include "boxes/stickers_box.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
+#include "lang/lang_keys.h"
+#include "window/window_session_controller.h"
+
+namespace Api {
+
+AttachedStickers::AttachedStickers(not_null<ApiWrap*> api)
+: _api(&api->instance()) {
+}
+
+void AttachedStickers::request(
+		not_null<Window::SessionController*> controller,
+		MTPmessages_GetAttachedStickers &&mtpRequest) {
+	const auto weak = base::make_weak(controller.get());
+	_api.request(_requestId).cancel();
+	_requestId = _api.request(
+		std::move(mtpRequest)
+	).done([=](const MTPVector<MTPStickerSetCovered> &result) {
+		_requestId = 0;
+		const auto strongController = weak.get();
+		if (!strongController) {
+			return;
+		}
+		if (result.v.isEmpty()) {
+			Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
+			return;
+		} else if (result.v.size() > 1) {
+			Ui::show(Box<StickersBox>(strongController, result));
+			return;
+		}
+		// Single attached sticker pack.
+		const auto setData = result.v.front().match([&](const auto &data) {
+			return data.vset().match([&](const MTPDstickerSet &data) {
+				return &data;
+			});
+		});
+
+		const auto setId = (setData->vid().v && setData->vaccess_hash().v)
+			? MTP_inputStickerSetID(setData->vid(), setData->vaccess_hash())
+			: MTP_inputStickerSetShortName(setData->vshort_name());
+		Ui::show(
+			Box<StickerSetBox>(strongController, setId),
+			Ui::LayerOption::KeepOther);
+	}).fail([=](const RPCError &error) {
+		_requestId = 0;
+		Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
+	}).send();
+}
+
+void AttachedStickers::requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo) {
+	request(
+		controller,
+		MTPmessages_GetAttachedStickers(
+			MTP_inputStickeredMediaPhoto(photo->mtpInput())));
+}
+
+void AttachedStickers::requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document) {
+	request(
+		controller,
+		MTPmessages_GetAttachedStickers(
+			MTP_inputStickeredMediaDocument(document->mtpInput())));
+}
+
+} // namespace Api

Telegram/SourceFiles/api/api_attached_stickers.h

@@ -0,0 +1,44 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+class DocumentData;
+class PhotoData;
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Api {
+
+class AttachedStickers final {
+public:
+	explicit AttachedStickers(not_null<ApiWrap*> api);
+
+	void requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo);
+
+	void requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document);
+
+private:
+	void request(
+		not_null<Window::SessionController*> controller,
+		MTPmessages_GetAttachedStickers &&mtpRequest);
+
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+
+};
+
+} // namespace Api

Telegram/SourceFiles/api/api_authorizations.cpp

@@ -0,0 +1,166 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_authorizations.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "core/changelogs.h"
+#include "lang/lang_keys.h"
+
+namespace Api {
+namespace {
+
+constexpr auto TestApiId = 17349;
+constexpr auto DesktopApiId = 2040;
+
+Authorizations::Entry ParseEntry(const MTPDauthorization &data) {
+	auto result = Authorizations::Entry();
+
+	result.hash = data.is_current() ? 0 : data.vhash().v;
+	result.incomplete = data.is_password_pending();
+
+	const auto apiId = data.vapi_id().v;
+	const auto isTest = (apiId == TestApiId);
+	const auto isDesktop = (apiId == DesktopApiId) || isTest;
+
+	const auto appName = isDesktop
+		? QString("Telegram Desktop%1").arg(isTest ? " (GitHub)" : QString())
+		: qs(data.vapp_name());// +qsl(" for ") + qs(d.vplatform());
+	const auto appVer = [&] {
+		const auto version = qs(data.vapp_version());
+		if (isDesktop) {
+			const auto verInt = version.toInt();
+			if (version == QString::number(verInt)) {
+				return Core::FormatVersionDisplay(verInt);
+			}
+		} else {
+			if (const auto index = version.indexOf('('); index >= 0) {
+				return version.mid(index);
+			}
+		}
+		return version;
+	}();
+
+	result.name = QString("%1%2")
+		.arg(appName)
+		.arg(appVer.isEmpty() ? QString() : (' ' + appVer));
+
+	const auto country = qs(data.vcountry());
+	const auto platform = qs(data.vplatform());
+	//const auto &countries = countriesByISO2();
+	//const auto j = countries.constFind(country);
+	//if (j != countries.cend()) {
+	//	country = QString::fromUtf8(j.value()->name);
+	//}
+
+	result.activeTime = data.vdate_active().v
+		? data.vdate_active().v
+		: data.vdate_created().v;
+	result.info = QString("%1, %2%3")
+		.arg(qs(data.vdevice_model()))
+		.arg(platform.isEmpty() ? QString() : platform + ' ')
+		.arg(qs(data.vsystem_version()));
+	result.ip = qs(data.vip())
+		+ (country.isEmpty()
+			? QString()
+			: QString::fromUtf8(" \xe2\x80\x93 ") + country);
+	if (!result.hash) {
+		result.active = tr::lng_status_online(tr::now);
+	} else {
+		const auto now = QDateTime::currentDateTime();
+		const auto lastTime = base::unixtime::parse(result.activeTime);
+		const auto nowDate = now.date();
+		const auto lastDate = lastTime.date();
+		if (lastDate == nowDate) {
+			result.active = lastTime.toString(cTimeFormat());
+		} else if (lastDate.year() == nowDate.year()
+			&& lastDate.weekNumber() == nowDate.weekNumber()) {
+			result.active = langDayOfWeek(lastDate);
+		} else {
+			result.active = lastDate.toString(qsl("d.MM.yy"));
+		}
+	}
+
+	return result;
+}
+
+} // namespace
+
+Authorizations::Authorizations(not_null<ApiWrap*> api)
+: _api(&api->instance()) {
+}
+
+void Authorizations::reload() {
+	if (_requestId) {
+		return;
+	}
+
+	_requestId = _api.request(MTPaccount_GetAuthorizations(
+	)).done([=](const MTPaccount_Authorizations &result) {
+		_requestId = 0;
+		_lastReceived = crl::now();
+		result.match([&](const MTPDaccount_authorizations &auths) {
+			_list = (
+				auths.vauthorizations().v
+			) | ranges::view::transform([](const MTPAuthorization &d) {
+				return ParseEntry(d.c_authorization());
+			}) | ranges::to<List>;
+			_listChanges.fire({});
+		});
+	}).fail([=](const RPCError &error) {
+		_requestId = 0;
+	}).send();
+}
+
+void Authorizations::cancelCurrentRequest() {
+	_api.request(base::take(_requestId)).cancel();
+}
+
+void Authorizations::requestTerminate(
+		Fn<void(const MTPBool &result)> &&done,
+		Fn<void(const RPCError &error)> &&fail,
+		std::optional<uint64> hash) {
+	auto request = hash
+		? MTPaccount_ResetAuthorization(MTP_long(*hash))
+		: MTPaccount_ResetAuthorization();
+	_api.request(std::move(request))
+	.done(std::move(done))
+	.fail(std::move(fail))
+	.send();
+}
+
+Authorizations::List Authorizations::list() const {
+	return _list;
+}
+
+auto Authorizations::listChanges() const
+-> rpl::producer<Authorizations::List> {
+	return rpl::single(
+		list()
+	) | rpl::then(
+		_listChanges.events() | rpl::map([=] { return list(); }));
+}
+
+rpl::producer<int> Authorizations::totalChanges() const {
+	return rpl::single(
+		total()
+	) | rpl::then(
+		_listChanges.events() | rpl::map([=] { return total(); }));
+}
+
+int Authorizations::total() const {
+	return ranges::count_if(
+		_list,
+		ranges::not_fn(&Entry::incomplete));
+}
+
+crl::time Authorizations::lastReceivedTime() {
+	return _lastReceived;
+}
+
+} // namespace Api

Telegram/SourceFiles/api/api_authorizations.h

@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+
+namespace Api {
+
+class Authorizations final {
+public:
+	explicit Authorizations(not_null<ApiWrap*> api);
+
+	struct Entry {
+		uint64 hash = 0;
+
+		bool incomplete = false;
+		TimeId activeTime = 0;
+		QString name, active, info, ip;
+	};
+	using List = std::vector<Entry>;
+
+	void reload();
+	void cancelCurrentRequest();
+	void requestTerminate(
+		Fn<void(const MTPBool &result)> &&done,
+		Fn<void(const RPCError &error)> &&fail,
+		std::optional<uint64> hash = std::nullopt);
+
+	[[nodiscard]] crl::time lastReceivedTime();
+
+	[[nodiscard]] List list() const;
+	[[nodiscard]] rpl::producer<List> listChanges() const;
+	[[nodiscard]] int total() const;
+	[[nodiscard]] rpl::producer<int> totalChanges() const;
+
+private:
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+
+	List _list;
+	rpl::event_stream<> _listChanges;
+
+	crl::time _lastReceived = 0;
+
+};
+
+} // namespace Api

Telegram/SourceFiles/api/api_bot.cpp

@@ -8,9 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_bot.h"
 
 #include "apiwrap.h"
+#include "core/core_cloud_password.h"
 #include "api/api_send_progress.h"
 #include "boxes/confirm_box.h"
 #include "boxes/share_box.h"
+#include "boxes/passcode_box.h"
+#include "lang/lang_keys.h"
 #include "core/click_handler_types.h"
 #include "data/data_changes.h"
 #include "data/data_peer.h"
@@ -20,10 +23,129 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "main/main_session.h"
 #include "ui/toast/toast.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 
 namespace Api {
+namespace {
 
 void SendBotCallbackData(
+		not_null<HistoryItem*> item,
+		int row,
+		int column,
+		std::optional<MTPInputCheckPasswordSRP> password = std::nullopt,
+		Fn<void(const RPCError &)> handleError = nullptr) {
+	if (!IsServerMsgId(item->id)) {
+		return;
+	}
+	const auto history = item->history();
+	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(
+			owner,
+			fullId,
+			row,
+			column);
+	};
+	const auto button = getButton();
+	if (!button || button->requestId) {
+		return;
+	}
+
+	using ButtonType = HistoryMessageMarkupButton::Type;
+	const auto isGame = (button->type == ButtonType::Game);
+
+	auto flags = MTPmessages_GetBotCallbackAnswer::Flags(0);
+	QByteArray sendData;
+	if (isGame) {
+		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_game;
+	} else if (button->type == ButtonType::Callback
+		|| button->type == ButtonType::CallbackWithPassword) {
+		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_data;
+		sendData = button->data;
+	}
+	const auto withPassword = password.has_value();
+	if (withPassword) {
+		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_password;
+	}
+	button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
+		MTP_flags(flags),
+		history->peer->input,
+		MTP_int(item->id),
+		MTP_bytes(sendData),
+		password.value_or(MTP_inputCheckPasswordEmpty())
+	)).done([=](const MTPmessages_BotCallbackAnswer &result) {
+		const auto item = owner->message(fullId);
+		if (!item) {
+			return;
+		}
+		if (const auto button = getButton()) {
+			button->requestId = 0;
+			owner->requestItemRepaint(item);
+		}
+		result.match([&](const MTPDmessages_botCallbackAnswer &data) {
+			if (const auto message = data.vmessage()) {
+				if (data.is_alert()) {
+					Ui::show(Box<InformBox>(qs(*message)));
+				} else {
+					if (withPassword) {
+						Ui::hideLayer();
+					}
+					Ui::Toast::Show(qs(*message));
+				}
+			} else if (const auto url = data.vurl()) {
+				const auto link = qs(*url);
+				if (!isGame) {
+					UrlClickHandler::Open(link);
+					return;
+				}
+				const auto scoreLink = AppendShareGameScoreUrl(
+					session,
+					link,
+					item->fullId());
+				BotGameUrlClickHandler(bot, scoreLink).onClick({});
+				session->sendProgressManager().update(
+					history,
+					Api::SendProgressType::PlayGame);
+			} else if (withPassword) {
+				Ui::hideLayer();
+			}
+		});
+	}).fail([=](const RPCError &error) {
+		const auto item = owner->message(fullId);
+		if (!item) {
+			return;
+		}
+		// Show error?
+		if (const auto button = getButton()) {
+			button->requestId = 0;
+			owner->requestItemRepaint(item);
+		}
+		if (handleError) {
+			handleError(error);
+		}
+	}).send();
+
+	session->changes().messageUpdated(
+		item,
+		Data::MessageUpdate::Flag::BotCallbackSent
+	);
+}
+
+} // namespace
+
+void SendBotCallbackData(
+		not_null<HistoryItem*> item,
+		int row,
+		int column) {
+	SendBotCallbackData(item, row, column, MTP_inputCheckPasswordEmpty());
+}
+
+void SendBotCallbackDataWithPassword(
 		not_null<HistoryItem*> item,
 		int row,
 		int column) {
@@ -44,74 +166,63 @@ void SendBotCallbackData(
 			column);
 	};
 	const auto button = getButton();
-	if (!button) {
+	if (!button || button->requestId) {
 		return;
 	}
-
-	using ButtonType = HistoryMessageMarkupButton::Type;
-	const auto isGame = (button->type == ButtonType::Game);
-
-	auto flags = MTPmessages_GetBotCallbackAnswer::Flags(0);
-	QByteArray sendData;
-	if (isGame) {
-		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_game;
-	} else if (button->type == ButtonType::Callback) {
-		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_data;
-		sendData = button->data;
-	}
-	button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
-		MTP_flags(flags),
-		history->peer->input,
-		MTP_int(item->id),
-		MTP_bytes(sendData)
-	)).done([=](const MTPmessages_BotCallbackAnswer &result) {
-		const auto item = owner->message(fullId);
-		if (!item) {
-			return;
-		}
-		if (const auto button = getButton()) {
-			button->requestId = 0;
-			owner->requestItemRepaint(item);
-		}
-		result.match([&](const MTPDmessages_botCallbackAnswer &data) {
-			if (const auto message = data.vmessage()) {
-				if (data.is_alert()) {
-					Ui::show(Box<InformBox>(qs(*message)));
-				} else {
-					Ui::Toast::Show(qs(*message));
+	api->reloadPasswordState();
+	SendBotCallbackData(item, row, column, MTP_inputCheckPasswordEmpty(), [=](const RPCError &error) {
+		auto box = PrePasswordErrorBox(
+			error,
+			session,
+			tr::lng_bots_password_confirm_check_about(
+				tr::now,
+				Ui::Text::WithEntities));
+		if (box) {
+			Ui::show(std::move(box));
+		} else {
+			auto lifetime = std::make_shared<rpl::lifetime>();
+			button->requestId = -1;
+			api->passwordState(
+			) | rpl::take(
+				1
+			) | rpl::start_with_next([=](const Core::CloudPasswordState &state) mutable {
+				if (lifetime) {
+					base::take(lifetime)->destroy();
 				}
-			} else if (const auto url = data.vurl()) {
-				const auto link = qs(*url);
-				if (!isGame) {
-					UrlClickHandler::Open(link);
+				if (const auto button = getButton()) {
+					if (button->requestId == -1) {
+						button->requestId = 0;
+					}
+				} else {
 					return;
 				}
-				const auto scoreLink = AppendShareGameScoreUrl(
-					session,
-					link,
-					item->fullId());
-				BotGameUrlClickHandler(bot, scoreLink).onClick({});
-				session->sendProgressManager().update(
-					history,
-					Api::SendProgressType::PlayGame);
-			}
-		});
-	}).fail([=](const RPCError &error) {
-		const auto item = owner->message(fullId);
-		if (!item) {
-			return;
+				const auto box = std::make_shared<QPointer<PasscodeBox>>();
+				auto fields = PasscodeBox::CloudFields::From(state);
+				fields.customTitle = tr::lng_bots_password_confirm_title();
+				fields.customDescription
+					= tr::lng_bots_password_confirm_description(tr::now);
+				fields.customSubmitButton = tr::lng_passcode_submit();
+				fields.customCheckCallback = [=](
+						const Core::CloudPasswordResult &result) {
+					if (const auto button = getButton()) {
+						if (button->requestId) {
+							return;
+						}
+					} else {
+						return;
+					}
+					if (const auto item = owner->message(fullId)) {
+						SendBotCallbackData(item, row, column, result.result, [=](const RPCError &error) {
+							if (*box) {
+								(*box)->handleCustomCheckError(error);
+							}
+						});
+					}
+				};
+				*box = Ui::show(Box<PasscodeBox>(session, fields));
+			}, *lifetime);
 		}
-		// Show error?
-		if (const auto button = getButton()) {
-			button->requestId = 0;
-			owner->requestItemRepaint(item);
-		}
-	}).send();
-
-	session->changes().messageUpdated(
-		item,
-		Data::MessageUpdate::Flag::BotCallbackSent
-	);
+	});
 }
 
 } // namespace Api

Telegram/SourceFiles/api/api_bot.h

@@ -16,4 +16,9 @@ void SendBotCallbackData(
 	int row,
 	int column);
 
+void SendBotCallbackDataWithPassword(
+	not_null<HistoryItem*> item,
+	int row,
+	int column);
+
 } // namespace Api

Telegram/SourceFiles/api/api_send_progress.cpp

@@ -10,12 +10,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "history/history.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
+#include "base/unixtime.h"
+#include "data/data_peer_values.h"
 #include "apiwrap.h"
 
 namespace Api {
 namespace {
 
 constexpr auto kCancelTypingActionTimeout = crl::time(5000);
+constexpr auto kSetMyActionForMs = 10 * crl::time(1000);
+constexpr auto kSendTypingsToOfflineFor = TimeId(30);
 
 } // namespace
 
@@ -27,7 +32,14 @@ SendProgressManager::SendProgressManager(not_null<Main::Session*> session)
 void SendProgressManager::cancel(
 		not_null<History*> history,
 		SendProgressType type) {
-	const auto i = _requests.find({ history, type });
+	cancel(history, 0, type);
+}
+
+void SendProgressManager::cancel(
+		not_null<History*> history,
+		MsgId topMsgId,
+		SendProgressType type) {
+	const auto i = _requests.find(Key{ history, topMsgId, type });
 	if (i != _requests.end()) {
 		_session->api().request(i->second).cancel();
 		_requests.erase(i);
@@ -42,29 +54,61 @@ void SendProgressManager::cancelTyping(not_null<History*> history) {
 void SendProgressManager::update(
 		not_null<History*> history,
 		SendProgressType type,
-		int32 progress) {
+		int progress) {
+	update(history, 0, type, progress);
+}
+
+void SendProgressManager::update(
+		not_null<History*> history,
+		MsgId topMsgId,
+		SendProgressType type,
+		int progress) {
 	const auto peer = history->peer;
 	if (peer->isSelf() || (peer->isChannel() && !peer->isMegagroup())) {
 		return;
 	}
 
 	const auto doing = (progress >= 0);
-	if (history->mySendActionUpdated(type, doing)) {
-		cancel(history, type);
+	const auto key = Key{ history, topMsgId, type };
+	if (updated(key, doing)) {
+		cancel(history, topMsgId, type);
 		if (doing) {
-			send(history, type, progress);
+			send(key, progress);
 		}
 	}
 }
 
-void SendProgressManager::send(
-		not_null<History*> history,
-		SendProgressType type,
-		int32 progress) {
+bool SendProgressManager::updated(const Key &key, bool doing) {
+	const auto now = crl::now();
+	const auto i = _updated.find(key);
+	if (doing) {
+		if (i == end(_updated)) {
+			_updated.emplace(key, now + kSetMyActionForMs);
+		} else if (i->second > now + (kSetMyActionForMs / 2)) {
+			return false;
+		} else {
+			i->second = now + kSetMyActionForMs;
+		}
+	} else {
+		if (i == end(_updated)) {
+			return false;
+		} else if (i->second <= now) {
+			return false;
+		} else {
+			_updated.erase(i);
+		}
+	}
+	return true;
+}
+
+void SendProgressManager::send(const Key &key, int progress) {
+	if (skipRequest(key)) {
+		return;
+	}
 	using Type = SendProgressType;
 	const auto action = [&]() -> MTPsendMessageAction {
 		const auto p = MTP_int(progress);
-		switch (type) {
+		switch (key.type) {
 		case Type::Typing: return MTP_sendMessageTypingAction();
 		case Type::RecordVideo: return MTP_sendMessageRecordVideoAction();
 		case Type::UploadVideo: return MTP_sendMessageUploadVideoAction(p);
@@ -81,19 +125,43 @@ void SendProgressManager::send(
 		}
 	}();
 	const auto requestId = _session->api().request(MTPmessages_SetTyping(
-		history->peer->input,
+		MTP_flags(key.topMsgId
+			? MTPmessages_SetTyping::Flag::f_top_msg_id
+			: MTPmessages_SetTyping::Flag(0)),
+		key.history->peer->input,
+		MTP_int(key.topMsgId),
 		action
 	)).done([=](const MTPBool &result, mtpRequestId requestId) {
 		done(result, requestId);
 	}).send();
-	_requests.emplace(Key{ history, type }, requestId);
+	_requests.emplace(key, requestId);
 
-	if (type == Type::Typing) {
-		_stopTypingHistory = history;
+	if (key.type == Type::Typing) {
+		_stopTypingHistory = key.history;
 		_stopTypingTimer.callOnce(kCancelTypingActionTimeout);
 	}
 }
 
+bool SendProgressManager::skipRequest(const Key &key) const {
+	const auto user = key.history->peer->asUser();
+	if (!user) {
+		return false;
+	} else if (user->isSelf()) {
+		return true;
+	} else if (user->isBot() && !user->isSupport()) {
+		return true;
+	}
+	const auto recently = base::unixtime::now() - kSendTypingsToOfflineFor;
+	const auto online = user->onlineTill;
+	if (online == -2) { // last seen recently
+		return false;
+	} else if (online < 0) {
+		return (-online < recently);
+	} else {
+		return (online < recently);
+	}
+}
+
 void SendProgressManager::done(
 		const MTPBool &result,
 		mtpRequestId requestId) {

Telegram/SourceFiles/api/api_send_progress.h

@@ -55,7 +55,16 @@ public:
 	void update(
 		not_null<History*> history,
 		SendProgressType type,
-		int32 progress = 0);
+		int progress = 0);
+	void update(
+		not_null<History*> history,
+		MsgId topMsgId,
+		SendProgressType type,
+		int progress = 0);
+	void cancel(
+		not_null<History*> history,
+		MsgId topMsgId,
+		SendProgressType type);
 	void cancel(
 		not_null<History*> history,
 		SendProgressType type);
@@ -64,22 +73,28 @@ public:
 private:
 	struct Key {
 		not_null<History*> history;
+		MsgId topMsgId = 0;
 		SendProgressType type = SendProgressType();
 
 		inline bool operator<(const Key &other) const {
 			return (history < other.history)
-				|| (history == other.history && type < other.type);
+				|| (history == other.history && topMsgId < other.topMsgId)
+				|| (history == other.history
+					&& topMsgId == other.topMsgId
+					&& type < other.type);
 		}
 	};
 
-	void send(
-		not_null<History*> history,
-		SendProgressType type,
-		int32 progress);
+	bool updated(const Key &key, bool doing);
+
+	void send(const Key &key, int progress);
 	void done(const MTPBool &result, mtpRequestId requestId);
 
+	[[nodiscard]] bool skipRequest(const Key &key) const;
+
 	const not_null<Main::Session*> _session;
 	base::flat_map<Key, mtpRequestId> _requests;
+	base::flat_map<Key, crl::time> _updated;
 	base::Timer _stopTypingTimer;
 	History *_stopTypingHistory = nullptr;
 

Telegram/SourceFiles/api/api_sending.cpp

@@ -21,8 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_message.h" // NewMessageFlags.
 #include "chat_helpers/message_field.h" // ConvertTextTagsToEntities.
+#include "chat_helpers/stickers_dice_pack.h" // DicePacks::kDiceString.
 #include "ui/text/text_entity.h" // TextWithEntities.
-#include "ui/text_options.h" // Ui::ItemTextOptions.
+#include "ui/item_text_options.h" // Ui::ItemTextOptions.
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_app_config.h"
@@ -39,10 +40,12 @@ void InnerFillMessagePostFlags(
 		const Api::SendOptions &options,
 		not_null<PeerData*> peer,
 		MTPDmessage::Flags &flags) {
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
-	if (!channelPost) {
+	const auto anonymousPost = peer->amAnonymous();
+	if (!anonymousPost) {
 		flags |= MTPDmessage::Flag::f_from_id;
 		return;
+	} else if (peer->asMegagroup()) {
+		return;
 	}
 	flags |= MTPDmessage::Flag::f_post;
 	// Don't display views and author of a new post when it's scheduled.
@@ -79,18 +82,18 @@ void SendExistingMedia(
 	auto clientFlags = NewMessageClientFlags();
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+		flags |= MTPDmessage::Flag::f_reply_to;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = message.action.options.silent
-		|| (channelPost && session->data().notifySilentPosts(peer));
+		|| (peer->isBroadcast() && session->data().notifySilentPosts(peer));
 	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
-	auto messageFromId = channelPost ? 0 : session->userId();
-	auto messagePostAuthor = channelPost ? session->user()->name : QString();
+	auto messageFromId = anonymousPost ? 0 : session->userPeerId();
+	auto messagePostAuthor = peer->isBroadcast() ? session->user()->name : QString();
 
 	auto caption = TextWithEntities{
 		message.textWithTags.text,
@@ -219,8 +222,12 @@ bool SendDice(Api::MessageToSend &message) {
 	auto &account = message.action.history->session().account();
 	auto &config = account.appConfig();
 	static const auto hardcoded = std::vector<QString>{
-		QString::fromUtf8("\xF0\x9F\x8E\xB2"),
-		QString::fromUtf8("\xF0\x9F\x8E\xAF")
+		Stickers::DicePacks::kDiceString,
+		Stickers::DicePacks::kDartString,
+		Stickers::DicePacks::kSlotString,
+		Stickers::DicePacks::kFballString,
+		Stickers::DicePacks::kFballString + QChar(0xFE0F),
+		Stickers::DicePacks::kBballString,
 	};
 	const auto list = config.get<std::vector<QString>>(
 		"emojies_send_dice",
@@ -249,18 +256,19 @@ bool SendDice(Api::MessageToSend &message) {
 	auto clientFlags = NewMessageClientFlags();
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+		flags |= MTPDmessage::Flag::f_reply_to;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	const auto replyHeader = NewMessageReplyHeader(message.action);
+	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = message.action.options.silent
-		|| (channelPost && session->data().notifySilentPosts(peer));
+		|| (peer->isBroadcast() && session->data().notifySilentPosts(peer));
 	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
-	auto messageFromId = channelPost ? 0 : session->userId();
-	auto messagePostAuthor = channelPost ? session->user()->name : QString();
+	auto messageFromId = anonymousPost ? 0 : session->userPeerId();
+	auto messagePostAuthor = peer->isBroadcast() ? session->user()->name : QString();
 	const auto replyTo = message.action.replyTo;
 
 	if (message.action.options.scheduled) {
@@ -272,23 +280,27 @@ bool SendDice(Api::MessageToSend &message) {
 
 	session->data().registerMessageRandomId(randomId, newId);
 
+	const auto views = 1;
+	const auto forwards = 0;
 	history->addNewMessage(
 		MTP_message(
 			MTP_flags(flags),
 			MTP_int(newId.msg),
-			MTP_int(messageFromId),
+			peerToMTP(messageFromId),
 			peerToMTP(history->peer->id),
 			MTPMessageFwdHeader(),
-			MTP_int(0),
-			MTP_int(replyTo),
+			MTPint(), // via_bot_id
+			replyHeader,
 			MTP_int(HistoryItem::NewMessageDate(
 				message.action.options.scheduled)),
 			MTP_string(),
 			MTP_messageMediaDice(MTP_int(0), MTP_string(emoji)),
 			MTPReplyMarkup(),
 			MTP_vector<MTPMessageEntity>(),
-			MTP_int(1),
-			MTPint(),
+			MTP_int(views),
+			MTP_int(forwards),
+			MTPMessageReplies(),
+			MTPint(), // edit_date
 			MTP_string(messagePostAuthor),
 			MTPlong(),
 			//MTPMessageReactions(),
@@ -387,9 +399,10 @@ void SendConfirmedFile(
 		| MTPDmessage::Flag::f_media;
 	auto clientFlags = NewMessageClientFlags();
 	if (file->to.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+		flags |= MTPDmessage::Flag::f_reply_to;
 	}
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	const auto replyHeader = NewMessageReplyHeader(action);
+	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = file->to.options.silent;
 	Api::FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
@@ -406,11 +419,13 @@ void SendConfirmedFile(
 		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
 	}
 
-	const auto messageFromId = channelPost ? 0 : session->userId();
-	const auto messagePostAuthor = channelPost
+	const auto messageFromId = anonymousPost ? 0 : session->userPeerId();
+	const auto messagePostAuthor = peer->isBroadcast()
 		? session->user()->name
 		: QString();
 
+	const auto views = 1;
+	const auto forwards = 0;
 	if (file->type == SendMediaType::Photo) {
 		const auto photoFlags = MTPDmessageMediaPhoto::Flag::f_photo | 0;
 		const auto photo = MTP_messageMediaPhoto(
@@ -421,18 +436,20 @@ void SendConfirmedFile(
 		const auto mtpMessage = MTP_message(
 			MTP_flags(flags),
 			MTP_int(newId.msg),
-			MTP_int(messageFromId),
+			peerToMTP(messageFromId),
 			peerToMTP(file->to.peer),
 			MTPMessageFwdHeader(),
 			MTPint(),
-			MTP_int(file->to.replyTo),
+			replyHeader,
 			MTP_int(HistoryItem::NewMessageDate(file->to.options.scheduled)),
 			MTP_string(caption.text),
 			photo,
 			MTPReplyMarkup(),
 			localEntities,
-			MTP_int(1),
-			MTPint(),
+			MTP_int(views),
+			MTP_int(forwards),
+			MTPMessageReplies(),
+			MTPint(), // edit_date
 			MTP_string(messagePostAuthor),
 			MTP_long(groupId),
 			//MTPMessageReactions(),
@@ -457,18 +474,20 @@ void SendConfirmedFile(
 		const auto mtpMessage = MTP_message(
 			MTP_flags(flags),
 			MTP_int(newId.msg),
-			MTP_int(messageFromId),
+			peerToMTP(messageFromId),
 			peerToMTP(file->to.peer),
 			MTPMessageFwdHeader(),
 			MTPint(),
-			MTP_int(file->to.replyTo),
+			replyHeader,
 			MTP_int(HistoryItem::NewMessageDate(file->to.options.scheduled)),
 			MTP_string(caption.text),
 			document,
 			MTPReplyMarkup(),
 			localEntities,
-			MTP_int(1),
-			MTPint(),
+			MTP_int(views),
+			MTP_int(forwards),
+			MTPMessageReplies(),
+			MTPint(), // edit_date
 			MTP_string(messagePostAuthor),
 			MTP_long(groupId),
 			//MTPMessageReactions(),
@@ -496,19 +515,21 @@ void SendConfirmedFile(
 			MTP_message(
 				MTP_flags(flags),
 				MTP_int(newId.msg),
-				MTP_int(messageFromId),
+				peerToMTP(messageFromId),
 				peerToMTP(file->to.peer),
 				MTPMessageFwdHeader(),
 				MTPint(),
-				MTP_int(file->to.replyTo),
+				replyHeader,
 				MTP_int(
 					HistoryItem::NewMessageDate(file->to.options.scheduled)),
 				MTP_string(caption.text),
 				document,
 				MTPReplyMarkup(),
 				localEntities,
-				MTP_int(1),
-				MTPint(),
+				MTP_int(views),
+				MTP_int(forwards),
+				MTPMessageReplies(),
+				MTPint(), // edit_date
 				MTP_string(messagePostAuthor),
 				MTP_long(groupId),
 				//MTPMessageReactions(),

Telegram/SourceFiles/api/api_updates.cpp

@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "api/api_updates.h"
 
+#include "api/api_authorizations.h"
 #include "api/api_text_entities.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
@@ -62,6 +63,22 @@ enum class DataIsLoadedResult {
 	Ok = 3,
 };
 
+void ProcessScheduledMessageWithElapsedTime(
+		not_null<Main::Session*> session,
+		bool needToAdd,
+		const MTPDmessage &data) {
+	if (needToAdd && !data.is_from_scheduled()) {
+		// If we still need to add a new message,
+		// we should first check if this message is in
+		// the list of scheduled messages.
+		// This is necessary to correctly update the file reference.
+		// Note that when a message is scheduled until online
+		// while the recipient is already online, the server sends
+		// an ordinary new message with skipped "from_scheduled" flag.
+		session->data().scheduledMessages().checkEntitiesAndUpdate(data);
+	}
+}
+
 bool IsForceLogoutNotification(const MTPDupdateServiceNotification &data) {
 	return qs(data.vtype()).startsWith(qstr("AUTH_KEY_DROP_"));
 }
@@ -97,20 +114,9 @@ bool ForwardedInfoDataLoaded(
 		not_null<Main::Session*> session,
 		const MTPMessageFwdHeader &header) {
 	return header.match([&](const MTPDmessageFwdHeader &data) {
-		if (const auto channelId = data.vchannel_id()) {
-			if (!session->data().channelLoaded(channelId->v)) {
-				return false;
-			}
-			if (const auto fromId = data.vfrom_id()) {
-				const auto from = session->data().user(fromId->v);
-				// Minimal loaded is fine in this case.
-				if (from->loadedStatus == PeerData::NotLoaded) {
-					return false;
-				}
-			}
-		} else if (const auto fromId = data.vfrom_id()) {
+		if (const auto fromId = data.vfrom_id()) {
 			// Fully loaded is required in this case.
-			if (!session->data().userLoaded(fromId->v)) {
+			if (!session->data().peerLoaded(peerFromMTP(*fromId))) {
 				return false;
 			}
 		}
@@ -145,7 +151,7 @@ DataIsLoadedResult AllDataLoadedForMessage(
 	return message.match([&](const MTPDmessage &message) {
 		if (const auto fromId = message.vfrom_id()) {
 			if (!message.is_post()
-				&& !session->data().userLoaded(fromId->v)) {
+				&& !session->data().peerLoaded(peerFromMTP(*fromId))) {
 				return DataIsLoadedResult::FromNotLoaded;
 			}
 		}
@@ -168,7 +174,7 @@ DataIsLoadedResult AllDataLoadedForMessage(
 	}, [&](const MTPDmessageService &message) {
 		if (const auto fromId = message.vfrom_id()) {
 			if (!message.is_post()
-				&& !session->data().userLoaded(fromId->v)) {
+				&& !session->data().peerLoaded(peerFromMTP(*fromId))) {
 				return DataIsLoadedResult::FromNotLoaded;
 			}
 		}
@@ -890,23 +896,26 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 		const auto peerUserId = d.is_out()
 			? d.vuser_id()
 			: MTP_int(_session->userId());
-		const auto fwd = d.vfwd_from();
 		_session->data().addNewMessage(
 			MTP_message(
 				MTP_flags(flags),
 				d.vid(),
-				d.is_out() ? MTP_int(_session->userId()) : d.vuser_id(),
-				MTP_peerUser(peerUserId),
-				fwd ? (*fwd) : MTPMessageFwdHeader(),
+				(d.is_out()
+					? peerToMTP(_session->userPeerId())
+					: MTP_peerUser(d.vuser_id())),
+				MTP_peerUser(d.vuser_id()),
+				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_int(d.vvia_bot_id().value_or_empty()),
-				MTP_int(d.vreply_to_msg_id().value_or_empty()),
+				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
 				MTP_messageMediaEmpty(),
 				MTPReplyMarkup(),
 				MTP_vector<MTPMessageEntity>(d.ventities().value_or_empty()),
-				MTPint(),
-				MTPint(),
+				MTPint(), // views
+				MTPint(), // forwards
+				MTPMessageReplies(),
+				MTPint(), // edit_date
 				MTPstring(),
 				MTPlong(),
 				//MTPMessageReactions(),
@@ -917,24 +926,26 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 
 	case mtpc_updateShortChatMessage: {
 		const auto &d = updates.c_updateShortChatMessage();
-		const auto flags = mtpCastFlags(d.vflags().v) | MTPDmessage::Flag::f_from_id;
-		const auto fwd = d.vfwd_from();
+		const auto flags = mtpCastFlags(d.vflags().v)
+			| MTPDmessage::Flag::f_from_id;
 		_session->data().addNewMessage(
 			MTP_message(
 				MTP_flags(flags),
 				d.vid(),
-				d.vfrom_id(),
+				MTP_peerUser(d.vfrom_id()),
 				MTP_peerChat(d.vchat_id()),
-				fwd ? (*fwd) : MTPMessageFwdHeader(),
+				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_int(d.vvia_bot_id().value_or_empty()),
-				MTP_int(d.vreply_to_msg_id().value_or_empty()),
+				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
 				MTP_messageMediaEmpty(),
 				MTPReplyMarkup(),
 				MTP_vector<MTPMessageEntity>(d.ventities().value_or_empty()),
-				MTPint(),
-				MTPint(),
+				MTPint(), // views
+				MTPint(), // forwards
+				MTPMessageReplies(),
+				MTPint(), // edit_date
 				MTPstring(),
 				MTPlong(),
 				//MTPMessageReactions(),
@@ -963,17 +974,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 				LOG(("Skipping message, because it is already in blocks!"));
 				needToAdd = false;
 			}
-			if (needToAdd && !data.is_from_scheduled()) {
-				// If we still need to add a new message,
-				// we should first check if this message is in
-				// the list of scheduled messages.
-				// This is necessary to correctly update the file reference.
-				// Note that when a message is scheduled until online
-				// while the recipient is already online, the server sends
-				// an ordinary new message with skipped "from_scheduled" flag.
-				_session->data().scheduledMessages().checkEntitiesAndUpdate(
-					data);
-			}
+			ProcessScheduledMessageWithElapsedTime(_session, needToAdd, data);
 		}
 		if (needToAdd) {
 			_session->data().addNewMessage(
@@ -1062,10 +1063,12 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		auto &d = update.c_updateNewChannelMessage();
 		auto needToAdd = true;
 		if (d.vmessage().type() == mtpc_message) { // index forwarded messages to links _overview
-			if (_session->data().checkEntitiesAndViewsUpdate(d.vmessage().c_message())) { // already in blocks
+			const auto &data = d.vmessage().c_message();
+			if (_session->data().checkEntitiesAndViewsUpdate(data)) { // already in blocks
 				LOG(("Skipping message, because it is already in blocks!"));
 				needToAdd = false;
 			}
+			ProcessScheduledMessageWithElapsedTime(_session, needToAdd, data);
 		}
 		if (needToAdd) {
 			_session->data().addNewMessage(
@@ -1080,6 +1083,17 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		_session->data().updateEditedMessage(d.vmessage());
 	} break;
 
+	case mtpc_updatePinnedChannelMessages: {
+		const auto &d = update.c_updatePinnedChannelMessages();
+		const auto channelId = d.vchannel_id().v;
+		for (const auto &msgId : d.vmessages().v) {
+			const auto item = session().data().message(channelId, msgId.v);
+			if (item) {
+				item->setIsPinned(d.is_pinned());
+			}
+		}
+	} break;
+
 	case mtpc_updateEditMessage: {
 		auto &d = update.c_updateEditMessage();
 		_session->data().updateEditedMessage(d.vmessage());
@@ -1095,6 +1109,17 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		_session->data().processMessagesDeleted(d.vchannel_id().v, d.vmessages().v);
 	} break;
 
+	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) {
+				item->setIsPinned(d.is_pinned());
+			}
+		}
+	} break;
+
 	default: Unexpected("Type in applyUpdateNoPtsCheck()");
 	}
 }
@@ -1390,6 +1415,21 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	case mtpc_updatePinnedChannelMessages: {
+		auto &d = update.c_updatePinnedChannelMessages();
+		auto channel = session().data().channelLoaded(d.vchannel_id().v);
+
+		if (channel && !_handlingChannelDifference) {
+			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				return;
+			} else {
+				channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
+			}
+		} else {
+			applyUpdateNoPtsCheck(update);
+		}
+	} break;
+
 	// Messages being read.
 	case mtpc_updateReadHistoryInbox: {
 		auto &d = update.c_updateReadHistoryInbox();
@@ -1541,26 +1581,51 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto user = session().data().userLoaded(d.vuser_id().v);
 		if (history && user) {
 			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(history, user, d.vaction(), when);
+			session().data().registerSendAction(
+				history,
+				MsgId(),
+				user,
+				d.vaction(),
+				when);
 		}
 	} break;
 
 	case mtpc_updateChatUserTyping: {
 		auto &d = update.c_updateChatUserTyping();
-		const auto history = [&]() -> History* {
-			if (const auto chat = session().data().chatLoaded(d.vchat_id().v)) {
-				return session().data().historyLoaded(chat->id);
-			} else if (const auto channel = session().data().channelLoaded(d.vchat_id().v)) {
-				return session().data().historyLoaded(channel->id);
-			}
-			return nullptr;
-		}();
+		const auto history = session().data().historyLoaded(
+			peerFromChat(d.vchat_id()));
 		const auto user = (d.vuser_id().v == session().userId())
 			? nullptr
 			: session().data().userLoaded(d.vuser_id().v);
 		if (history && user) {
 			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(history, user, d.vaction(), when);
+			session().data().registerSendAction(
+				history,
+				MsgId(),
+				user,
+				d.vaction(),
+				when);
+		}
+	} break;
+
+	case mtpc_updateChannelUserTyping: {
+		const auto &d = update.c_updateChannelUserTyping();
+		const auto history = session().data().historyLoaded(
+			peerFromChannel(d.vchannel_id()));
+		const auto user = (d.vuser_id().v == session().userId())
+			? nullptr
+			: session().data().userLoaded(d.vuser_id().v);
+		if (history && user) {
+			const auto when = requestingDifference()
+				? 0
+				: base::unixtime::now();
+			const auto rootId = d.vtop_msg_id().value_or_empty();
+			session().data().registerSendAction(
+				history,
+				rootId,
+				user,
+				d.vaction(),
+				when);
 		}
 	} break;
 
@@ -1731,10 +1796,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 
-	case mtpc_updateUserBlocked: {
-		const auto &d = update.c_updateUserBlocked();
-		if (const auto user = session().data().userLoaded(d.vuser_id().v)) {
-			user->setIsBlocked(mtpIsTrue(d.vblocked()));
+	case mtpc_updatePeerBlocked: {
+		const auto &d = update.c_updatePeerBlocked();
+		if (const auto peer = session().data().peerLoaded(peerFromMTP(d.vpeer_id()))) {
+			peer->setIsBlocked(mtpIsTrue(d.vblocked()));
 		}
 	} break;
 
@@ -1753,7 +1818,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 			}
 		} else {
 			session().data().serviceNotification(text, d.vmedia());
-			session().data().checkNewAuthorization();
+			session().api().authorizations().reload();
 		}
 	} break;
 
@@ -1912,12 +1977,54 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;
 
 	case mtpc_updateChannelMessageViews: {
-		auto &d = update.c_updateChannelMessageViews();
-		if (auto item = session().data().message(d.vchannel_id().v, d.vid().v)) {
+		const auto &d = update.c_updateChannelMessageViews();
+		if (const auto item = session().data().message(d.vchannel_id().v, d.vid().v)) {
 			item->setViewsCount(d.vviews().v);
 		}
 	} break;
 
+	case mtpc_updateChannelMessageForwards: {
+		const auto &d = update.c_updateChannelMessageForwards();
+		if (const auto item = session().data().message(d.vchannel_id().v, d.vid().v)) {
+			item->setForwardsCount(d.vforwards().v);
+		}
+	} break;
+
+	case mtpc_updateReadChannelDiscussionInbox: {
+		const auto &d = update.c_updateReadChannelDiscussionInbox();
+		const auto channelId = d.vchannel_id().v;
+		const auto msgId = d.vtop_msg_id().v;
+		const auto readTillId = d.vread_max_id().v;
+		const auto item = session().data().message(channelId, msgId);
+		if (item) {
+			item->setRepliesInboxReadTill(readTillId);
+			if (const auto post = item->lookupDiscussionPostOriginal()) {
+				post->setRepliesInboxReadTill(readTillId);
+			}
+		}
+		if (const auto broadcastId = d.vbroadcast_id()) {
+			if (const auto post = session().data().message(
+					broadcastId->v,
+					d.vbroadcast_post()->v)) {
+				post->setRepliesInboxReadTill(readTillId);
+			}
+		}
+	} break;
+
+	case mtpc_updateReadChannelDiscussionOutbox: {
+		const auto &d = update.c_updateReadChannelDiscussionOutbox();
+		const auto channelId = d.vchannel_id().v;
+		const auto msgId = d.vtop_msg_id().v;
+		const auto readTillId = d.vread_max_id().v;
+		const auto item = session().data().message(channelId, msgId);
+		if (item) {
+			item->setRepliesOutboxReadTill(readTillId);
+			if (const auto post = item->lookupDiscussionPostOriginal()) {
+				post->setRepliesOutboxReadTill(readTillId);
+			}
+		}
+	} break;
+
 	case mtpc_updateChannelAvailableMessages: {
 		auto &d = update.c_updateChannelAvailableMessages();
 		if (const auto channel = session().data().channelLoaded(d.vchannel_id().v)) {
@@ -1929,28 +2036,9 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;
 
 	// Pinned message.
-	case mtpc_updateUserPinnedMessage: {
-		const auto &d = update.c_updateUserPinnedMessage();
-		if (const auto user = session().data().userLoaded(d.vuser_id().v)) {
-			user->setPinnedMessageId(d.vid().v);
-		}
-	} break;
-
-	case mtpc_updateChatPinnedMessage: {
-		const auto &d = update.c_updateChatPinnedMessage();
-		if (const auto chat = session().data().chatLoaded(d.vchat_id().v)) {
-			const auto status = chat->applyUpdateVersion(d.vversion().v);
-			if (status == ChatData::UpdateStatus::Good) {
-				chat->setPinnedMessageId(d.vid().v);
-			}
-		}
-	} break;
-
-	case mtpc_updateChannelPinnedMessage: {
-		const auto &d = update.c_updateChannelPinnedMessage();
-		if (const auto channel = session().data().channelLoaded(d.vchannel_id().v)) {
-			channel->setPinnedMessageId(d.vid().v);
-		}
+	case mtpc_updatePinnedMessages: {
+		const auto &d = update.c_updatePinnedMessages();
+		updateAndApply(d.vpts().v, d.vpts_count().v, update);
 	} break;
 
 	////// Cloud sticker sets

Telegram/SourceFiles/apiwrap.cpp

@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "apiwrap.h"
 
+#include "api/api_authorizations.h"
+#include "api/api_attached_stickers.h"
 #include "api/api_hash.h"
 #include "api/api_media.h"
 #include "api/api_sending.h"
@@ -62,8 +64,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme.h"
 #include "inline_bots/inline_bot_result.h"
 #include "chat_helpers/message_field.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/emoji_config.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "support/support_helper.h"
 #include "storage/localimageloader.h"
 #include "storage/download_manager_mtproto.h"
@@ -158,19 +161,19 @@ std::optional<ApiWrap::Privacy::Key> ApiWrap::Privacy::KeyFromMTP(
 	return std::nullopt;
 }
 
-bool ApiWrap::BlockedUsersSlice::Item::operator==(const Item &other) const {
-	return (user == other.user) && (date == other.date);
+bool ApiWrap::BlockedPeersSlice::Item::operator==(const Item &other) const {
+	return (peer == other.peer) && (date == other.date);
 }
 
-bool ApiWrap::BlockedUsersSlice::Item::operator!=(const Item &other) const {
+bool ApiWrap::BlockedPeersSlice::Item::operator!=(const Item &other) const {
 	return !(*this == other);
 }
 
-bool ApiWrap::BlockedUsersSlice::operator==(const BlockedUsersSlice &other) const {
+bool ApiWrap::BlockedPeersSlice::operator==(const BlockedPeersSlice &other) const {
 	return (total == other.total) && (list == other.list);
 }
 
-bool ApiWrap::BlockedUsersSlice::operator!=(const BlockedUsersSlice &other) const {
+bool ApiWrap::BlockedPeersSlice::operator!=(const BlockedPeersSlice &other) const {
 	return !(*this == other);
 }
 
@@ -186,6 +189,8 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 //, _feedReadTimer([=] { readFeeds(); }) // #feed
 , _topPromotionTimer([=] { refreshTopPromotion(); })
 , _updateNotifySettingsTimer([=] { sendNotifySettingsUpdates(); })
+, _authorizations(std::make_unique<Api::Authorizations>(this))
+, _attachedStickers(std::make_unique<Api::AttachedStickers>(this))
 , _selfDestruct(std::make_unique<Api::SelfDestruct>(this))
 , _sensitiveContent(std::make_unique<Api::SensitiveContent>(this))
 , _globalPrivacy(std::make_unique<Api::GlobalPrivacy>(this)) {
@@ -683,17 +688,57 @@ void ApiWrap::finalizeMessageDataRequest(
 	}
 }
 
-QString ApiWrap::exportDirectMessageLink(not_null<HistoryItem*> item) {
+QString ApiWrap::exportDirectMessageLink(
+		not_null<HistoryItem*> item,
+		bool inRepliesContext) {
 	Expects(item->history()->peer->isChannel());
 
 	const auto itemId = item->fullId();
 	const auto channel = item->history()->peer->asChannel();
 	const auto fallback = [&] {
-		const auto base = channel->hasUsername()
-			? channel->username
-			: "c/" + QString::number(channel->bareId());
-		const auto query = base + '/' + QString::number(item->id);
-		if (channel->hasUsername() && !channel->isMegagroup()) {
+		auto linkChannel = channel;
+		auto linkItemId = item->id;
+		auto linkCommentId = 0;
+		auto linkThreadId = 0;
+		if (inRepliesContext) {
+			if (const auto rootId = item->replyToTop()) {
+				const auto root = item->history()->owner().message(
+					channel->bareId(),
+					rootId);
+				const auto sender = root
+					? root->discussionPostOriginalSender()
+					: nullptr;
+				if (sender && sender->hasUsername()) {
+					// Comment to a public channel.
+					const auto forwarded = root->Get<HistoryMessageForwarded>();
+					linkItemId = forwarded->savedFromMsgId;
+					if (linkItemId) {
+						linkChannel = sender;
+						linkCommentId = item->id;
+					} else {
+						linkItemId = item->id;
+					}
+				} else {
+					// Reply in a thread, maybe comment in a private channel.
+					linkThreadId = rootId;
+				}
+			}
+		}
+		const auto base = linkChannel->hasUsername()
+			? linkChannel->username
+			: "c/" + QString::number(linkChannel->bareId());
+		const auto query = base
+			+ '/'
+			+ QString::number(linkItemId)
+			+ (linkCommentId
+				? "?comment=" + QString::number(linkCommentId)
+				: linkThreadId
+				? "?thread=" + QString::number(linkThreadId)
+				: "");
+		if (linkChannel->hasUsername()
+			&& !linkChannel->isMegagroup()
+			&& !linkCommentId
+			&& !linkThreadId) {
 			if (const auto media = item->media()) {
 				if (const auto document = media->document()) {
 					if (document->isVideoMessage()) {
@@ -709,9 +754,11 @@ QString ApiWrap::exportDirectMessageLink(not_null<HistoryItem*> item) {
 		? i->second
 		: fallback();
 	request(MTPchannels_ExportMessageLink(
+		MTP_flags(inRepliesContext
+			? MTPchannels_ExportMessageLink::Flag::f_thread
+			: MTPchannels_ExportMessageLink::Flag(0)),
 		channel->inputChannel,
-		MTP_int(item->id),
-		MTP_bool(false)
+		MTP_int(item->id)
 	)).done([=](const MTPExportedMessageLink &result) {
 		const auto link = result.match([&](const auto &data) {
 			return qs(data.vlink());
@@ -1495,9 +1542,13 @@ void ApiWrap::applyLastParticipantsList(
 		});
 		const auto adminCanEdit = (p.type() == mtpc_channelParticipantAdmin)
 			? p.c_channelParticipantAdmin().is_can_edit()
+			: (p.type() == mtpc_channelParticipantCreator)
+			? channel->amCreator()
 			: false;
 		const auto adminRights = (p.type() == mtpc_channelParticipantAdmin)
 			? p.c_channelParticipantAdmin().vadmin_rights()
+			: (p.type() == mtpc_channelParticipantCreator)
+			? p.c_channelParticipantCreator().vadmin_rights()
 			: emptyAdminRights;
 		const auto restrictedRights = (p.type() == mtpc_channelParticipantBanned)
 			? p.c_channelParticipantBanned().vbanned_rights()
@@ -1642,6 +1693,9 @@ void ApiWrap::requestSelfParticipant(not_null<ChannelData*> channel) {
 			}, [&](const MTPDchannelParticipant &data) {
 				LOG(("API Error: Got self regular participant."));
 				finalize(-1, 0);
+			}, [&](const MTPDchannelParticipantLeft &data) {
+				LOG(("API Error: Got self left participant."));
+				finalize(-1, 0);
 			});
 		});
 	}).fail([=](const RPCError &error) {
@@ -2003,64 +2057,66 @@ void ApiWrap::leaveChannel(not_null<ChannelData*> channel) {
 	}
 }
 
-void ApiWrap::blockUser(not_null<UserData*> user) {
-	if (user->isBlocked()) {
+void ApiWrap::blockPeer(not_null<PeerData*> peer) {
+	if (peer->isBlocked()) {
 		session().changes().peerUpdated(
-			user,
+			peer,
 			Data::PeerUpdate::Flag::IsBlocked);
-	} else if (_blockRequests.find(user) == end(_blockRequests)) {
-		const auto requestId = request(MTPcontacts_Block(user->inputUser)).done([this, user](const MTPBool &result) {
-			_blockRequests.erase(user);
-			user->setIsBlocked(true);
-			if (_blockedUsersSlice) {
-				_blockedUsersSlice->list.insert(
-					_blockedUsersSlice->list.begin(),
-					{ user, base::unixtime::now() });
-				++_blockedUsersSlice->total;
-				_blockedUsersChanges.fire_copy(*_blockedUsersSlice);
+	} else if (_blockRequests.find(peer) == end(_blockRequests)) {
+		const auto requestId = request(MTPcontacts_Block(
+			peer->input
+		)).done([=](const MTPBool &result) {
+			_blockRequests.erase(peer);
+			peer->setIsBlocked(true);
+			if (_blockedPeersSlice) {
+				_blockedPeersSlice->list.insert(
+					_blockedPeersSlice->list.begin(),
+					{ peer, base::unixtime::now() });
+				++_blockedPeersSlice->total;
+				_blockedPeersChanges.fire_copy(*_blockedPeersSlice);
 			}
-		}).fail([this, user](const RPCError &error) {
-			_blockRequests.erase(user);
+		}).fail([=](const RPCError &error) {
+			_blockRequests.erase(peer);
 		}).send();
 
-		_blockRequests.emplace(user, requestId);
+		_blockRequests.emplace(peer, requestId);
 	}
 }
 
-void ApiWrap::unblockUser(not_null<UserData*> user, Fn<void()> onDone) {
-	if (!user->isBlocked()) {
+void ApiWrap::unblockPeer(not_null<PeerData*> peer, Fn<void()> onDone) {
+	if (!peer->isBlocked()) {
 		session().changes().peerUpdated(
-			user,
+			peer,
 			Data::PeerUpdate::Flag::IsBlocked);
 		return;
-	} else if (_blockRequests.find(user) != end(_blockRequests)) {
+	} else if (_blockRequests.find(peer) != end(_blockRequests)) {
 		return;
 	}
 	const auto requestId = request(MTPcontacts_Unblock(
-		user->inputUser
+		peer->input
 	)).done([=](const MTPBool &result) {
-		_blockRequests.erase(user);
-		user->setIsBlocked(false);
-		if (_blockedUsersSlice) {
-			auto &list = _blockedUsersSlice->list;
+		_blockRequests.erase(peer);
+		peer->setIsBlocked(false);
+		if (_blockedPeersSlice) {
+			auto &list = _blockedPeersSlice->list;
 			for (auto i = list.begin(); i != list.end(); ++i) {
-				if (i->user == user) {
+				if (i->peer == peer) {
 					list.erase(i);
 					break;
 				}
 			}
-			if (_blockedUsersSlice->total > list.size()) {
-				--_blockedUsersSlice->total;
+			if (_blockedPeersSlice->total > list.size()) {
+				--_blockedPeersSlice->total;
 			}
-			_blockedUsersChanges.fire_copy(*_blockedUsersSlice);
+			_blockedPeersChanges.fire_copy(*_blockedPeersSlice);
 		}
 		if (onDone) {
 			onDone();
 		}
 	}).fail([=](const RPCError &error) {
-		_blockRequests.erase(user);
+		_blockRequests.erase(peer);
 	}).send();
-	_blockRequests.emplace(user, requestId);
+	_blockRequests.emplace(peer, requestId);
 }
 
 void ApiWrap::exportInviteLink(not_null<PeerData*> peer) {
@@ -2203,7 +2259,7 @@ void ApiWrap::handlePrivacyChange(
 void ApiWrap::updatePrivacyLastSeens(const QVector<MTPPrivacyRule> &rules) {
 	const auto now = base::unixtime::now();
 	_session->data().enumerateUsers([&](UserData *user) {
-		if (user->isSelf() || user->loadedStatus != PeerData::FullLoaded) {
+		if (user->isSelf() || !user->isFullLoaded()) {
 			return;
 		}
 		if (user->onlineTill <= 0) {
@@ -2682,14 +2738,14 @@ void ApiWrap::requestFileReference(
 			// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87122
 			const auto &origin = p.first;
 			const auto &reference = p.second;
-			const auto documentId = base::get_if<DocumentFileLocationId>(
+			const auto documentId = std::get_if<DocumentFileLocationId>(
 				&origin);
 			if (documentId) {
 				_session->data().document(
 					documentId->id
 				)->refreshFileReference(reference);
 			}
-			const auto photoId = base::get_if<PhotoFileLocationId>(&origin);
+			const auto photoId = std::get_if<PhotoFileLocationId>(&origin);
 			if (photoId) {
 				_session->data().photo(
 					photoId->id
@@ -2748,7 +2804,7 @@ void ApiWrap::refreshFileReference(
 	const auto fail = [&] {
 		handler(UpdatedFileReferences());
 	};
-	origin.data.match([&](Data::FileOriginMessage data) {
+	v::match(origin.data, [&](Data::FileOriginMessage data) {
 		if (const auto item = _session->data().message(data)) {
 			if (item->isScheduled()) {
 				const auto &scheduled = _session->data().scheduledMessages();
@@ -2824,7 +2880,7 @@ void ApiWrap::refreshFileReference(
 				MTP_long(data.themeId),
 				MTP_long(data.accessHash)),
 			MTP_long(0)));
-	}, [&](std::nullopt_t) {
+	}, [&](v::null_t) {
 		fail();
 	});
 }
@@ -3514,6 +3570,9 @@ void ApiWrap::sharedMediaDone(
 		parsed.noSkipRange,
 		parsed.fullCount
 	));
+	if (type == SharedMediaType::Pinned && !parsed.messageIds.empty()) {
+		peer->setHasPinnedMessages(true);
+	}
 }
 
 void ApiWrap::requestUserPhotos(
@@ -3896,9 +3955,9 @@ void ApiWrap::forwardMessages(
 
 	histories.readInbox(history);
 
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = action.options.silent
-		|| (channelPost && _session->data().notifySilentPosts(peer));
+		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
 
 	auto flags = MTPDmessage::Flags(0);
 	auto clientFlags = MTPDmessage_ClientFlags();
@@ -3915,7 +3974,6 @@ void ApiWrap::forwardMessages(
 	}
 
 	auto forwardFrom = items.front()->history()->peer;
-	auto currentGroupId = items.front()->groupId();
 	auto ids = QVector<MTPint>();
 	auto randomIds = QVector<MTPlong>();
 	auto localIds = std::shared_ptr<base::flat_map<uint64, FullMsgId>>();
@@ -3924,14 +3982,10 @@ void ApiWrap::forwardMessages(
 		if (shared) {
 			++shared->requestsLeft;
 		}
-		const auto finalFlags = sendFlags
-			| (currentGroupId == MessageGroupId()
-				? MTPmessages_ForwardMessages::Flag(0)
-				: MTPmessages_ForwardMessages::Flag::f_grouped);
 		const auto requestType = Data::Histories::RequestType::Send;
 		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 			history->sendRequestId = request(MTPmessages_ForwardMessages(
-				MTP_flags(finalFlags),
+				MTP_flags(sendFlags),
 				forwardFrom->input,
 				MTP_vector<MTPint>(ids),
 				MTP_vector<MTPlong>(randomIds),
@@ -3973,10 +4027,10 @@ void ApiWrap::forwardMessages(
 					peerToChannel(peer->id),
 					_session->data().nextLocalMessageId());
 				const auto self = _session->user();
-				const auto messageFromId = channelPost
-					? UserId(0)
-					: peerToUser(self->id);
-				const auto messagePostAuthor = channelPost
+				const auto messageFromId = anonymousPost
+					? PeerId(0)
+					: self->id;
+				const auto messagePostAuthor = peer->isBroadcast()
 					? self->name
 					: QString();
 				history->addNewLocalMessage(
@@ -3996,11 +4050,9 @@ void ApiWrap::forwardMessages(
 		}
 		const auto newFrom = item->history()->peer;
 		const auto newGroupId = item->groupId();
-		if (forwardFrom != newFrom
-			|| currentGroupId != newGroupId) {
+		if (forwardFrom != newFrom) {
 			sendAccumulated();
 			forwardFrom = newFrom;
-			currentGroupId = newGroupId;
 		}
 		ids.push_back(MTP_int(item->id));
 		randomIds.push_back(MTP_long(randomId));
@@ -4048,34 +4100,36 @@ void ApiWrap::sendSharedContact(
 	const auto newId = FullMsgId(
 		history->channelId(),
 		_session->data().nextLocalMessageId());
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+	const auto anonymousPost = peer->amAnonymous();
 
 	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
 	auto clientFlags = NewMessageClientFlags();
 	if (action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+		flags |= MTPDmessage::Flag::f_reply_to;
 	}
+	const auto replyHeader = NewMessageReplyHeader(action);
 	FillMessagePostFlags(action, peer, flags);
 	if (action.options.scheduled) {
 		flags |= MTPDmessage::Flag::f_from_scheduled;
 	} else {
 		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
 	}
-	const auto messageFromId = channelPost ? 0 : _session->userId();
-	const auto messagePostAuthor = channelPost
+	const auto messageFromId = anonymousPost ? 0 : _session->userPeerId();
+	const auto messagePostAuthor = peer->isBroadcast()
 		? _session->user()->name
 		: QString();
 	const auto vcard = QString();
 	const auto views = 1;
+	const auto forwards = 0;
 	const auto item = history->addNewMessage(
 		MTP_message(
 			MTP_flags(flags),
 			MTP_int(newId.msg),
-			MTP_int(messageFromId),
+			peerToMTP(messageFromId),
 			peerToMTP(peer->id),
 			MTPMessageFwdHeader(),
-			MTPint(),
-			MTP_int(action.replyTo),
+			MTPint(), // via_bot_id
+			replyHeader,
 			MTP_int(HistoryItem::NewMessageDate(action.options.scheduled)),
 			MTP_string(),
 			MTP_messageMediaContact(
@@ -4087,7 +4141,9 @@ void ApiWrap::sendSharedContact(
 			MTPReplyMarkup(),
 			MTPVector<MTPMessageEntity>(),
 			MTP_int(views),
-			MTPint(),
+			MTP_int(forwards),
+			MTPMessageReplies(),
+			MTPint(), // edit_date
 			MTP_string(messagePostAuthor),
 			MTPlong(),
 			//MTPMessageReactions(),
@@ -4101,7 +4157,9 @@ void ApiWrap::sendSharedContact(
 		MTP_string(lastName),
 		MTP_string(vcard));
 	auto options = action.options;
-	options.silent = _session->data().notifySilentPosts(peer);
+	if (_session->data().notifySilentPosts(peer)) {
+		options.silent = true;
+	}
 	sendMedia(item, media, options);
 
 	_session->data().sendHistoryChangeNotifications();
@@ -4129,7 +4187,7 @@ void ApiWrap::sendVoiceMessage(
 }
 
 void ApiWrap::editMedia(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		const SendAction &action,
@@ -4151,21 +4209,18 @@ void ApiWrap::editMedia(
 }
 
 void ApiWrap::sendFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
 		const SendAction &action) {
 	const auto haveCaption = !caption.text.isEmpty();
-	const auto isAlbum = (album != nullptr);
-	const auto compressImages = (type == SendMediaType::Photo);
-	if (haveCaption && !list.canAddCaption(isAlbum, compressImages)) {
+	if (haveCaption && !list.canAddCaption(album != nullptr)) {
 		auto message = MessageToSend(action.history);
-		message.textWithTags = std::move(caption);
+		message.textWithTags = base::take(caption);
 		message.action = action;
 		message.action.clearDraft = false;
 		sendMessage(std::move(message));
-		caption = TextWithTags();
 	}
 
 	const auto to = fileLoadTaskOptions(action);
@@ -4176,14 +4231,11 @@ void ApiWrap::sendFiles(
 	tasks.reserve(list.files.size());
 	for (auto &file : list.files) {
 		if (album) {
-			switch (file.type) {
-			case Storage::PreparedFile::AlbumType::Photo:
+			if (file.type == Ui::PreparedFile::Type::Photo
+				&& type != SendMediaType::File) {
 				type = SendMediaType::Photo;
-				break;
-			case Storage::PreparedFile::AlbumType::Video:
+			} else {
 				type = SendMediaType::File;
-				break;
-			default: Unexpected("AlbumType in uploadFilesAfterConfirmation");
 			}
 		}
 		tasks.push_back(std::make_unique<FileLoadTask>(
@@ -4309,9 +4361,10 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		auto clientFlags = NewMessageClientFlags();
 		auto sendFlags = MTPmessages_SendMessage::Flags(0);
 		if (action.replyTo) {
-			flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+			flags |= MTPDmessage::Flag::f_reply_to;
 			sendFlags |= MTPmessages_SendMessage::Flag::f_reply_to_msg_id;
 		}
+		const auto replyHeader = NewMessageReplyHeader(action);
 		MTPMessageMedia media = MTP_messageMediaEmpty();
 		if (message.webPageId == CancelledWebPageId) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_no_webpage;
@@ -4323,9 +4376,9 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 					MTP_int(page->pendingTill)));
 			flags |= MTPDmessage::Flag::f_media;
 		}
-		const auto channelPost = peer->isChannel() && !peer->isMegagroup();
+		const auto anonymousPost = peer->amAnonymous();
 		const auto silentPost = action.options.silent
-			|| (channelPost && _session->data().notifySilentPosts(peer));
+			|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
 		FillMessagePostFlags(action, peer, flags);
 		if (silentPost) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_silent;
@@ -4345,8 +4398,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			history->clearCloudDraft();
 			history->setSentDraftText(QString());
 		}
-		auto messageFromId = channelPost ? 0 : _session->userId();
-		auto messagePostAuthor = channelPost
+		auto messageFromId = anonymousPost ? 0 : _session->userPeerId();
+		auto messagePostAuthor = peer->isBroadcast()
 			? _session->user()->name
 			: QString();
 		if (action.options.scheduled) {
@@ -4355,23 +4408,27 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		} else {
 			clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
 		}
+		const auto views = 1;
+		const auto forwards = 0;
 		lastMessage = history->addNewMessage(
 			MTP_message(
 				MTP_flags(flags),
 				MTP_int(newId.msg),
-				MTP_int(messageFromId),
+				peerToMTP(messageFromId),
 				peerToMTP(peer->id),
 				MTPMessageFwdHeader(),
-				MTPint(),
-				MTP_int(action.replyTo),
+				MTPint(), // via_bot_id
+				replyHeader,
 				MTP_int(
 					HistoryItem::NewMessageDate(action.options.scheduled)),
 				msgText,
 				media,
 				MTPReplyMarkup(),
 				localEntities,
-				MTP_int(1),
-				MTPint(),
+				MTP_int(views),
+				MTP_int(forwards),
+				MTPMessageReplies(),
+				MTPint(), // edit_date
 				MTP_string(messagePostAuthor),
 				MTPlong(),
 				//MTPMessageReactions(),
@@ -4458,12 +4515,12 @@ void ApiWrap::sendInlineResult(
 	auto clientFlags = NewMessageClientFlags();
 	auto sendFlags = MTPmessages_SendInlineBotResult::Flag::f_clear_draft | 0;
 	if (action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
+		flags |= MTPDmessage::Flag::f_reply_to;
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_reply_to_msg_id;
 	}
-	bool channelPost = peer->isChannel() && !peer->isMegagroup();
-	bool silentPost = action.options.silent
-		|| (channelPost && _session->data().notifySilentPosts(peer));
+	const auto anonymousPost = peer->amAnonymous();
+	const auto silentPost = action.options.silent
+		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
 	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_silent;
@@ -4478,8 +4535,8 @@ void ApiWrap::sendInlineResult(
 		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
 	}
 
-	const auto messageFromId = channelPost ? 0 : _session->userId();
-	const auto messagePostAuthor = channelPost
+	const auto messageFromId = anonymousPost ? 0 : _session->userPeerId();
+	const auto messagePostAuthor = peer->isBroadcast()
 		? _session->user()->name
 		: QString();
 
@@ -5118,34 +5175,34 @@ auto ApiWrap::privacyValue(Privacy::Key key) -> rpl::producer<Privacy> {
 	}
 }
 
-void ApiWrap::reloadBlockedUsers() {
-	if (_blockedUsersRequestId) {
+void ApiWrap::reloadBlockedPeers() {
+	if (_blockedPeersRequestId) {
 		return;
 	}
-	_blockedUsersRequestId = request(MTPcontacts_GetBlocked(
+	_blockedPeersRequestId = request(MTPcontacts_GetBlocked(
 		MTP_int(0),
 		MTP_int(kBlockedFirstSlice)
 	)).done([=](const MTPcontacts_Blocked &result) {
-		_blockedUsersRequestId = 0;
+		_blockedPeersRequestId = 0;
 		const auto push = [&](
 				int count,
-				const QVector<MTPContactBlocked> &list) {
-			auto slice = BlockedUsersSlice();
+				const QVector<MTPPeerBlocked> &list) {
+			auto slice = BlockedPeersSlice();
 			slice.total = std::max(count, list.size());
 			slice.list.reserve(list.size());
 			for (const auto &contact : list) {
-				contact.match([&](const MTPDcontactBlocked &data) {
-					const auto user = _session->data().userLoaded(
-						data.vuser_id().v);
-					if (user) {
-						user->setIsBlocked(true);
-						slice.list.push_back({ user, data.vdate().v });
+				contact.match([&](const MTPDpeerBlocked &data) {
+					const auto peer = _session->data().peerLoaded(
+						peerFromMTP(data.vpeer_id()));
+					if (peer) {
+						peer->setIsBlocked(true);
+						slice.list.push_back({ peer, data.vdate().v });
 					}
 				});
 			}
-			if (!_blockedUsersSlice || *_blockedUsersSlice != slice) {
-				_blockedUsersSlice = slice;
-				_blockedUsersChanges.fire(std::move(slice));
+			if (!_blockedPeersSlice || *_blockedPeersSlice != slice) {
+				_blockedPeersSlice = slice;
+				_blockedPeersChanges.fire(std::move(slice));
 			}
 		};
 		result.match([&](const MTPDcontacts_blockedSlice &data) {
@@ -5156,17 +5213,25 @@ void ApiWrap::reloadBlockedUsers() {
 			push(0, data.vblocked().v);
 		});
 	}).fail([=](const RPCError &error) {
-		_blockedUsersRequestId = 0;
+		_blockedPeersRequestId = 0;
 	}).send();
 }
 
-auto ApiWrap::blockedUsersSlice() -> rpl::producer<BlockedUsersSlice> {
-	if (!_blockedUsersSlice) {
-		reloadBlockedUsers();
+auto ApiWrap::blockedPeersSlice() -> rpl::producer<BlockedPeersSlice> {
+	if (!_blockedPeersSlice) {
+		reloadBlockedPeers();
 	}
-	return _blockedUsersSlice
-		? _blockedUsersChanges.events_starting_with_copy(*_blockedUsersSlice)
-		: (_blockedUsersChanges.events() | rpl::type_erased());
+	return _blockedPeersSlice
+		? _blockedPeersChanges.events_starting_with_copy(*_blockedPeersSlice)
+		: (_blockedPeersChanges.events() | rpl::type_erased());
+}
+
+Api::Authorizations &ApiWrap::authorizations() {
+	return *_authorizations;
+}
+
+Api::AttachedStickers &ApiWrap::attachedStickers() {
+	return *_attachedStickers;
 }
 
 Api::SelfDestruct &ApiWrap::selfDestruct() {
@@ -5199,9 +5264,8 @@ void ApiWrap::createPoll(
 		history->clearLocalDraft();
 		history->clearCloudDraft();
 	}
-	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 	const auto silentPost = action.options.silent
-		|| (channelPost && _session->data().notifySilentPosts(peer));
+		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}

Telegram/SourceFiles/apiwrap.h

@@ -36,7 +36,6 @@ class Result;
 
 namespace Storage {
 enum class SharedMediaType : signed char;
-struct PreparedList;
 class DownloadMtprotoTask;
 class Account;
 } // namespace Storage
@@ -49,9 +48,15 @@ namespace Core {
 struct CloudPasswordState;
 } // namespace Core
 
+namespace Ui {
+struct PreparedList;
+} // namespace Ui
+
 namespace Api {
 
 class Updates;
+class Authorizations;
+class AttachedStickers;
 class SelfDestruct;
 class SensitiveContent;
 class GlobalPrivacy;
@@ -121,9 +126,9 @@ public:
 		static std::optional<Key> KeyFromMTP(mtpTypeId type);
 	};
 
-	struct BlockedUsersSlice {
+	struct BlockedPeersSlice {
 		struct Item {
-			UserData *user = nullptr;
+			PeerData *peer = nullptr;
 			TimeId date = 0;
 
 			bool operator==(const Item &other) const;
@@ -133,8 +138,8 @@ public:
 		QVector<Item> list;
 		int total = 0;
 
-		bool operator==(const BlockedUsersSlice &other) const;
-		bool operator!=(const BlockedUsersSlice &other) const;
+		bool operator==(const BlockedPeersSlice &other) const;
+		bool operator!=(const BlockedPeersSlice &other) const;
 	};
 
 	explicit ApiWrap(not_null<Main::Session*> session);
@@ -172,7 +177,9 @@ public:
 		ChannelData *channel,
 		MsgId msgId,
 		RequestMessageDataCallback callback);
-	QString exportDirectMessageLink(not_null<HistoryItem*> item);
+	QString exportDirectMessageLink(
+		not_null<HistoryItem*> item,
+		bool inRepliesContext);
 
 	void requestContacts();
 	void requestDialogs(Data::Folder *folder = nullptr);
@@ -279,8 +286,8 @@ public:
 	void joinChannel(not_null<ChannelData*> channel);
 	void leaveChannel(not_null<ChannelData*> channel);
 
-	void blockUser(not_null<UserData*> user);
-	void unblockUser(not_null<UserData*> user, Fn<void()> onDone = nullptr);
+	void blockPeer(not_null<PeerData*> peer);
+	void unblockPeer(not_null<PeerData*> peer, Fn<void()> onDone = nullptr);
 
 	void exportInviteLink(not_null<PeerData*> peer);
 	void requestNotifySettings(const MTPInputNotifyPeer &peer);
@@ -389,7 +396,7 @@ public:
 		int duration,
 		const SendAction &action);
 	void sendFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
@@ -400,7 +407,7 @@ public:
 		const SendAction &action);
 
 	void editMedia(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		const SendAction &action,
@@ -448,9 +455,11 @@ public:
 	void reloadPrivacy(Privacy::Key key);
 	rpl::producer<Privacy> privacyValue(Privacy::Key key);
 
-	void reloadBlockedUsers();
-	rpl::producer<BlockedUsersSlice> blockedUsersSlice();
+	void reloadBlockedPeers();
+	rpl::producer<BlockedPeersSlice> blockedPeersSlice();
 
+	[[nodiscard]] Api::Authorizations &authorizations();
+	[[nodiscard]] Api::AttachedStickers &attachedStickers();
 	[[nodiscard]] Api::SelfDestruct &selfDestruct();
 	[[nodiscard]] Api::SensitiveContent &sensitiveContent();
 	[[nodiscard]] Api::GlobalPrivacy &globalPrivacy();
@@ -690,7 +699,7 @@ private:
 	QMap<uint64, QPair<uint64, mtpRequestId> > _stickerSetRequests;
 
 	QMap<ChannelData*, mtpRequestId> _channelAmInRequests;
-	base::flat_map<not_null<UserData*>, mtpRequestId> _blockRequests;
+	base::flat_map<not_null<PeerData*>, mtpRequestId> _blockRequests;
 	base::flat_map<not_null<PeerData*>, mtpRequestId> _exportInviteRequests;
 	base::flat_map<PeerId, mtpRequestId> _notifySettingRequests;
 	base::flat_map<not_null<History*>, mtpRequestId> _draftsSaveRequestIds;
@@ -809,10 +818,12 @@ private:
 	base::flat_map<Privacy::Key, Privacy> _privacyValues;
 	std::map<Privacy::Key, rpl::event_stream<Privacy>> _privacyChanges;
 
-	mtpRequestId _blockedUsersRequestId = 0;
-	std::optional<BlockedUsersSlice> _blockedUsersSlice;
-	rpl::event_stream<BlockedUsersSlice> _blockedUsersChanges;
+	mtpRequestId _blockedPeersRequestId = 0;
+	std::optional<BlockedPeersSlice> _blockedPeersSlice;
+	rpl::event_stream<BlockedPeersSlice> _blockedPeersChanges;
 
+	const std::unique_ptr<Api::Authorizations> _authorizations;
+	const std::unique_ptr<Api::AttachedStickers> _attachedStickers;
 	const std::unique_ptr<Api::SelfDestruct> _selfDestruct;
 	const std::unique_ptr<Api::SensitiveContent> _sensitiveContent;
 	const std::unique_ptr<Api::GlobalPrivacy> _globalPrivacy;

Telegram/SourceFiles/app.cpp

@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_service_message.h"
 #include "media/audio/media_audio.h"
 #include "ui/image/image.h"
+#include "ui/cached_round_corners.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
@@ -44,7 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_overview.h"
 #include "styles/style_media_view.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 
 #include <QtCore/QBuffer>
@@ -66,14 +67,6 @@ HistoryView::Element *hoveredItem = nullptr,
 	*pressedLinkItem = nullptr,
 	*mousedItem = nullptr;
 
-struct CornersPixmaps {
-	QPixmap p[4];
-};
-QVector<CornersPixmaps> corners;
-using CornersMap = QMap<uint32, CornersPixmaps>;
-CornersMap cornersMap;
-QImage cornersMaskLarge[4], cornersMaskSmall[4];
-
 } // namespace
 
 namespace App {
@@ -104,114 +97,12 @@ namespace App {
 		return result;
 	}
 
-	void prepareCorners(RoundCorners index, int32 radius, const QBrush &brush, const style::color *shadow = nullptr, QImage *cors = nullptr) {
-		Expects(::corners.size() > index);
-
-		int32 r = radius * cIntRetinaFactor(), s = st::msgShadow * cIntRetinaFactor();
-		QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied), localCors[4];
-		{
-			Painter p(&rect);
-			PainterHighQualityEnabler hq(p);
-
-			p.setCompositionMode(QPainter::CompositionMode_Source);
-			p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
-			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-			p.setPen(Qt::NoPen);
-			if (shadow) {
-				p.setBrush((*shadow)->b);
-				p.drawRoundedRect(0, s, r * 3, r * 3, r, r);
-			}
-			p.setBrush(brush);
-			p.drawRoundedRect(0, 0, r * 3, r * 3, r, r);
-		}
-		if (!cors) cors = localCors;
-		cors[0] = rect.copy(0, 0, r, r);
-		cors[1] = rect.copy(r * 2, 0, r, r);
-		cors[2] = rect.copy(0, r * 2, r, r + (shadow ? s : 0));
-		cors[3] = rect.copy(r * 2, r * 2, r, r + (shadow ? s : 0));
-		if (index != SmallMaskCorners && index != LargeMaskCorners) {
-			for (int i = 0; i < 4; ++i) {
-				::corners[index].p[i] = pixmapFromImageInPlace(std::move(cors[i]));
-				::corners[index].p[i].setDevicePixelRatio(cRetinaFactor());
-			}
-		}
-	}
-
-	void createMaskCorners() {
-		QImage mask[4];
-		prepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskSmall[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskSmall[i].setDevicePixelRatio(cRetinaFactor());
-		}
-		prepareCorners(LargeMaskCorners, st::historyMessageRadius, QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskLarge[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskLarge[i].setDevicePixelRatio(cRetinaFactor());
-		}
-	}
-
-	void createPaletteCorners() {
-		prepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
-		prepareCorners(BoxCorners, st::boxRadius, st::boxBg);
-		prepareCorners(BotKbOverCorners, st::dateRadius, st::msgBotKbOverBgAdd);
-		prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-		prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-		prepareCorners(SelectedOverlaySmallCorners, st::buttonRadius, st::msgSelectOverlay);
-		prepareCorners(SelectedOverlayLargeCorners, st::historyMessageRadius, st::msgSelectOverlay);
-		prepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
-		prepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
-		prepareCorners(OverviewVideoCorners, st::overviewVideoStatusRadius, st::msgDateImgBg);
-		prepareCorners(OverviewVideoSelectedCorners, st::overviewVideoStatusRadius, st::msgDateImgBgSelected);
-		prepareCorners(InShadowCorners, st::historyMessageRadius, st::msgInShadow);
-		prepareCorners(InSelectedShadowCorners, st::historyMessageRadius, st::msgInShadowSelected);
-		prepareCorners(ForwardCorners, st::historyMessageRadius, st::historyForwardChooseBg);
-		prepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::mediaviewSaveMsgBg);
-		prepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);
-		prepareCorners(PhotoSelectOverlayCorners, st::buttonRadius, st::overviewPhotoSelectOverlay);
-
-		prepareCorners(Doc1Corners, st::buttonRadius, st::msgFile1Bg);
-		prepareCorners(Doc2Corners, st::buttonRadius, st::msgFile2Bg);
-		prepareCorners(Doc3Corners, st::buttonRadius, st::msgFile3Bg);
-		prepareCorners(Doc4Corners, st::buttonRadius, st::msgFile4Bg);
-
-		prepareCorners(MessageInCorners, st::historyMessageRadius, st::msgInBg, &st::msgInShadow);
-		prepareCorners(MessageInSelectedCorners, st::historyMessageRadius, st::msgInBgSelected, &st::msgInShadowSelected);
-		prepareCorners(MessageOutCorners, st::historyMessageRadius, st::msgOutBg, &st::msgOutShadow);
-		prepareCorners(MessageOutSelectedCorners, st::historyMessageRadius, st::msgOutBgSelected, &st::msgOutShadowSelected);
-
-		prepareCorners(SendFilesBoxAlbumGroupCorners, st::sendBoxAlbumGroupRadius, st::callFingerprintBg);
-	}
-
-	void createCorners() {
-		::corners.resize(RoundCornersCount);
-		createMaskCorners();
-		createPaletteCorners();
-	}
-
-	void clearCorners() {
-		::corners.clear();
-		::cornersMap.clear();
-	}
-
 	void initMedia() {
-		createCorners();
+		Ui::StartCachedCorners();
 
 		using Update = Window::Theme::BackgroundUpdate;
 		static auto subscription = Window::Theme::Background()->add_subscription([](const Update &update) {
 			if (update.paletteChanged()) {
-				createPaletteCorners();
-
-				if (const auto m = App::main()) { // multi good
-					m->updateScrollColors();
-				}
-				HistoryView::serviceColorsUpdated();
-			} else if (update.type == Update::Type::New) {
-				prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-				prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-
 				if (const auto m = App::main()) { // multi good
 					m->updateScrollColors();
 				}
@@ -221,8 +112,7 @@ namespace App {
 	}
 
 	void deinitMedia() {
-		clearCorners();
-
+		Ui::FinishCachedCorners();
 		Data::clearGlobalStructures();
 	}
 
@@ -396,132 +286,4 @@ namespace App {
 		return QPixmap::fromImage(std::move(image), Qt::ColorOnly);
 	}
 
-	void rectWithCorners(Painter &p, QRect rect, const style::color &bg, RoundCorners index, RectParts corners) {
-		auto parts = RectPart::Top
-			| RectPart::NoTopBottom
-			| RectPart::Bottom
-			| corners;
-		roundRect(p, rect, bg, index, nullptr, parts);
-		if ((corners & RectPart::AllCorners) != RectPart::AllCorners) {
-			const auto size = ::corners[index].p[0].width() / cIntRetinaFactor();
-			if (!(corners & RectPart::TopLeft)) {
-				p.fillRect(rect.x(), rect.y(), size, size, bg);
-			}
-			if (!(corners & RectPart::TopRight)) {
-				p.fillRect(rect.x() + rect.width() - size, rect.y(), size, size, bg);
-			}
-			if (!(corners & RectPart::BottomLeft)) {
-				p.fillRect(rect.x(), rect.y() + rect.height() - size, size, size, bg);
-			}
-			if (!(corners & RectPart::BottomRight)) {
-				p.fillRect(rect.x() + rect.width() - size, rect.y() + rect.height() - size, size, size, bg);
-			}
-		}
-	}
-
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
-		if (radius == ImageRoundRadius::Ellipse) {
-			PainterHighQualityEnabler hq(p);
-			p.setPen(Qt::NoPen);
-			p.setBrush(p.textPalette().selectOverlay);
-			p.drawEllipse(rect);
-		} else {
-			auto overlayCorners = (radius == ImageRoundRadius::Small)
-				? SelectedOverlaySmallCorners
-				: SelectedOverlayLargeCorners;
-			const auto bg = p.textPalette().selectOverlay;
-			rectWithCorners(p, rect, bg, overlayCorners, corners);
-		}
-	}
-
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
-		rectWithCorners(p, rect, st::msgInBg, MessageInCorners, corners);
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, const CornersPixmaps &corner, const style::color *shadow, RectParts parts) {
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (w < 2 * cornerWidth || h < 2 * cornerHeight) return;
-		if (w > 2 * cornerWidth) {
-			if (parts & RectPart::Top) {
-				p.fillRect(x + cornerWidth, y, w - 2 * cornerWidth, cornerHeight, bg);
-			}
-			if (parts & RectPart::Bottom) {
-				p.fillRect(x + cornerWidth, y + h - cornerHeight, w - 2 * cornerWidth, cornerHeight, bg);
-				if (shadow) {
-					p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, *shadow);
-				}
-			}
-		}
-		if (h > 2 * cornerHeight) {
-			if ((parts & RectPart::NoTopBottom) == RectPart::NoTopBottom) {
-				p.fillRect(x, y + cornerHeight, w, h - 2 * cornerHeight, bg);
-			} else {
-				if (parts & RectPart::Left) {
-					p.fillRect(x, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if ((parts & RectPart::Center) && w > 2 * cornerWidth) {
-					p.fillRect(x + cornerWidth, y + cornerHeight, w - 2 * cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if (parts & RectPart::Right) {
-					p.fillRect(x + w - cornerWidth, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-			}
-		}
-		if (parts & RectPart::TopLeft) {
-			p.drawPixmap(x, y, corner.p[0]);
-		}
-		if (parts & RectPart::TopRight) {
-			p.drawPixmap(x + w - cornerWidth, y, corner.p[1]);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.drawPixmap(x, y + h - cornerHeight, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, RoundCorners index, const style::color *shadow, RectParts parts) {
-		roundRect(p, x, y, w, h, bg, ::corners[index], shadow, parts);
-	}
-
-	void roundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, RoundCorners index, RectParts parts) {
-		auto &corner = ::corners[index];
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (parts & RectPart::Bottom) {
-			p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, shadow);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.fillRect(x, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x, y + h - cornerHeight + st::msgShadow, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.fillRect(x + w - cornerWidth, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight + st::msgShadow, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts) {
-		auto colorKey = ((uint32(bg->c.alpha()) & 0xFF) << 24) | ((uint32(bg->c.red()) & 0xFF) << 16) | ((uint32(bg->c.green()) & 0xFF) << 8) | ((uint32(bg->c.blue()) & 0xFF) << 24);
-		auto i = cornersMap.find(colorKey);
-		if (i == cornersMap.cend()) {
-			QImage images[4];
-			switch (radius) {
-			case ImageRoundRadius::Small: prepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
-			case ImageRoundRadius::Large: prepareCorners(LargeMaskCorners, st::historyMessageRadius, bg, nullptr, images); break;
-			default: p.fillRect(x, y, w, h, bg); return;
-			}
-
-			CornersPixmaps pixmaps;
-			for (int j = 0; j < 4; ++j) {
-				pixmaps.p[j] = pixmapFromImageInPlace(std::move(images[j]));
-				pixmaps.p[j].setDevicePixelRatio(cRetinaFactor());
-			}
-			i = cornersMap.insert(colorKey, pixmaps);
-		}
-		roundRect(p, x, y, w, h, bg, i.value(), nullptr, parts);
-	}
-
 }

Telegram/SourceFiles/app.h

@@ -8,54 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_types.h"
-#include "ui/rect_part.h"
-
-enum class ImageRoundRadius;
 
 namespace HistoryView {
 class Element;
 } // namespace HistoryView
 
-enum RoundCorners : int {
-	SmallMaskCorners = 0x00, // for images
-	LargeMaskCorners,
-
-	BoxCorners,
-	MenuCorners,
-	BotKbOverCorners,
-	StickerCorners,
-	StickerSelectedCorners,
-	SelectedOverlaySmallCorners,
-	SelectedOverlayLargeCorners,
-	DateCorners,
-	DateSelectedCorners,
-	OverviewVideoCorners,
-	OverviewVideoSelectedCorners,
-	ForwardCorners,
-	MediaviewSaveCorners,
-	EmojiHoverCorners,
-	StickerHoverCorners,
-	BotKeyboardCorners,
-	PhotoSelectOverlayCorners,
-
-	Doc1Corners,
-	Doc2Corners,
-	Doc3Corners,
-	Doc4Corners,
-
-	InShadowCorners, // for photos without bg
-	InSelectedShadowCorners,
-
-	MessageInCorners, // with shadow
-	MessageInSelectedCorners,
-	MessageOutCorners,
-	MessageOutSelectedCorners,
-
-	SendFilesBoxAlbumGroupCorners,
-
-	RoundCornersCount
-};
-
 namespace App {
 	QString formatPhone(QString phone);
 
@@ -90,20 +47,4 @@ namespace App {
 	QImage readImage(const QString &file, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr, QByteArray *content = 0);
 	QPixmap pixmapFromImageInPlace(QImage &&image);
 
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, index, shadow, parts);
-	}
-	void roundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full);
-	inline void roundShadow(Painter &p, const QRect &rect, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full) {
-		return roundShadow(p, rect.x(), rect.y(), rect.width(), rect.height(), shadow, index, parts);
-	}
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, radius, parts);
-	}
-
 };

Telegram/SourceFiles/boxes/about_box.cpp

@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/text/text_utilities.h"
-#include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "core/click_handler_types.h"
 #include "core/update_checker.h"
@@ -108,7 +107,7 @@ void AboutBox::showVersionHistory() {
 
 		Ui::show(Box<InformBox>("The link to the current private alpha version of Telegram Desktop was copied to the clipboard."));
 	} else {
-		File::OpenUrl(qsl("https://desktop.telegram.org/changelog"));
+		UrlClickHandler::Open(qsl("https://desktop.telegram.org/changelog"));
 	}
 }
 
@@ -125,7 +124,7 @@ QString telegramFaqLink() {
 	const auto langpacked = [&](const char *language) {
 		return result + '/' + language;
 	};
-	const auto current = Lang::Current().id();
+	const auto current = Lang::Id();
 	for (const auto language : { "de", "es", "it", "ko" }) {
 		if (current.startsWith(QLatin1String(language))) {
 			return langpacked(language);

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/special_buttons.h"
 #include "ui/special_fields.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/unread_badge.h"
 #include "ui/ui_utility.h"
 #include "data/data_channel.h"
@@ -244,7 +244,6 @@ private:
 
 	Fn<void()> _revokeCallback;
 	mtpRequestId _revokeRequestId = 0;
-	QPointer<ConfirmBox> _weakRevokeConfirmBox;
 
 };
 
@@ -1417,21 +1416,21 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 			lt_group,
 			pressed->name);
 		auto confirmText = tr::lng_channels_too_much_public_revoke(tr::now);
-		_weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, crl::guard(this, [this, pressed]() {
+		auto callback = crl::guard(this, [=](Fn<void()> &&close) {
 			if (_revokeRequestId) return;
 			_revokeRequestId = _api.request(MTPchannels_UpdateUsername(
 				pressed->asChannel()->inputChannel,
 				MTP_string()
-			)).done([=](const MTPBool &result) {
-				const auto callback = _revokeCallback;
-				if (_weakRevokeConfirmBox) {
-					_weakRevokeConfirmBox->closeBox();
-				}
-				if (callback) {
+			)).done([=, close = std::move(close)](const MTPBool &result) {
+				close();
+				if (const auto callback = _revokeCallback) {
 					callback();
 				}
 			}).send();
-		})), Ui::LayerOption::KeepOther);
+		});
+		Ui::show(
+			Box<ConfirmBox>(text, confirmText, std::move(callback)),
+			Ui::LayerOption::KeepOther);
 	}
 }
 

Telegram/SourceFiles/boxes/background_box.cpp

@@ -103,7 +103,7 @@ private:
 			return !(*this == other);
 		}
 	};
-	using Selection = base::optional_variant<Selected, DeleteSelected>;
+	using Selection = std::variant<v::null_t, Selected, DeleteSelected>;
 
 	int getSelectionIndex(const Selection &selection) const;
 	void repaintPaper(int index);
@@ -163,12 +163,9 @@ void BackgroundBox::prepare() {
 }
 
 void BackgroundBox::removePaper(const Data::WallPaper &paper) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
 	const auto session = &_controller->session();
-	const auto remove = [=, weak = Ui::MakeWeak(this)]{
-		if (*box) {
-			(*box)->closeBox();
-		}
+	const auto remove = [=, weak = Ui::MakeWeak(this)](Fn<void()> &&close) {
+		close();
 		if (weak) {
 			weak->_inner->removePaper(paper);
 		}
@@ -179,7 +176,7 @@ void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 			paper.mtpSettings()
 		)).send();
 	};
-	*box = Ui::show(
+	Ui::show(
 		Box<ConfirmBox>(
 			tr::lng_background_sure_delete(tr::now),
 			tr::lng_selected_delete(tr::now),
@@ -358,16 +355,16 @@ void BackgroundBox::Inner::paintPaper(
 		p.drawPixmap(x, y, paper.thumbnail);
 	}
 
-	const auto over = _overDown ? _overDown : _over;
+	const auto over = !v::is_null(_overDown) ? _overDown : _over;
 	if (paper.data.id() == Window::Theme::Background()->id()) {
 		const auto checkLeft = x + st::backgroundSize.width() - st::overviewCheckSkip - st::overviewCheck.size;
 		const auto checkTop = y + st::backgroundSize.height() - st::overviewCheckSkip - st::overviewCheck.size;
 		_check->paint(p, checkLeft, checkTop, width());
 	} else if (Data::IsCloudWallPaper(paper.data)
 		&& !Data::IsDefaultWallPaper(paper.data)
-		&& over.has_value()
+		&& !v::is_null(over)
 		&& (&paper == &_papers[getSelectionIndex(over)])) {
-		const auto deleteSelected = over.is<DeleteSelected>();
+		const auto deleteSelected = v::is<DeleteSelected>(over);
 		const auto deletePos = QPoint(x + st::backgroundSize.width() - st::stickerPanDeleteIconBg.width(), y);
 		p.setOpacity(deleteSelected ? st::stickerPanDeleteOpacityBgOver : st::stickerPanDeleteOpacityBg);
 		st::stickerPanDeleteIconBg.paint(p, deletePos, width());
@@ -414,7 +411,7 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		repaintPaper(getSelectionIndex(_over));
 		_over = newOver;
 		repaintPaper(getSelectionIndex(_over));
-		setCursor((_over.has_value() || _overDown.has_value())
+		setCursor((!v::is_null(_over) || !v::is_null(_overDown))
 			? style::cur_pointer
 			: style::cur_default);
 	}
@@ -442,22 +439,22 @@ void BackgroundBox::Inner::mousePressEvent(QMouseEvent *e) {
 
 int BackgroundBox::Inner::getSelectionIndex(
 		const Selection &selection) const {
-	return selection.match([](const Selected &data) {
+	return v::match(selection, [](const Selected &data) {
 		return data.index;
 	}, [](const DeleteSelected &data) {
 		return data.index;
-	}, [](std::nullopt_t) {
+	}, [](v::null_t) {
 		return -1;
 	});
 }
 
 void BackgroundBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
-	if (base::take(_overDown) == _over && _over.has_value()) {
+	if (base::take(_overDown) == _over && !v::is_null(_over)) {
 		const auto index = getSelectionIndex(_over);
 		if (index >= 0 && index < _papers.size()) {
-			if (base::get_if<DeleteSelected>(&_over)) {
+			if (std::get_if<DeleteSelected>(&_over)) {
 				_backgroundRemove.fire_copy(_papers[index].data);
-			} else if (base::get_if<Selected>(&_over)) {
+			} else if (std::get_if<Selected>(&_over)) {
 				auto &paper = _papers[index];
 				if (!paper.dataMedia) {
 					if (const auto document = paper.data.document()) {
@@ -468,7 +465,7 @@ void BackgroundBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 				_backgroundChosen.fire_copy(paper.data);
 			}
 		}
-	} else if (!_over.has_value()) {
+	} else if (v::is_null(_over)) {
 		setCursor(style::cur_default);
 	}
 }

Telegram/SourceFiles/boxes/background_preview_box.cpp

@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_preview_box.h"
 #include "window/window_session_controller.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 

Telegram/SourceFiles/boxes/boxes.style

@@ -348,6 +348,7 @@ sessionInfoFont: msgFont;
 sessionInfoFg: windowSubTextFg;
 sessionTerminateTop: 28px;
 sessionTerminateSkip: 22px;
+sessionNamePadding: margins(0px, 0px, 5px, 0px);
 sessionTerminate: IconButton {
 	width: 20px;
 	height: 20px;
@@ -366,6 +367,15 @@ sessionTerminateAllButton: LinkButton(boxLinkButton) {
 	color: attentionButtonFg;
 	overColor: attentionButtonFg;
 }
+sessionNameStyle: TextStyle(defaultTextStyle) {
+	font: sessionNameFont;
+}
+sessionWhenStyle: TextStyle(defaultTextStyle) {
+	font: sessionWhenFont;
+}
+sessionInfoStyle: TextStyle(defaultTextStyle) {
+	font: sessionInfoFont;
+}
 
 passcodeHeaderFont: font(19px);
 passcodeHeaderHeight: 80px;
@@ -479,7 +489,7 @@ backgroundScroll: ScrollArea(boxScroll) {
 	deltab: 10px;
 }
 
-editMediaButtonSize: 29px;
+editMediaButtonSize: 28px;
 editMediaButtonSkip: 8px;
 editMediaButtonFileSkipRight: 1px;
 editMediaButtonFileSkipTop: 7px;
@@ -498,25 +508,33 @@ editMediaButton: IconButton {
 
 // SendFilesBox
 
-sendBoxAlbumGroupEditInternalSkip: 9px;
+sendBoxAlbumGroupEditInternalSkip: 8px;
 sendBoxAlbumGroupSkipRight: 6px;
 sendBoxAlbumGroupSkipTop: 6px;
-sendBoxAlbumGroupRadius: 12px;
-sendBoxAlbumGroupHeight: 25px;
+sendBoxAlbumGroupRadius: 13px;
+sendBoxAlbumGroupHeight: 26px;
 
-sendBoxAlbumGroupEditButtonIcon: editMediaButtonIconPhoto;
-sendBoxAlbumGroupEditButtonIconPosition: point(4px, -1px);
+sendBoxFileGroupSkipTop: 2px;
+sendBoxFileGroupSkipRight: 8px;
+sendBoxFileGroupEditInternalSkip: -1px;
 
 sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: windowBgRipple;
 	}
 }
-
-sendBoxAlbumGroupDeleteButtonIconPosition: point(-3px, 0px);
-sendBoxAlbumGroupDeleteButtonIcon: icon {{ "history_file_cancel", msgServiceFg}};
+sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
 sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "history_file_cancel", menuIconFg, point(6px, 6px) }};
 
+sendBoxAlbumGroupButtonMediaEdit: icon {{ "settings_edit", msgServiceFg, point(3px, -2px) }};
+sendBoxAlbumGroupButtonMediaDelete: icon {{ "history_file_cancel", msgServiceFg, point(2px, 5px) }};
+sendBoxAlbumGroupButtonMedia: IconButton {
+	width: sendBoxAlbumGroupHeight;
+	height: sendBoxAlbumGroupHeight;
+
+	icon: sendBoxAlbumGroupButtonMediaEdit;
+}
+
 // End of SendFilesBox
 
 calendarTitleHeight: boxTitleHeight;
@@ -695,11 +713,7 @@ groupStickersSubTitleHeight: 36px;
 
 sendMediaPreviewSize: 308px;
 sendMediaPreviewHeightMax: 1280;
-sendMediaPreviewPhotoSkip: 10px;
-sendMediaFileThumbSize: 64px;
-sendMediaFileThumbSkip: 10px;
-sendMediaFileNameTop: 7px;
-sendMediaFileStatusTop: 37px;
+sendMediaRowSkip: 10px;
 
 proxyUsePadding: margins(22px, 6px, 22px, 5px);
 proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px);

Telegram/SourceFiles/boxes/confirm_box.cpp

@@ -69,12 +69,27 @@ TextParseOptions kMarkedTextBoxOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
+[[nodiscard]] bool IsOldForPin(MsgId id, not_null<PeerData*> peer) {
+	const auto normal = peer->migrateToOrMe();
+	const auto migrated = normal->migrateFrom();
+	const auto top = Data::ResolveTopPinnedId(normal, migrated);
+	if (!top) {
+		return false;
+	} else if (peer == migrated) {
+		return top.channel || (id < top.msg);
+	} else if (migrated) {
+		return top.channel && (id < top.msg);
+	} else {
+		return (id < top.msg);
+	}
+}
+
 } // namespace
 
 ConfirmBox::ConfirmBox(
 	QWidget*,
 	const QString &text,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(tr::lng_box_ok(tr::now))
 , _cancelText(tr::lng_cancel(tr::now))
@@ -89,7 +104,7 @@ ConfirmBox::ConfirmBox(
 	QWidget*,
 	const QString &text,
 	const QString &confirmText,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(tr::lng_cancel(tr::now))
@@ -104,7 +119,7 @@ ConfirmBox::ConfirmBox(
 	QWidget*,
 	const TextWithEntities &text,
 	const QString &confirmText,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(tr::lng_cancel(tr::now))
@@ -120,7 +135,7 @@ ConfirmBox::ConfirmBox(
 	const QString &text,
 	const QString &confirmText,
 	const style::RoundButton &confirmStyle,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(tr::lng_cancel(tr::now))
@@ -136,7 +151,7 @@ ConfirmBox::ConfirmBox(
 	const QString &text,
 	const QString &confirmText,
 	const QString &cancelText,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(cancelText)
@@ -153,7 +168,7 @@ ConfirmBox::ConfirmBox(
 	const QString &confirmText,
 	const style::RoundButton &confirmStyle,
 	const QString &cancelText,
-	FnMut<void()> confirmedCallback,
+	ConfirmBox::ConfirmedCallback confirmedCallback,
 	FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(cancelText)
@@ -256,8 +271,16 @@ void ConfirmBox::textUpdated() {
 void ConfirmBox::confirmed() {
 	if (!_confirmed) {
 		_confirmed = true;
-		if (auto callback = std::move(_confirmedCallback)) {
-			callback();
+
+		const auto confirmed = &_confirmedCallback;
+		if (const auto callbackPtr = std::get_if<1>(confirmed)) {
+			if (auto callback = base::take(*callbackPtr)) {
+				callback();
+			}
+		} else if (const auto callbackPtr = std::get_if<2>(confirmed)) {
+			if (auto callback = base::take(*callbackPtr)) {
+				callback([=] { closeBox(); });
+			}
 		}
 	}
 }
@@ -436,20 +459,43 @@ PinMessageBox::PinMessageBox(
 : _peer(peer)
 , _api(&peer->session().mtp())
 , _msgId(msgId)
-, _text(this, tr::lng_pinned_pin_sure(tr::now), st::boxLabel) {
+, _pinningOld(IsOldForPin(msgId, peer))
+, _text(
+	this,
+	(_pinningOld
+		? tr::lng_pinned_pin_old_sure(tr::now)
+		: (peer->isChat() || peer->isMegagroup())
+		? tr::lng_pinned_pin_sure_group(tr::now)
+		: tr::lng_pinned_pin_sure(tr::now)),
+	st::boxLabel) {
 }
 
 void PinMessageBox::prepare() {
 	addButton(tr::lng_pinned_pin(), [this] { pinMessage(); });
 	addButton(tr::lng_cancel(), [this] { closeBox(); });
 
-	if (_peer->isChat() || _peer->isMegagroup()) {
-		_notify.create(this, tr::lng_pinned_notify(tr::now), true, st::defaultBoxCheckbox);
+	if (_peer->isUser() && !_peer->isSelf()) {
+		_pinForPeer.create(
+			this,
+			tr::lng_pinned_also_for_other(
+				tr::now,
+				lt_user,
+				_peer->shortName()),
+			false,
+			st::defaultBoxCheckbox);
+		_checkbox = _pinForPeer;
+	} else if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) {
+		_notify.create(
+			this,
+			tr::lng_pinned_notify(tr::now),
+			true,
+			st::defaultBoxCheckbox);
+		_checkbox = _notify;
 	}
 
 	auto height = st::boxPadding.top() + _text->height() + st::boxPadding.bottom();
-	if (_notify) {
-		height += st::boxMediumSkip + _notify->heightNoMargins();
+	if (_checkbox) {
+		height += st::boxMediumSkip + _checkbox->heightNoMargins();
 	}
 	setDimensions(st::boxWidth, height);
 }
@@ -457,8 +503,8 @@ void PinMessageBox::prepare() {
 void PinMessageBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 	_text->moveToLeft(st::boxPadding.left(), st::boxPadding.top());
-	if (_notify) {
-		_notify->moveToLeft(st::boxPadding.left(), _text->y() + _text->height() + st::boxMediumSkip);
+	if (_checkbox) {
+		_checkbox->moveToLeft(st::boxPadding.left(), _text->y() + _text->height() + st::boxMediumSkip);
 	}
 }
 
@@ -477,6 +523,9 @@ void PinMessageBox::pinMessage() {
 	if (_notify && !_notify->checked()) {
 		flags |= MTPmessages_UpdatePinnedMessage::Flag::f_silent;
 	}
+	if (_pinForPeer && !_pinForPeer->checked()) {
+		flags |= MTPmessages_UpdatePinnedMessage::Flag::f_pm_oneside;
+	}
 	_requestId = _api.request(MTPmessages_UpdatePinnedMessage(
 		MTP_flags(flags),
 		_peer->input,
@@ -808,53 +857,7 @@ void DeleteMessagesBox::deleteAndClear() {
 		_deleteConfirmedCallback();
 	}
 
-	auto remove = std::vector<not_null<HistoryItem*>>();
-	remove.reserve(_ids.size());
-	base::flat_map<not_null<History*>, QVector<MTPint>> idsByPeer;
-	base::flat_map<not_null<PeerData*>, QVector<MTPint>> scheduledIdsByPeer;
-	for (const auto itemId : _ids) {
-		if (const auto item = _session->data().message(itemId)) {
-			const auto history = item->history();
-			if (item->isScheduled()) {
-				const auto wasOnServer = !item->isSending()
-					&& !item->hasFailed();
-				if (wasOnServer) {
-					scheduledIdsByPeer[history->peer].push_back(MTP_int(
-						_session->data().scheduledMessages().lookupId(item)));
-				} else {
-					_session->data().scheduledMessages().removeSending(item);
-				}
-				continue;
-			}
-			remove.push_back(item);
-			if (IsServerMsgId(item->id)) {
-				idsByPeer[history].push_back(MTP_int(itemId.msg));
-			}
-		}
-	}
-
-	for (const auto &[history, ids] : idsByPeer) {
-		history->owner().histories().deleteMessages(history, ids, revoke);
-	}
-	for (const auto &[peer, ids] : scheduledIdsByPeer) {
-		peer->session().api().request(MTPmessages_DeleteScheduledMessages(
-			peer->input,
-			MTP_vector<MTPint>(ids)
-		)).done([peer=peer](const MTPUpdates &result) {
-			peer->session().api().applyUpdates(result);
-		}).send();
-	}
-
-	for (const auto item : remove) {
-		const auto history = item->history();
-		const auto wasLast = (history->lastMessage() == item);
-		const auto wasInChats = (history->chatListMessage() == item);
-		item->destroy();
-
-		if (wasLast || wasInChats) {
-			history->requestChatListMessage();
-		}
-	}
+	_session->data().histories().deleteMessages(_ids, revoke);
 
 	const auto session = _session;
 	Ui::hideLayer();

Telegram/SourceFiles/boxes/confirm_box.h

@@ -28,12 +28,51 @@ class EmptyUserpic;
 class InformBox;
 class ConfirmBox : public Ui::BoxContent, public ClickHandlerHost {
 public:
-	ConfirmBox(QWidget*, const QString &text, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
-	ConfirmBox(QWidget*, const TextWithEntities &text, const QString &confirmText, FnMut<void()> confirmedCallback = nullptr, FnMut<void()> cancelledCallback = nullptr);
+
+	using ConfirmedCallback = std::variant<
+		v::null_t,
+		FnMut<void()>,
+		FnMut<void(Fn<void()>)>>;
+
+	ConfirmBox(
+		QWidget*,
+		const QString &text,
+		ConfirmedCallback confirmedCallback = FnMut<void()>(),
+		FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(
+		QWidget*,
+		const QString &text,
+		const QString &confirmText,
+		ConfirmedCallback confirmedCallback = FnMut<void()>(),
+		FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(
+		QWidget*,
+		const QString &text,
+		const QString &confirmText,
+		const style::RoundButton &confirmStyle,
+		ConfirmedCallback confirmedCallback = FnMut<void()>(),
+		FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(
+		QWidget*,
+		const QString &text,
+		const QString &confirmText,
+		const QString &cancelText,
+		ConfirmedCallback confirmedCallback = FnMut<void()>(),
+		FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(
+		QWidget*,
+		const QString &text,
+		const QString &confirmText,
+		const style::RoundButton &confirmStyle,
+		const QString &cancelText,
+		ConfirmedCallback confirmedCallback = FnMut<void()>(),
+		FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(
+		QWidget*,
+		const TextWithEntities &text,
+		const QString &confirmText,
+		ConfirmedCallback confirmedCallback = v::null,
+		FnMut<void()> cancelledCallback = nullptr);
 
 	void updateLink();
 
@@ -87,7 +126,7 @@ private:
 	bool _confirmed = false;
 	bool _cancelled = false;
 	bool _strictCancel = false;
-	FnMut<void()> _confirmedCallback;
+	ConfirmBox::ConfirmedCallback _confirmedCallback;
 	FnMut<void()> _cancelledCallback;
 
 };
@@ -144,10 +183,13 @@ private:
 
 	const not_null<PeerData*> _peer;
 	MTP::Sender _api;
-	MsgId _msgId;
+	MsgId _msgId = 0;
+	bool _pinningOld = false;
 
 	object_ptr<Ui::FlatLabel> _text;
 	object_ptr<Ui::Checkbox> _notify = { nullptr };
+	object_ptr<Ui::Checkbox> _pinForPeer = { nullptr };
+	QPointer<Ui::Checkbox> _checkbox;
 
 	mtpRequestId _requestId = 0;
 

Telegram/SourceFiles/boxes/connection_box.cpp

@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/radial_animation.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "facades.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -41,6 +41,48 @@ constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000);
 
 using ProxyData = MTP::ProxyData;
 
+class HostInput : public Ui::MaskedInputField {
+public:
+	HostInput(
+		QWidget *parent,
+		const style::InputField &st,
+		rpl::producer<QString> placeholder,
+		const QString &val);
+
+protected:
+	void correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) override;
+};
+
+HostInput::HostInput(
+	QWidget *parent,
+	const style::InputField &st,
+	rpl::producer<QString> placeholder,
+	const QString &val)
+: MaskedInputField(parent, st, std::move(placeholder), val) {
+}
+
+void HostInput::correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) {
+	QString newText;
+	int newCursor = nowCursor;
+	newText.reserve(now.size());
+	for (auto i = 0, l = now.size(); i < l; ++i) {
+		if (now[i] == ',') {
+			newText.append('.');
+		} else {
+			newText.append(now[i]);
+		}
+	}
+	setCorrectedText(now, nowCursor, newText, newCursor);
+}
+
 class Base64UrlInput : public Ui::MaskedInputField {
 public:
 	Base64UrlInput(
@@ -209,7 +251,7 @@ private:
 	std::shared_ptr<Ui::RadioenumGroup<Type>> _type;
 
 	QPointer<Ui::SlideWrap<>> _aboutSponsored;
-	QPointer<Ui::InputField> _host;
+	QPointer<HostInput> _host;
 	QPointer<Ui::PortInput> _port;
 	QPointer<Ui::InputField> _user;
 	QPointer<Ui::PasswordInput> _password;
@@ -767,12 +809,12 @@ ProxyBox::ProxyBox(
 void ProxyBox::prepare() {
 	setTitle(tr::lng_proxy_edit());
 
-	connect(_host.data(), &Ui::InputField::changed, [=] {
+	connect(_host.data(), &HostInput::changed, [=] {
 		Ui::PostponeCall(_host, [=] {
 			const auto host = _host->getLastText().trimmed();
 			static const auto mask = u"^\\d+\\.\\d+\\.\\d+\\.\\d+:(\\d*)$"_q;
 			const auto match = QRegularExpression(mask).match(host);
-			if (_host->textCursor().position() == host.size()
+			if (_host->cursorPosition() == host.size()
 				&& match.hasMatch()) {
 				const auto port = match.captured(1);
 				_port->setText(port);
@@ -881,7 +923,7 @@ void ProxyBox::setupSocketAddress(const ProxyData &data) {
 			_content,
 			st::connectionHostInputField.heightMin),
 		st::proxyEditInputPadding);
-	_host = Ui::CreateChild<Ui::InputField>(
+	_host = Ui::CreateChild<HostInput>(
 		address,
 		st::connectionHostInputField,
 		tr::lng_connection_host_ph(),
@@ -1043,7 +1085,6 @@ void ProxiesBoxController::ShowApplyConfirmation(
 		proxy.password = fields.value(qsl("secret"));
 	}
 	if (proxy) {
-		const auto box = std::make_shared<QPointer<ConfirmBox>>();
 		const auto text = tr::lng_sure_enable_socks(
 			tr::now,
 			lt_server,
@@ -1053,7 +1094,7 @@ void ProxiesBoxController::ShowApplyConfirmation(
 			+ (proxy.type == Type::Mtproto
 				? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
 				: QString());
-		*box = Ui::show(Box<ConfirmBox>(text, tr::lng_sure_enable(tr::now), [=] {
+		auto callback = [=](Fn<void()> &&close) {
 			auto &proxies = Global::RefProxiesList();
 			if (!ranges::contains(proxies, proxy)) {
 				proxies.push_back(proxy);
@@ -1062,10 +1103,14 @@ void ProxiesBoxController::ShowApplyConfirmation(
 				proxy,
 				ProxyData::Settings::Enabled);
 			Local::writeSettings();
-			if (const auto strong = box->data()) {
-				strong->closeBox();
-			}
-		}), Ui::LayerOption::KeepOther);
+			close();
+		};
+		Ui::show(
+			Box<ConfirmBox>(
+				text,
+				tr::lng_sure_enable(tr::now),
+				std::move(callback)),
+			Ui::LayerOption::KeepOther);
 	} else {
 		Ui::show(Box<InformBox>(
 			(proxy.status() == ProxyData::Status::Unsupported

Telegram/SourceFiles/boxes/dictionaries_manager.cpp

@@ -225,7 +225,7 @@ auto AddButtonWithLoader(
 
 	buttonState->value(
 	) | rpl::start_with_next([=](const DictState &state) {
-		const auto isToggledSet = state.is<Active>();
+		const auto isToggledSet = v::is<Active>(state);
 		const auto toggled = isToggledSet ? 1. : 0.;
 		const auto over = !button->isDisabled()
 			&& (button->isDown() || button->isOver());
@@ -252,7 +252,7 @@ auto AddButtonWithLoader(
 					dictionaryRemoved->events(),
 					buttonState->value(
 					) | rpl::filter([](const DictState &state) {
-						return state.is<Failed>();
+						return v::is<Failed>(state);
 					}) | rpl::to_empty
 				) | rpl::map_to(false)
 			)
@@ -276,13 +276,14 @@ auto AddButtonWithLoader(
 			});
 	}) | rpl::flatten_latest(
 	) | rpl::filter([=](const DictState &state) {
-		return !buttonState->current().is<Failed>() || !state.is<Available>();
+		return !v::is<Failed>(buttonState->current())
+			|| !v::is<Available>(state);
 	});
 
 	button->toggledValue(
 	) | rpl::start_with_next([=](bool toggled) {
 		const auto &state = buttonState->current();
-		if (toggled && (state.is<Available>() || state.is<Failed>())) {
+		if (toggled && (v::is<Available>(state) || v::is<Failed>(state))) {
 			const auto weak = Ui::MakeWeak(button);
 			setLocalLoader(base::make_unique_q<Loader>(
 				QCoreApplication::instance(),
@@ -292,7 +293,7 @@ auto AddButtonWithLoader(
 				Spellchecker::DictPathByLangId(id),
 				Spellchecker::GetDownloadSize(id),
 				crl::guard(weak, destroyLocalLoader)));
-		} else if (!toggled && state.is<Loading>()) {
+		} else if (!toggled && v::is<Loading>(state)) {
 			if (const auto g = rawGlobalLoaderPtr()) {
 				g->destroy();
 				return;

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -34,7 +34,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "platform/platform_specific.h"
 #include "lang/lang_keys.h"
-#include "layout.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/streaming/media_streaming_document.h"
@@ -47,17 +46,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/checkbox.h"
-#include "ui/special_buttons.h"
-#include "ui/text_options.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_options.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/toast/toast.h"
+#include "ui/cached_round_corners.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
 #include "apiwrap.h"
+#include "app.h" // App::pixmapFromImageInPlace.
 #include "facades.h" // App::LambdaDelayed.
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtCore/QMimeData>
 
@@ -67,13 +70,13 @@ using namespace ::Media::Streaming;
 using Data::PhotoSize;
 
 auto ListFromMimeData(not_null<const QMimeData*> data) {
-	using Error = Storage::PreparedList::Error;
+	using Error = Ui::PreparedList::Error;
 	auto result = data->hasUrls()
 		? Storage::PrepareMediaList(
 			// When we edit media, we need only 1 file.
 			data->urls().mid(0, 1),
 			st::sendMediaPreviewSize)
-		: Storage::PreparedList(Error::EmptyFile, QString());
+		: Ui::PreparedList(Error::EmptyFile, QString());
 	if (result.error == Error::None) {
 		return result;
 	} else if (data->hasImage()) {
@@ -103,10 +106,23 @@ EditCaptionBox::EditCaptionBox(
 	Expects(item->media()->allowsEditCaption());
 
 	_isAllowedEditMedia = item->media()->allowsEditMedia();
-	_isAlbum = !item->groupId().empty();
-
 	auto dimensions = QSize();
 	const auto media = item->media();
+
+	if (!item->groupId().empty()) {
+		if (media->photo()) {
+			_albumType = Ui::AlbumType::PhotoVideo;
+		} else if (const auto document = media->document()) {
+			if (document->isVideoFile()) {
+				_albumType = Ui::AlbumType::PhotoVideo;
+			} else if (document->isSong()) {
+				_albumType = Ui::AlbumType::Music;
+			} else {
+				_albumType = Ui::AlbumType::File;
+			}
+		}
+	}
+
 	if (const auto photo = media->photo()) {
 		_photoMedia = photo->createMediaView();
 		_photoMedia->wanted(PhotoSize::Large, _msgId);
@@ -155,11 +171,12 @@ EditCaptionBox::EditCaptionBox(
 			_thumbw = 0;
 			_thumbnailImageLoaded = true;
 		} else {
+			const auto thumbSize = st::msgFileThumbLayout.thumbSize;
 			const auto tw = dimensions.width(), th = dimensions.height();
 			if (tw > th) {
-				_thumbw = (tw * st::msgFileThumbSize) / th;
+				_thumbw = (tw * thumbSize) / th;
 			} else {
-				_thumbw = st::msgFileThumbSize;
+				_thumbw = thumbSize;
 			}
 			_refreshThumbnail = [=] {
 				const auto image = computeImage();
@@ -177,8 +194,8 @@ EditCaptionBox::EditCaptionBox(
 					_thumbw * cIntRetinaFactor(),
 					0,
 					options,
-					st::msgFileThumbSize,
-					st::msgFileThumbSize));
+					thumbSize,
+					thumbSize));
 				_thumbnailImageLoaded = true;
 			};
 			_refreshThumbnail();
@@ -352,8 +369,8 @@ EditCaptionBox::EditCaptionBox(
 		this,
 		object_ptr<Ui::Checkbox>(
 			this,
-			tr::lng_send_file(tr::now),
-			false,
+			tr::lng_send_compressed(tr::now),
+			true,
 			st::defaultBoxCheckbox),
 		st::editMediaCheckboxMargins);
 	_wayWrap = r.data();
@@ -361,8 +378,14 @@ EditCaptionBox::EditCaptionBox(
 
 	r->entity()->checkedChanges(
 	) | rpl::start_with_next([&](bool checked) {
-		_asFile = checked;
+		_asFile = !checked;
 	}, _wayWrap->lifetime());
+
+	_controller->session().data().itemRemoved(
+		_msgId
+	) | rpl::start_with_next([=] {
+		closeBox();
+	}, lifetime());
 }
 
 EditCaptionBox::~EditCaptionBox() = default;
@@ -431,7 +454,7 @@ void EditCaptionBox::setupStreamedPreview(std::shared_ptr<Document> shared) {
 }
 
 void EditCaptionBox::handleStreamingUpdate(Update &&update) {
-	update.data.match([&](Information &update) {
+	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
 	}, [&](const PreloadedVideo &update) {
 	}, [&](const UpdateVideo &update) {
@@ -469,7 +492,7 @@ void EditCaptionBox::streamingReady(Information &&info) {
 }
 
 void EditCaptionBox::updateEditPreview() {
-	using Info = FileMediaInformation;
+	using Info = Ui::PreparedFileInformation;
 
 	const auto file = &_preparedList.files.front();
 	const auto fileMedia = &file->information->media;
@@ -477,7 +500,8 @@ void EditCaptionBox::updateEditPreview() {
 	const auto fileinfo = QFileInfo(file->path);
 	const auto filename = fileinfo.fileName();
 
-	_isImage = fileIsImage(filename, file->mime);
+	const auto mime = file->information->filemime;
+	_isImage = Core::FileIsImage(filename, mime);
 	_isAudio = false;
 	_animated = false;
 	_photo = false;
@@ -489,10 +513,11 @@ void EditCaptionBox::updateEditPreview() {
 	auto isGif = false;
 	auto shouldAsDoc = true;
 	auto docPhotoSize = QSize();
-	if (const auto image = base::get_if<Info::Image>(fileMedia)) {
-		shouldAsDoc = !Storage::ValidateThumbDimensions(
+	if (const auto image = std::get_if<Info::Image>(fileMedia)) {
+		shouldAsDoc = !Ui::ValidateThumbDimensions(
 			image->data.width(),
-			image->data.height());
+			image->data.height()
+		) || (_albumType == Ui::AlbumType::File);
 		if (shouldAsDoc) {
 			docPhotoSize.setWidth(image->data.width());
 			docPhotoSize.setHeight(image->data.height());
@@ -501,15 +526,15 @@ void EditCaptionBox::updateEditPreview() {
 		_animated = isGif;
 		_photo = !isGif && !shouldAsDoc;
 		_isImage = true;
-	} else if (const auto video = base::get_if<Info::Video>(fileMedia)) {
+	} else if (const auto video = std::get_if<Info::Video>(fileMedia)) {
 		isGif = video->isGifv;
 		_animated = true;
 		shouldAsDoc = false;
 	}
 	if (shouldAsDoc) {
 		auto nameString = filename;
-		if (const auto song = base::get_if<Info::Song>(fileMedia)) {
-			nameString = DocumentData::ComposeNameString(
+		if (const auto song = std::get_if<Info::Song>(fileMedia)) {
+			nameString = Ui::ComposeNameString(
 				filename,
 				song->title,
 				song->performer);
@@ -517,7 +542,7 @@ void EditCaptionBox::updateEditPreview() {
 		}
 
 		const auto getExt = [&] {
-			auto patterns = Core::MimeTypeForName(file->mime).globPatterns();
+			auto patterns = Core::MimeTypeForName(mime).globPatterns();
 			if (!patterns.isEmpty()) {
 				return patterns.front().replace('*', QString());
 			}
@@ -543,7 +568,7 @@ void EditCaptionBox::updateEditPreview() {
 		_doc = true;
 	}
 
-	const auto showCheckbox = _photo && !_isAlbum;
+	const auto showCheckbox = _photo && (_albumType == Ui::AlbumType::None);
 	_wayWrap->toggle(showCheckbox, anim::type::instant);
 
 	if (!_doc) {
@@ -580,25 +605,40 @@ void EditCaptionBox::updateEditMediaButton() {
 
 void EditCaptionBox::createEditMediaButton() {
 	const auto callback = [=](FileDialog::OpenResult &&result) {
-		auto showBoxErrorCallback = [](tr::phrase<> t) {
-			Ui::show(Box<InformBox>(t(tr::now)), Ui::LayerOption::KeepOther);
+		auto showError = [](tr::phrase<> t) {
+			Ui::Toast::Show(t(tr::now));
 		};
 
-		auto list = Storage::PreparedList::PreparedFileFromFilesDialog(
+		const auto checkResult = [=](const Ui::PreparedList &list) {
+			if (list.files.size() != 1) {
+				return false;
+			}
+			const auto &file = list.files.front();
+			const auto mime = file.information->filemime;
+			if (Core::IsMimeSticker(mime)) {
+				showError(tr::lng_edit_media_invalid_file);
+				return false;
+			} else if (_albumType != Ui::AlbumType::None
+				&& !file.canBeInAlbumType(_albumType)) {
+				showError(tr::lng_edit_media_album_error);
+				return false;
+			}
+			return true;
+		};
+		auto list = Storage::PreparedFileFromFilesDialog(
 			std::move(result),
-			_isAlbum,
-			std::move(showBoxErrorCallback),
+			checkResult,
+			showError,
 			st::sendMediaPreviewSize);
 
 		if (list) {
-			_preparedList = std::move(*list);
-			updateEditPreview();
+			setPreparedList(std::move(*list));
 		}
 	};
 
 	const auto buttonCallback = [=] {
-		const auto filters = _isAlbum
-			? FileDialog::AlbumFilesFilter()
+		const auto filters = (_albumType == Ui::AlbumType::PhotoVideo)
+			? FileDialog::PhotoVideoFilesFilter()
 			: FileDialog::AllFilesFilter();
 		FileDialog::GetOpenPath(
 			this,
@@ -616,9 +656,10 @@ void EditCaptionBox::createEditMediaButton() {
 	_editMedia.create(this, st::editMediaButton);
 	updateEditMediaButton();
 	_editMedia->setClickedCallback(
-		App::LambdaDelayed(st::historyAttach.ripple.hideDuration, this, [=] {
-		buttonCallback();
-	}));
+		App::LambdaDelayed(
+			st::historyAttach.ripple.hideDuration,
+			this,
+			buttonCallback));
 }
 
 void EditCaptionBox::prepare() {
@@ -644,7 +685,7 @@ void EditCaptionBox::prepare() {
 		if (action == Ui::InputField::MimeAction::Check) {
 			if (!data->hasText() && !_isAllowedEditMedia) {
 				return false;
-			} else if (Storage::ValidateDragData(data, _isAlbum)) {
+			} else if (Storage::ValidateEditMediaDragData(data, _albumType)) {
 				return true;
 			}
 			return data->hasText();
@@ -668,38 +709,32 @@ void EditCaptionBox::prepare() {
 }
 
 bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
+	return setPreparedList(ListFromMimeData(data));
+}
+
+bool EditCaptionBox::setPreparedList(Ui::PreparedList &&list) {
 	if (!_isAllowedEditMedia) {
 		return false;
 	}
-	using Error = Storage::PreparedList::Error;
-	using AlbumType = Storage::PreparedFile::AlbumType;
-	auto list = ListFromMimeData(data);
-
+	using Error = Ui::PreparedList::Error;
+	using Type = Ui::PreparedFile::Type;
 	if (list.error != Error::None || list.files.empty()) {
 		return false;
 	}
-
-	const auto file = &list.files.front();
-	if (_isAlbum && (file->type == AlbumType::None)) {
-		const auto imageAsDoc = [&] {
-			using Info = FileMediaInformation;
-			const auto fileMedia = &file->information->media;
-			if (const auto image = base::get_if<Info::Image>(fileMedia)) {
-				return !Storage::ValidateThumbDimensions(
-					image->data.width(),
-					image->data.height());
-			}
-			return false;
-		}();
-
-		if (!data->hasText() || imageAsDoc) {
-			Ui::show(
-				Box<InformBox>(tr::lng_edit_media_album_error(tr::now)),
-				Ui::LayerOption::KeepOther);
+	auto file = &list.files.front();
+	const auto invalidForAlbum = (_albumType != Ui::AlbumType::None)
+		&& !file->canBeInAlbumType(_albumType);
+	if (_albumType == Ui::AlbumType::PhotoVideo) {
+		using Video = Ui::PreparedFileInformation::Video;
+		if (const auto video = std::get_if<Video>(&file->information->media)) {
+			video->isGifv = false;
 		}
+	}
+	if (invalidForAlbum) {
+		Ui::Toast::Show(tr::lng_edit_media_album_error(tr::now));
 		return false;
 	}
-	_photo = _isImage = (file->type == AlbumType::Photo);
+	_photo = _isImage = (file->type == Type::Photo);
 	_preparedList = std::move(list);
 	updateEditPreview();
 	return true;
@@ -749,7 +784,7 @@ void EditCaptionBox::setupDragArea() {
 	auto enterFilter = [=](not_null<const QMimeData*> data) {
 		return !_isAllowedEditMedia
 			? false
-			: Storage::ValidateDragData(data, _isAlbum);
+			: Storage::ValidateEditMediaDragData(data, _albumType);
 	};
 	// Avoid both drag areas appearing at one time.
 	auto computeState = [=](const QMimeData *data) {
@@ -780,12 +815,11 @@ void EditCaptionBox::updateBoxSize() {
 	if (_photo) {
 		newHeight += _wayWrap->height() / 2;
 	}
+	const auto &st = _thumbw ? st::msgFileThumbLayout : st::msgFileLayout;
 	if (_photo || _animated) {
 		newHeight += std::max(_thumbh, _gifh);
-	} else if (_thumbw) {
-		newHeight += 0 + st::msgFileThumbSize + 0;
-	} else if (_doc) {
-		newHeight += 0 + st::msgFileSize + 0;
+	} else if (_thumbw || _doc) {
+		newHeight += 0 + st.thumbSize + 0;
 	} else {
 		newHeight += st::boxTitleFont->height;
 	}
@@ -854,7 +888,8 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 			p.drawPixmap(_thumbx, st::boxPhotoPadding.top() + offset, _thumb);
 		}
 		if (_animated && !_streamed) {
-			QRect inner(_thumbx + (_thumbw - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (th - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+			const auto &st = st::msgFileLayout;
+			QRect inner(_thumbx + (_thumbw - st.thumbSize) / 2, st::boxPhotoPadding.top() + (th - st.thumbSize) / 2, st.thumbSize, st.thumbSize);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgDateImgBg);
 
@@ -867,43 +902,35 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 			icon->paintInCenter(p, inner);
 		}
 	} else if (_doc) {
+		const auto &st = _thumbw ? st::msgFileThumbLayout : st::msgFileLayout;
 		const auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-		const auto h = _thumbw ? (0 + st::msgFileThumbSize + 0) : (0 + st::msgFileSize + 0);
-		auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0;
-		if (_thumbw) {
-			nameleft = 0 + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-			nametop = st::msgFileThumbNameTop - st::msgFileThumbPadding.top();
-			nameright = 0;
-			statustop = st::msgFileThumbStatusTop - st::msgFileThumbPadding.top();
-		} else {
-			nameleft = 0 + st::msgFileSize + st::msgFilePadding.right();
-			nametop = st::msgFileNameTop - st::msgFilePadding.top();
-			nameright = 0;
-			statustop = st::msgFileStatusTop - st::msgFilePadding.top();
-		}
+		const auto h = 0 + st.thumbSize + 0;
+		const auto nameleft = 0 + st.thumbSize + st.padding.right();
+		const auto nametop = st.nameTop - st.padding.top();
+		const auto nameright = 0;
+		const auto statustop = st.statusTop - st.padding.top();
 		const auto editButton = _isAllowedEditMedia
 			? _editMedia->width() + st::editMediaButtonSkip
 			: 0;
 		const auto namewidth = w - nameleft - editButton;
 		const auto x = (width() - w) / 2, y = st::boxPhotoPadding.top();
 
-//		App::roundRect(p, x, y, w, h, st::msgInBg, MessageInCorners, &st::msgInShadow);
+//		Ui::FillRoundCorner(p, x, y, w, h, st::msgInBg, Ui::MessageInCorners, &st::msgInShadow);
 
+		const auto rthumb = style::rtlrect(x + 0, y + 0, st.thumbSize, st.thumbSize, width());
 		if (_thumbw) {
-			QRect rthumb(style::rtlrect(x + 0, y + 0, st::msgFileThumbSize, st::msgFileThumbSize, width()));
 			p.drawPixmap(rthumb.topLeft(), _thumb);
 		} else {
-			const QRect inner(style::rtlrect(x + 0, y + 0, st::msgFileSize, st::msgFileSize, width()));
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgFileInBg);
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(inner);
+				p.drawEllipse(rthumb);
 			}
 
 			const auto icon = &(_isAudio ? st::historyFileInPlay : _isImage ? st::historyFileInImage : st::historyFileInDocument);
-			icon->paintInCenter(p, inner);
+			icon->paintInCenter(p, rthumb);
 		}
 		p.setFont(st::semiboldFont);
 		p.setPen(st::historyFileNameInFg);
@@ -1030,7 +1057,7 @@ void EditCaptionBox::setName(QString nameString, qint64 size) {
 		st::semiboldTextStyle,
 		nameString,
 		Ui::NameTextOptions());
-	_status = formatSizeText(size);
+	_status = Ui::FormatSizeText(size);
 }
 
 void EditCaptionBox::keyPressEvent(QKeyEvent *e) {

Telegram/SourceFiles/boxes/edit_caption_box.h

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #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;
 
@@ -32,6 +33,7 @@ class InputField;
 class EmojiButton;
 class IconButton;
 class Checkbox;
+enum class AlbumType;
 } // namespace Ui
 
 namespace Window {
@@ -92,6 +94,7 @@ private:
 	int errorTopSkip() const;
 
 	void createEditMediaButton();
+	bool setPreparedList(Ui::PreparedList &&list);
 
 	inline QString getNewMediaPath() {
 		return _preparedList.files.empty()
@@ -130,15 +133,15 @@ private:
 	int _gifh = 0;
 	int _gifx = 0;
 
-	Storage::PreparedList _preparedList;
+	Ui::PreparedList _preparedList;
 
 	mtpRequestId _saveRequestId = 0;
 
 	object_ptr<Ui::IconButton> _editMedia = nullptr;
 	Ui::SlideWrap<Ui::RpWidget> *_wayWrap = nullptr;
 	QString _newMediaPath;
+	Ui::AlbumType _albumType = Ui::AlbumType();
 	bool _isAllowedEditMedia = false;
-	bool _isAlbum = false;
 	bool _asFile = false;
 	rpl::event_stream<> _editMediaClicks;
 

Telegram/SourceFiles/boxes/edit_privacy_box.cpp

@@ -86,7 +86,7 @@ void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
 }
 
 std::unique_ptr<PrivacyExceptionsBoxController::Row> PrivacyExceptionsBoxController::createRow(not_null<History*> history) {
-	if (history->peer->isSelf()) {
+	if (history->peer->isSelf() || history->peer->isRepliesChat()) {
 		return nullptr;
 	} else if (!history->peer->isUser()
 		&& !history->peer->isChat()

Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp

@@ -241,19 +241,31 @@ void FilterChatsPreview::paintEvent(QPaintEvent *e) {
 	}
 	for (auto &[history, userpic, button] : _removePeer) {
 		const auto savedMessages = history->peer->isSelf();
-		if (savedMessages) {
-			Ui::EmptyUserpic::PaintSavedMessages(
-				p,
-				iconLeft,
-				top + iconTop,
-				width(),
-				st.photoSize);
+		const auto repliesMessages = history->peer->isRepliesChat();
+		if (savedMessages || repliesMessages) {
+			if (savedMessages) {
+				Ui::EmptyUserpic::PaintSavedMessages(
+					p,
+					iconLeft,
+					top + iconTop,
+					width(),
+					st.photoSize);
+			} else {
+				Ui::EmptyUserpic::PaintRepliesMessages(
+					p,
+					iconLeft,
+					top + iconTop,
+					width(),
+					st.photoSize);
+			}
 			p.setPen(st::contactsNameFg);
 			p.drawTextLeft(
 				nameLeft,
 				top + nameTop,
 				width(),
-				tr::lng_saved_messages(tr::now));
+				(savedMessages
+					? tr::lng_saved_messages(tr::now)
+					: tr::lng_replies_messages(tr::now)));
 		} else {
 			history->peer->paintUserpicLeft(
 				p,

Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp

@@ -170,6 +170,8 @@ ExceptionRow::ExceptionRow(not_null<History*> history) : Row(history) {
 QString ExceptionRow::generateName() {
 	return peer()->isSelf()
 		? tr::lng_saved_messages(tr::now)
+		: peer()->isRepliesChat()
+		? tr::lng_replies_messages(tr::now)
 		: Row::generateName();
 }
 
@@ -180,10 +182,13 @@ QString ExceptionRow::generateShortName() {
 PaintRoundImageCallback ExceptionRow::generatePaintUserpicCallback() {
 	const auto peer = this->peer();
 	const auto saved = peer->isSelf();
+	const auto replies = peer->isRepliesChat();
 	auto userpic = saved ? nullptr : ensureUserpicView();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (saved) {
 			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
+		} else if (replies) {
+			Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, outerWidth, size);
 		} else {
 			peer->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 		}

Telegram/SourceFiles/boxes/language_box.cpp

@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/toast/toast.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "storage/localstorage.h"
 #include "boxes/confirm_box.h"
 #include "mainwidget.h"
@@ -105,7 +105,7 @@ private:
 			return (index == other.index);
 		}
 	};
-	using Selection = base::optional_variant<RowSelection, MenuSelection>;
+	using Selection = std::variant<v::null_t, RowSelection, MenuSelection>;
 
 	void updateSelected(Selection selected);
 	void updatePressed(Selection pressed);
@@ -196,7 +196,7 @@ std::pair<Languages, Languages> PrepareLists() {
 	const auto projId = [](const Language &language) {
 		return language.id;
 	};
-	const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
+	const auto current = Lang::LanguageIdOrDefault(Lang::Id());
 	auto official = Lang::CurrentCloudManager().languageList();
 	auto recent = Local::readRecentLanguages();
 	ranges::stable_partition(recent, [&](const Language &language) {
@@ -207,13 +207,13 @@ std::pair<Languages, Languages> PrepareLists() {
 			const auto generate = [&] {
 				const auto name = (current == "#custom")
 					? "Custom lang pack"
-					: Lang::Current().name();
+					: Lang::GetInstance().name();
 				return Language{
 					current,
 					QString(),
 					QString(),
 					name,
-					Lang::Current().nativeName()
+					Lang::GetInstance().nativeName()
 				};
 			};
 			const auto i = ranges::find(official, current, projId);
@@ -327,7 +327,7 @@ void Rows::mouseMoveEvent(QMouseEvent *e) {
 
 void Rows::mousePressEvent(QMouseEvent *e) {
 	updatePressed(_selected);
-	if (_pressed.has_value()
+	if (!v::is_null(_pressed)
 		&& !rowBySelection(_pressed).menuToggleForceRippled) {
 		addRipple(_pressed, e->pos());
 	}
@@ -348,11 +348,11 @@ QRect Rows::menuToggleArea(not_null<const Row*> row) const {
 }
 
 void Rows::addRipple(Selection selected, QPoint position) {
-	Expects(selected.has_value());
+	Expects(!v::is_null(selected));
 
 	ensureRippleBySelection(selected);
 
-	const auto menu = selected.is<MenuSelection>();
+	const auto menu = v::is<MenuSelection>(selected);
 	const auto &row = rowBySelection(selected);
 	const auto menuArea = menuToggleArea(&row);
 	auto &ripple = rippleBySelection(&row, selected);
@@ -369,7 +369,7 @@ void Rows::ensureRippleBySelection(not_null<Row*> row, Selection selected) {
 	if (ripple) {
 		return;
 	}
-	const auto menu = selected.is<MenuSelection>();
+	const auto menu = v::is<MenuSelection>(selected);
 	const auto menuArea = menuToggleArea(row);
 	auto mask = menu
 		? Ui::RippleAnimation::ellipseMask(menuArea.size())
@@ -391,11 +391,11 @@ void Rows::mouseReleaseEvent(QMouseEvent *e) {
 	const auto pressed = _pressed;
 	updatePressed({});
 	if (pressed == _selected) {
-		pressed.match([&](RowSelection data) {
+		v::match(pressed, [&](RowSelection data) {
 			activateByIndex(data.index);
 		}, [&](MenuSelection data) {
 			showMenu(data.index);
-		}, [](std::nullopt_t) {});
+		}, [](v::null_t) {});
 	}
 }
 
@@ -597,11 +597,11 @@ int Rows::count() const {
 }
 
 int Rows::indexFromSelection(Selection selected) const {
-	return selected.match([&](RowSelection data) {
+	return v::match(selected, [&](RowSelection data) {
 		return data.index;
 	}, [&](MenuSelection data) {
 		return data.index;
-	}, [](std::nullopt_t) {
+	}, [](v::null_t) {
 		return -1;
 	});
 }
@@ -648,7 +648,7 @@ rpl::producer<bool> Rows::isEmpty() const {
 }
 
 void Rows::repaint(Selection selected) {
-	selected.match([](std::nullopt_t) {
+	v::match(selected, [](v::null_t) {
 	}, [&](const auto &data) {
 		repaint(data.index);
 	});
@@ -672,17 +672,17 @@ void Rows::repaintChecked(not_null<const Row*> row) {
 }
 
 void Rows::updateSelected(Selection selected) {
-	const auto changed = (_selected.has_value() != selected.has_value());
+	const auto changed = (v::is_null(_selected) != v::is_null(selected));
 	repaint(_selected);
 	_selected = selected;
 	repaint(_selected);
 	if (changed) {
-		_hasSelection.fire(_selected.has_value());
+		_hasSelection.fire(!v::is_null(_selected));
 	}
 }
 
 void Rows::updatePressed(Selection pressed) {
-	if (_pressed.has_value()) {
+	if (!v::is_null(_pressed)) {
 		if (!rowBySelection(_pressed).menuToggleForceRippled) {
 			if (const auto ripple = rippleBySelection(_pressed).get()) {
 				ripple->lastStop();
@@ -725,7 +725,7 @@ const std::unique_ptr<Ui::RippleAnimation> &Rows::rippleBySelection(
 std::unique_ptr<Ui::RippleAnimation> &Rows::rippleBySelection(
 		not_null<Row*> row,
 		Selection selected) {
-	return selected.is<MenuSelection>()
+	return v::is<MenuSelection>(selected)
 		? row->menuToggleRipple
 		: row->ripple;
 }
@@ -796,7 +796,7 @@ void Rows::paintEvent(QPaintEvent *e) {
 	const auto menu = menuToggleArea();
 	const auto selectedIndex = (_menuShownIndex >= 0)
 		? _menuShownIndex
-		: indexFromSelection(_pressed.has_value() ? _pressed : _selected);
+		: indexFromSelection(!v::is_null(_pressed) ? _pressed : _selected);
 	for (auto i = 0, till = count(); i != till; ++i) {
 		const auto &row = rowByIndex(i);
 		if (row.top + row.height <= clip.y()) {
@@ -867,7 +867,7 @@ void Content::setupContent(
 		const Languages &official) {
 	using namespace rpl::mappers;
 
-	const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
+	const auto current = Lang::LanguageIdOrDefault(Lang::Id());
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	const auto add = [&](const Languages &list, bool areOfficial) {
 		if (list.empty()) {
@@ -1101,7 +1101,7 @@ void LanguageBox::prepare() {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
 		const auto currentId = [] {
-			return Lang::LanguageIdOrDefault(Lang::Current().id());
+			return Lang::LanguageIdOrDefault(Lang::Id());
 		};
 		if (language.id != currentId()) {
 			Lang::CurrentCloudManager().switchToLanguage(language);

Telegram/SourceFiles/boxes/local_storage_box.cpp

@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/effects/radial_animation.h"
+#include "ui/text/format_values.h"
 #include "ui/emoji_config.h"
 #include "storage/storage_account.h"
 #include "storage/cache/storage_cache_database.h"
@@ -21,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
-#include "layout.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
@@ -260,7 +260,7 @@ QString LocalStorageBox::Row::titleText(const Database::TaggedSummary &data) con
 
 QString LocalStorageBox::Row::sizeText(const Database::TaggedSummary &data) const {
 	return data.totalSize
-		? formatSizeText(data.totalSize)
+		? Ui::FormatSizeText(data.totalSize)
 		: tr::lng_local_storage_empty(tr::now);
 }
 

Telegram/SourceFiles/boxes/passcode_box.cpp

@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "core/application.h"
 #include "storage/storage_domain.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
@@ -24,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/fade_wrap.h"
 #include "passport/passport_encryption.h"
 #include "passport/passport_panel_edit_contact.h"
+#include "settings/settings_privacy_security.h"
 #include "facades.h"
 #include "styles/style_layers.h"
 #include "styles/style_passport.h"
@@ -31,6 +34,68 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
+enum class PasswordErrorType {
+	None,
+	NoPassword,
+	Later,
+};
+
+void SetCloudPassword(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	session->api().passwordState(
+	) | rpl::start_with_next([=] {
+		using namespace Settings;
+		const auto weak = Ui::MakeWeak(box);
+		if (CheckEditCloudPassword(session)) {
+			box->getDelegate()->show(
+				EditCloudPasswordBox(session));
+		} else {
+			box->getDelegate()->show(CloudPasswordAppOutdatedBox());
+		}
+		if (weak) {
+			weak->closeBox();
+		}
+	}, box->lifetime());
+}
+
+void TransferPasswordError(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		TextWithEntities &&about,
+		PasswordErrorType error) {
+	box->setTitle(tr::lng_rights_transfer_check());
+	box->setWidth(st::transferCheckWidth);
+
+	auto text = std::move(about).append('\n').append('\n').append(
+		tr::lng_rights_transfer_check_password(
+			tr::now,
+			Ui::Text::RichLangValue)
+	).append('\n').append('\n').append(
+		tr::lng_rights_transfer_check_session(
+			tr::now,
+			Ui::Text::RichLangValue)
+	);
+	if (error == PasswordErrorType::Later) {
+		text.append('\n').append('\n').append(
+			tr::lng_rights_transfer_check_later(
+				tr::now,
+				Ui::Text::RichLangValue));
+	}
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		rpl::single(text),
+		st::boxLabel));
+	if (error == PasswordErrorType::Later) {
+		box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+	} else {
+		box->addButton(tr::lng_rights_transfer_set_password(), [=] {
+			SetCloudPassword(box, session);
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}
+}
+
 } // namespace
 
 PasscodeBox::CloudFields PasscodeBox::CloudFields::From(
@@ -537,14 +602,11 @@ void PasscodeBox::submitOnlyCheckCloudPassword(const QString &oldPassword) {
 	if (_cloudFields.turningOff && _cloudFields.notEmptyPassport) {
 		Assert(!_cloudFields.customCheckCallback);
 
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-		const auto confirmed = [=] {
+		const auto confirmed = [=](Fn<void()> &&close) {
 			send();
-			if (*box) {
-				(*box)->closeBox();
-			}
+			close();
 		};
-		*box = getDelegate()->show(Box<ConfirmBox>(
+		getDelegate()->show(Box<ConfirmBox>(
 			tr::lng_cloud_password_passport_losing(tr::now),
 			tr::lng_continue(tr::now),
 			confirmed));
@@ -744,20 +806,16 @@ void PasscodeBox::changeCloudPassword(
 }
 
 void PasscodeBox::suggestSecretReset(const QString &newPassword) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto resetSecretAndSave = [=] {
-		checkPasswordHash([=](const Core::CloudPasswordResult &check) {
-			resetSecret(check, newPassword, [=] {
-				if (*box) {
-					(*box)->closeBox();
-				}
-			});
+	auto resetSecretAndSave = [=](Fn<void()> &&close) {
+		checkPasswordHash([=, close = std::move(close)](
+				const Core::CloudPasswordResult &check) {
+			resetSecret(check, newPassword, std::move(close));
 		});
 	};
-	*box = getDelegate()->show(Box<ConfirmBox>(
+	getDelegate()->show(Box<ConfirmBox>(
 		Lang::Hard::PassportCorruptedChange(),
 		Lang::Hard::PassportCorruptedReset(),
-		[=] { resetSecretAndSave(); }));
+		std::move(resetSecretAndSave)));
 }
 
 void PasscodeBox::resetSecret(
@@ -1002,14 +1060,11 @@ void RecoverBox::submit() {
 		}).handleFloodErrors().send();
 	});
 	if (_notEmptyPassport) {
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-		const auto confirmed = [=] {
+		const auto confirmed = [=](Fn<void()> &&close) {
 			send();
-			if (*box) {
-				(*box)->closeBox();
-			}
+			close();
 		};
-		*box = getDelegate()->show(Box<ConfirmBox>(
+		getDelegate()->show(Box<ConfirmBox>(
 			tr::lng_cloud_password_passport_losing(tr::now),
 			tr::lng_continue(tr::now),
 			confirmed));
@@ -1139,3 +1194,28 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
 	*weak = box.data();
 	return { std::move(box), reloads->events(), cancels->events() };
 }
+
+[[nodiscard]] object_ptr<Ui::GenericBox> PrePasswordErrorBox(
+		const RPCError &error,
+		not_null<Main::Session*> session,
+		TextWithEntities &&about) {
+	const auto type = [&] {
+		const auto &type = error.type();
+		if (type == qstr("PASSWORD_MISSING")) {
+			return PasswordErrorType::NoPassword;
+		} else if (type.startsWith(qstr("PASSWORD_TOO_FRESH_"))
+			|| type.startsWith(qstr("SESSION_TOO_FRESH_"))) {
+			return PasswordErrorType::Later;
+		}
+		return PasswordErrorType::None;
+	}();
+	if (type == PasswordErrorType::None) {
+		return nullptr;
+	}
+
+	return Box(
+		TransferPasswordError,
+		session,
+		std::move(about),
+		type);
+}

Telegram/SourceFiles/boxes/passcode_box.h

@@ -214,3 +214,8 @@ struct RecoveryEmailValidation {
 [[nodiscard]] RecoveryEmailValidation ConfirmRecoveryEmail(
 	not_null<Main::Session*> session,
 	const QString &pattern);
+
+[[nodiscard]] object_ptr<Ui::GenericBox> PrePasswordErrorBox(
+	const RPCError &error,
+	not_null<Main::Session*> session,
+	TextWithEntities &&about);

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/empty_userpic.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "lang/lang_keys.h"
 #include "storage/file_download.h"
 #include "data/data_peer_values.h"
@@ -36,10 +36,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 PaintRoundImageCallback PaintUserpicCallback(
 		not_null<PeerData*> peer,
 		bool respectSavedMessagesChat) {
-	if (respectSavedMessagesChat && peer->isSelf()) {
-		return [](Painter &p, int x, int y, int outerWidth, int size) {
-			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
-		};
+	if (respectSavedMessagesChat) {
+		if (peer->isSelf()) {
+			return [](Painter &p, int x, int y, int outerWidth, int size) {
+				Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
+			};
+		} else if (peer->isRepliesChat()) {
+			return [](Painter &p, int x, int y, int outerWidth, int size) {
+				Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, outerWidth, size);
+			};
+		}
 	}
 	auto userpic = std::shared_ptr<Data::CloudImageView>();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
@@ -318,6 +324,8 @@ void PeerListBox::addSelectItem(
 	const auto respect = _controller->respectSavedMessagesChat();
 	const auto text = (respect && peer->isSelf())
 		? tr::lng_saved_short(tr::now)
+		: (respect && peer->isRepliesChat())
+		? tr::lng_replies_messages(tr::now)
 		: peer->shortName();
 	addSelectItem(
 		peer->id,
@@ -400,14 +408,16 @@ PeerListRow::PeerListRow(not_null<PeerData*> peer, PeerListRowId id)
 , _peer(peer)
 , _initialized(false)
 , _isSearchResult(false)
-, _isSavedMessagesChat(false) {
+, _isSavedMessagesChat(false)
+, _isRepliesMessagesChat(false) {
 }
 
 PeerListRow::PeerListRow(PeerListRowId id)
 : _id(id)
 , _initialized(false)
 , _isSearchResult(false)
-, _isSavedMessagesChat(false) {
+, _isSavedMessagesChat(false)
+, _isRepliesMessagesChat(false) {
 }
 
 PeerListRow::~PeerListRow() = default;
@@ -470,6 +480,8 @@ void PeerListRow::refreshName(const style::PeerListItem &st) {
 	}
 	const auto text = _isSavedMessagesChat
 		? tr::lng_saved_messages(tr::now)
+		: _isRepliesMessagesChat
+		? tr::lng_replies_messages(tr::now)
 		: generateName();
 	_name.setText(st.nameStyle, text, Ui::NameTextOptions());
 }
@@ -481,6 +493,8 @@ QString PeerListRow::generateName() {
 QString PeerListRow::generateShortName() {
 	return _isSavedMessagesChat
 		? tr::lng_saved_short(tr::now)
+		: _isRepliesMessagesChat
+		? tr::lng_replies_messages(tr::now)
 		: peer()->shortName();
 }
 
@@ -493,11 +507,14 @@ std::shared_ptr<Data::CloudImageView> PeerListRow::ensureUserpicView() {
 
 PaintRoundImageCallback PeerListRow::generatePaintUserpicCallback() {
 	const auto saved = _isSavedMessagesChat;
+	const auto replies = _isRepliesMessagesChat;
 	const auto peer = this->peer();
 	auto userpic = saved ? nullptr : ensureUserpicView();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (saved) {
 			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
+		} else if (replies) {
+			Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, outerWidth, size);
 		} else {
 			peer->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 		}
@@ -603,6 +620,8 @@ void PeerListRow::paintDisabledCheckUserpic(
 
 	if (_isSavedMessagesChat) {
 		Ui::EmptyUserpic::PaintSavedMessages(p, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
+	} else if (_isRepliesMessagesChat) {
+		Ui::EmptyUserpic::PaintRepliesMessages(p, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
 	} else {
 		peer()->paintUserpicLeft(p, _userpic, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
 	}
@@ -731,10 +750,12 @@ void PeerListContent::changeCheckState(
 }
 
 void PeerListContent::addRowEntry(not_null<PeerListRow*> row) {
-	if (_controller->respectSavedMessagesChat()
-		&& !row->special()
-		&& row->peer()->isSelf()) {
-		row->setIsSavedMessagesChat(true);
+	if (_controller->respectSavedMessagesChat() && !row->special()) {
+		if (row->peer()->isSelf()) {
+			row->setIsSavedMessagesChat(true);
+		} else if (row->peer()->isRepliesChat()) {
+			row->setIsRepliesMessagesChat(true);
+		}
 	}
 	_rowsById.emplace(row->id(), row);
 	if (!row->special()) {

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -146,12 +146,12 @@ public:
 	void setIsSearchResult(bool isSearchResult) {
 		_isSearchResult = isSearchResult;
 	}
-	bool isSavedMessagesChat() const {
-		return _isSavedMessagesChat;
-	}
 	void setIsSavedMessagesChat(bool isSavedMessagesChat) {
 		_isSavedMessagesChat = isSavedMessagesChat;
 	}
+	void setIsRepliesMessagesChat(bool isRepliesMessagesChat) {
+		_isRepliesMessagesChat = isRepliesMessagesChat;
+	}
 
 	template <typename UpdateCallback>
 	void setChecked(
@@ -234,6 +234,7 @@ private:
 	bool _initialized : 1;
 	bool _isSearchResult : 1;
 	bool _isSavedMessagesChat : 1;
+	bool _isRepliesMessagesChat : 1;
 
 };
 

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_histories.h"
 #include "apiwrap.h"
 #include "mainwidget.h"
+#include "mainwindow.h"
 #include "lang/lang_keys.h"
 #include "history/history.h"
 #include "dialogs/dialogs_main_list.h"
@@ -104,6 +105,20 @@ void AddBotToGroup(not_null<UserData*> bot, not_null<PeerData*> chat) {
 //	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
 //}
 
+object_ptr<Ui::BoxContent> PrepareContactsBox(
+		not_null<Window::SessionController*> sessionController) {
+	const auto controller = sessionController;
+	auto delegate = [=](not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+		box->addLeftButton(
+			tr::lng_profile_add_contact(),
+			[=] { controller->widget()->onShowAddContact(); });
+	};
+	return Box<PeerListBox>(
+		std::make_unique<ContactsBoxController>(controller),
+		std::move(delegate));
+}
+
 void PeerListRowWithLink::setActionLink(const QString &action) {
 	_action = action;
 	refreshActionLink();
@@ -584,8 +599,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 auto ChooseRecipientBoxController::createRow(
 		not_null<History*> history) -> std::unique_ptr<Row> {
 	const auto peer = history->peer;
-	const auto skip = peer->isChannel()
-		&& !peer->isMegagroup()
-		&& !peer->canWrite();
+	const auto skip = (peer->isBroadcast() && !peer->canWrite())
+		|| peer->isRepliesChat();
 	return skip ? nullptr : std::make_unique<Row>(history);
 }

Telegram/SourceFiles/boxes/peer_list_controllers.h

@@ -31,9 +31,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class History;
 
 namespace Window {
+class SessionController;
 class SessionNavigation;
 } // namespace Window
 
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareContactsBox(
+	not_null<Window::SessionController*> sessionController);
+
 class PeerListRowWithLink : public PeerListRow {
 public:
 	using PeerListRow::PeerListRow;
@@ -203,8 +207,7 @@ public:
 
 protected:
 	void prepareViewHook() override;
-	std::unique_ptr<Row> createRow(
-		not_null<History*> history) override;
+	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
 	const not_null<Window::SessionNavigation*> _navigation;

Telegram/SourceFiles/boxes/peers/add_participants_box.cpp

@@ -576,11 +576,7 @@ void AddSpecialBoxController::showAdmin(
 	}
 
 	// Finally show the admin.
-	const auto currentRights = _additional.isCreator(user)
-		? MTPChatAdminRights(MTP_chatAdminRights(
-			MTP_flags(~MTPDchatAdminRights::Flag::f_add_admins
-				| MTPDchatAdminRights::Flag::f_add_admins)))
-		: adminRights
+	const auto currentRights = adminRights
 		? *adminRights
 		: MTPChatAdminRights(MTP_chatAdminRights(MTP_flags(0)));
 	auto box = Box<EditAdminBox>(
@@ -618,6 +614,7 @@ void AddSpecialBoxController::editAdminDone(
 		_additional.applyParticipant(MTP_channelParticipantCreator(
 			MTP_flags(rank.isEmpty() ? Flag(0) : Flag::f_rank),
 			MTP_int(user->bareId()),
+			rights,
 			MTP_string(rank)));
 	} else if (rights.c_chatAdminRights().vflags().v == 0) {
 		_additional.applyParticipant(MTP_channelParticipant(
@@ -665,7 +662,7 @@ void AddSpecialBoxController::showRestricted(
 	} else if (_additional.adminRights(user).has_value()
 		|| _additional.isCreator(user)) {
 		// The user is an admin or creator.
-		if (_additional.canEditAdmin(user)) {
+		if (!_additional.isCreator(user) && _additional.canEditAdmin(user)) {
 			if (!sure) {
 				_editBox = Ui::show(
 					Box<ConfirmBox>(
@@ -755,7 +752,7 @@ void AddSpecialBoxController::kickUser(
 	if (_additional.adminRights(user).has_value()
 		|| _additional.isCreator(user)) {
 		// The user is an admin or creator.
-		if (_additional.canEditAdmin(user)) {
+		if (!_additional.isCreator(user) && _additional.canEditAdmin(user)) {
 			if (!sure) {
 				_editBox = Ui::show(
 					Box<ConfirmBox>(

Telegram/SourceFiles/boxes/peers/add_participants_box.h

@@ -86,6 +86,9 @@ public:
 		AdminDoneCallback adminDoneCallback,
 		BannedDoneCallback bannedDoneCallback);
 
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
 	[[nodiscard]] Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;

Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp

@@ -146,15 +146,12 @@ void Controller::choose(not_null<ChannelData*> chat) {
 				Ui::Text::RichLangValue));
 		}
 	}
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto sure = [=] {
-		if (*box) {
-			(*box)->closeBox();
-		}
+	const auto sure = [=](Fn<void()> &&close) {
+		close();
 		const auto onstack = _callback;
 		onstack(chat);
 	};
-	*box = Ui::show(
+	Ui::show(
 		Box<ConfirmBox>(
 			text,
 			tr::lng_manage_discussion_group_link(tr::now),
@@ -178,18 +175,15 @@ void Controller::choose(not_null<ChatData*> chat) {
 	text.append(tr::lng_manage_discussion_group_warning(
 		tr::now,
 		Ui::Text::RichLangValue));
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto sure = [=] {
-		if (*box) {
-			(*box)->closeBox();
-		}
+	const auto sure = [=](Fn<void()> &&close) {
+		close();
 		const auto done = [=](not_null<ChannelData*> chat) {
 			const auto onstack = _callback;
 			onstack(chat);
 		};
 		chat->session().api().migrateChat(chat, crl::guard(this, done));
 	};
-	*box = Ui::show(
+	Ui::show(
 		Box<ConfirmBox>(
 			text,
 			tr::lng_manage_discussion_group_link(tr::now),

Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp

@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/toast/toast.h"
 #include "ui/text/text_utilities.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/special_buttons.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "settings/settings_privacy_security.h"
@@ -47,70 +47,6 @@ constexpr auto kSecondsInDay = 24 * 60 * 60;
 constexpr auto kSecondsInWeek = 7 * kSecondsInDay;
 constexpr auto kAdminRoleLimit = 16;
 
-enum class PasswordErrorType {
-	None,
-	NoPassword,
-	Later,
-};
-
-void SetCloudPassword(not_null<Ui::GenericBox*> box, not_null<UserData*> user) {
-	user->session().api().passwordState(
-	) | rpl::start_with_next([=] {
-		using namespace Settings;
-		const auto weak = Ui::MakeWeak(box);
-		if (CheckEditCloudPassword(&user->session())) {
-			box->getDelegate()->show(
-				EditCloudPasswordBox(&user->session()));
-		} else {
-			box->getDelegate()->show(CloudPasswordAppOutdatedBox());
-		}
-		if (weak) {
-			weak->closeBox();
-		}
-	}, box->lifetime());
-}
-
-void TransferPasswordError(
-		not_null<Ui::GenericBox*> box,
-		not_null<UserData*> user,
-		PasswordErrorType error) {
-	box->setTitle(tr::lng_rights_transfer_check());
-	box->setWidth(st::transferCheckWidth);
-
-	auto text = tr::lng_rights_transfer_check_about(
-		tr::now,
-		lt_user,
-		Ui::Text::Bold(user->shortName()),
-		Ui::Text::WithEntities
-	).append('\n').append('\n').append(
-		tr::lng_rights_transfer_check_password(
-			tr::now,
-			Ui::Text::RichLangValue)
-	).append('\n').append('\n').append(
-		tr::lng_rights_transfer_check_session(
-			tr::now,
-			Ui::Text::RichLangValue)
-	);
-	if (error == PasswordErrorType::Later) {
-		text.append('\n').append('\n').append(
-			tr::lng_rights_transfer_check_later(
-				tr::now,
-				Ui::Text::RichLangValue));
-	}
-	box->addRow(object_ptr<Ui::FlatLabel>(
-		box,
-		rpl::single(text),
-		st::boxLabel));
-	if (error == PasswordErrorType::Later) {
-		box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
-	} else {
-		box->addButton(tr::lng_rights_transfer_set_password(), [=] {
-			SetCloudPassword(box, user);
-		});
-		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-	}
-}
-
 } // namespace
 
 class EditParticipantBox::Inner : public Ui::RpWidget {
@@ -318,7 +254,7 @@ void EditAdminBox::prepare() {
 
 	const auto disabledMessages = [&] {
 		auto result = std::map<Flags, QString>();
-		if (!canSave() || (amCreator() && user()->isSelf())) {
+		if (!canSave()) {
 			result.emplace(
 				~Flags(0),
 				tr::lng_rights_about_admin_cant_edit(tr::now));
@@ -327,7 +263,11 @@ void EditAdminBox::prepare() {
 				disabledByDefaults,
 				tr::lng_rights_permission_for_all(tr::now));
 			if (const auto channel = peer()->asChannel()) {
-				if (!channel->amCreator()) {
+				if (amCreator() && user()->isSelf()) {
+					result.emplace(
+						~Flag::f_anonymous,
+						tr::lng_rights_permission_cant_edit(tr::now));
+				} else if (!channel->amCreator()) {
 					result.emplace(
 						~channel->adminRights(),
 						tr::lng_rights_permission_cant_edit(tr::now));
@@ -368,7 +308,7 @@ void EditAdminBox::prepare() {
 	}, lifetime());
 
 	if (canTransferOwnership()) {
-		const auto allFlags = FullAdminRights(isGroup);
+		const auto allFlags = AdminRightsForOwnershipTransfer(isGroup);
 		setupTransferButton(
 			isGroup
 		)->toggleOn(rpl::duplicate(
@@ -520,22 +460,17 @@ void EditAdminBox::transferOwnership() {
 }
 
 bool EditAdminBox::handleTransferPasswordError(const RPCError &error) {
-	const auto type = [&] {
-		const auto &type = error.type();
-		if (type == qstr("PASSWORD_MISSING")) {
-			return PasswordErrorType::NoPassword;
-		} else if (type.startsWith(qstr("PASSWORD_TOO_FRESH_"))
-			|| type.startsWith(qstr("SESSION_TOO_FRESH_"))) {
-			return PasswordErrorType::Later;
-		}
-		return PasswordErrorType::None;
-	}();
-	if (type == PasswordErrorType::None) {
-		return false;
+	const auto session = &user()->session();
+	auto about = tr::lng_rights_transfer_check_about(
+		tr::now,
+		lt_user,
+		Ui::Text::Bold(user()->shortName()),
+		Ui::Text::WithEntities);
+	if (auto box = PrePasswordErrorBox(error, session, std::move(about))) {
+		getDelegate()->show(std::move(box));
+		return true;
 	}
-
-	getDelegate()->show(Box(TransferPasswordError, user(), type));
-	return true;
+	return false;
 }
 
 void EditAdminBox::transferOwnershipChecked() {
@@ -639,7 +574,9 @@ void EditAdminBox::sendTransferRequestFrom(
 
 void EditAdminBox::refreshAboutAddAdminsText(bool canAddAdmins) {
 	_aboutAddAdmins->setText([&] {
-		if (!canSave() || (amCreator() && user()->isSelf())) {
+		if (amCreator() && user()->isSelf()) {
+			return QString();
+		} else if (!canSave()) {
 			return tr::lng_rights_about_admin_cant_edit(tr::now);
 		} else if (canAddAdmins) {
 			return tr::lng_rights_about_add_admins_yes(tr::now);

Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp

@@ -557,6 +557,8 @@ UserData *ParticipantsAdditionalData::applyParticipant(
 			return logBad();
 		}
 		return applyBanned(data);
+	}, [&](const MTPDchannelParticipantLeft &data) {
+		return logBad();
 	});
 }
 
@@ -564,6 +566,12 @@ UserData *ParticipantsAdditionalData::applyCreator(
 		const MTPDchannelParticipantCreator &data) {
 	if (const auto user = applyRegular(data.vuser_id())) {
 		_creator = user;
+		_adminRights[user] = data.vadmin_rights();
+		if (user->isSelf()) {
+			_adminCanEdit.emplace(user);
+		} else {
+			_adminCanEdit.erase(user);
+		}
 		if (const auto rank = data.vrank()) {
 			_adminRanks[user] = qs(*rank);
 		} else {
@@ -1459,11 +1467,7 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 
 void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 	const auto adminRights = _additional.adminRights(user);
-	const auto currentRights = _additional.isCreator(user)
-		? MTPChatAdminRights(MTP_chatAdminRights(
-			MTP_flags(~MTPDchatAdminRights::Flag::f_add_admins
-				| MTPDchatAdminRights::Flag::f_add_admins)))
-		: adminRights
+	const auto currentRights = adminRights
 		? *adminRights
 		: MTPChatAdminRights(MTP_chatAdminRights(MTP_flags(0)));
 	auto box = Box<EditAdminBox>(
@@ -1504,6 +1508,7 @@ void ParticipantsBoxController::editAdminDone(
 		_additional.applyParticipant(MTP_channelParticipantCreator(
 			MTP_flags(rank.isEmpty() ? Flag(0) : Flag::f_rank),
 			MTP_int(user->bareId()),
+			rights,
 			MTP_string(rank)));
 	} else if (rights.c_chatAdminRights().vflags().v == 0) {
 		_additional.applyParticipant(MTP_channelParticipant(
@@ -1783,6 +1788,7 @@ std::unique_ptr<PeerListRow> ParticipantsBoxController::createRow(
 	auto row = std::make_unique<PeerListRowWithLink>(user);
 	refreshCustomStatus(row.get());
 	if (_role == Role::Admins
+		&& !_additional.isCreator(user)
 		&& _additional.adminRights(user).has_value()
 		&& _additional.canEditAdmin(user)) {
 		row->setActionLink(tr::lng_profile_kick(tr::now));

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp

@@ -135,6 +135,7 @@ std::vector<std::pair<ChatAdminRights, QString>> AdminRightLabels(
 				? 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_anonymous, tr::lng_rights_group_anonymous(tr::now) },
 			{ Flag::f_add_admins, tr::lng_rights_add_admins(tr::now) },
 		};
 	} else {
@@ -297,10 +298,12 @@ ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions) {
 	return restrictions;
 }
 
-ChatAdminRights FullAdminRights(bool isGroup) {
+ChatAdminRights AdminRightsForOwnershipTransfer(bool isGroup) {
 	auto result = ChatAdminRights();
 	for (const auto &[flag, label] : AdminRightLabels(isGroup, true)) {
-		result |= flag;
+		if (!(flag & ChatAdminRight::f_anonymous)) {
+			result |= flag;
+		}
 	}
 	return result;
 }

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h

@@ -71,4 +71,4 @@ EditFlagsControl<MTPDchatAdminRights::Flags> CreateEditAdminRights(
 
 ChatAdminRights DisabledByDefaultRestrictions(not_null<PeerData*> peer);
 ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions);
-ChatAdminRights FullAdminRights(bool isGroup);
+ChatAdminRights AdminRightsForOwnershipTransfer(bool isGroup);

Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp

@@ -546,17 +546,14 @@ void Controller::revokeInviteLink() {
 }
 
 void Controller::exportInviteLink(const QString &confirmation) {
-	const auto boxPointer = std::make_shared<QPointer<ConfirmBox>>();
-	const auto callback = crl::guard(this, [=] {
-		if (const auto strong = *boxPointer) {
-			strong->closeBox();
-		}
+	const auto callback = crl::guard(this, [=](Fn<void()> &&close) {
+		close();
 		_peer->session().api().exportInviteLink(_peer->migrateToOrMe());
 	});
 	auto box = Box<ConfirmBox>(
 		confirmation,
 		std::move(callback));
-	*boxPointer = Ui::show(std::move(box), Ui::LayerOption::KeepOther);
+	Ui::show(std::move(box), Ui::LayerOption::KeepOther);
 }
 
 bool Controller::canEditInviteLink() const {

Telegram/SourceFiles/boxes/report_box.cpp

@@ -9,8 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "lang/lang_keys.h"
 #include "data/data_peer.h"
+#include "data/data_session.h"
 #include "main/main_session.h"
 #include "boxes/confirm_box.h"
+#include "history/history_item.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
@@ -18,6 +20,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "core/core_settings.h"
 #include "core/application.h"
+#include "window/window_session_controller.h"
+#include "window/window_peer_menu.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
@@ -207,3 +211,18 @@ void ReportBox::updateMaxHeight() {
 	}
 	setDimensions(st::boxWidth, newHeight);
 }
+
+void BlockSenderFromRepliesBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		FullMsgId id) {
+	const auto item = controller->session().data().message(id);
+	Assert(item != nullptr);
+
+	PeerMenuBlockUserBox(
+		box,
+		&controller->window(),
+		item->senderOriginal(),
+		true,
+		Window::ClearReply{ id });
+}

Telegram/SourceFiles/boxes/report_box.h

@@ -8,8 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "ui/layers/generic_box.h"
 #include "mtproto/sender.h"
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Ui {
 template <typename Enum>
 class RadioenumGroup;
@@ -60,3 +65,8 @@ private:
 	mtpRequestId _requestId = 0;
 
 };
+
+void BlockSenderFromRepliesBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller,
+	FullMsgId id);