Version 3.5: Fix build with GCC.

- Use a new type of detailed stickers with smooth animations.
- Create new sets by sending .webm videos to @stickers.
- Bring your custom animated stickers from other apps.
- See smaller, compact animations when reacting to messages.
- See real-time animations in chat when a user reacts to your message.
- React with additional emoji expressing love,
appreciation, anger or surprise.
- Tap the new button in chats to jump to your messages
that have unseen reactions.
- Watch the animations for unseen reactions play
when you hit the button.
- The app will warn you before closing
if you are uploading photos or files to a chat.
- Enjoy better screencast quality in video chats.

.github/workflows/linux.yml

@@ -53,7 +53,7 @@ jobs:
 
     defaults:
       run:
-        shell: scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- bash --noprofile --norc -eo pipefail {0}
+        shell: scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}
 
     strategy:
       matrix:
@@ -88,9 +88,6 @@ jobs:
           DEFINE=""
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
-            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then
-              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
-            fi
             echo Define from matrix: $DEFINE
             echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
@@ -106,12 +103,11 @@ jobs:
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 
-          cd ../out/Debug
-          make -j$(nproc)
+          cmake --build ../out --config Debug --parallel
 
       - name: Check.
         run: |
-          filePath="$REPO_NAME/out/Debug/bin/Telegram"
+          filePath="$REPO_NAME/out/Debug/Telegram"
           if test -f "$filePath"; then
             echo "Build successfully done! :)"
 
@@ -125,7 +121,7 @@ jobs:
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
-          cd $REPO_NAME/out/Debug/bin
+          cd $REPO_NAME/out/Debug
           mkdir artifact
           mv Telegram artifact/
       - uses: actions/upload-artifact@master
@@ -133,4 +129,4 @@ jobs:
         name: Upload artifact.
         with:
           name: ${{ env.ARTIFACT_NAME }}
-          path: ${{ env.REPO_NAME }}/out/Debug/bin/artifact/
+          path: ${{ env.REPO_NAME }}/out/Debug/artifact/

.github/workflows/lock.yml

@@ -8,8 +8,8 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v3
         with:
           github-token: ${{ github.token }}
-          issue-lock-inactive-days: 45
-          pr-lock-inactive-days: 45
+          issue-inactive-days: 45
+          pr-inactive-days: 45

.github/workflows/mac.yml

@@ -89,7 +89,12 @@ jobs:
 
       - name: Libraries.
         run: |
-          ./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent skip-qt5 qt6
+          ./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent
+
+      - name: Free up some disk space.
+        run: |
+          cd Libraries
+          find . -iname "*.dir" -exec rm -rf {} || true \;
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
@@ -109,7 +114,6 @@ jobs:
           -D CMAKE_C_FLAGS="-Werror" \
           -D CMAKE_CXX_FLAGS="-Werror" \
           -D TDESKTOP_API_TEST=ON \
-          -D DESKTOP_APP_QT6=ON \
           -D DESKTOP_APP_USE_PACKAGED=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE

.github/workflows/no-response.yml

@@ -15,14 +15,5 @@ jobs:
       - uses: lee-dohm/no-response@v0.5.0
         with:
           token: ${{ github.token }}
-          # Number of days of inactivity before an Issue is closed for lack of response
-          daysUntilClose: 30
           # Label requiring a response
           responseRequiredLabel: waiting for answer
-          # Comment to post when closing an Issue for lack of response. Set to `false` to disable
-          closeComment: >
-            This issue has been automatically closed because there has been no response
-            to our request for more information from the original author. With only the
-            information that is currently in the issue, we don't have enough information
-            to take action. Please reach out if you have or find the answers we need so
-            that we can investigate further.

.github/workflows/win.yml

@@ -44,385 +44,84 @@ jobs:
 
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       matrix:
-        defines:
-          - ""
+        arch: [Win32, x64]
+
     env:
-      SDK: "10.0.18362.0"
-      GIT: "https://github.com"
-      QT_VER: "5.15.2"
-      OPENSSL_VER: "1_1_1"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
-      MANUAL_CACHING: "0"
       PREPARE_PATH: "Telegram/build/prepare/prepare.py"
-      AUTO_CACHING: "1"
 
     defaults:
       run:
         shell: cmd
-        working-directory: Libraries
+        working-directory: ${{ github.workspace }}
 
     steps:
+      - name: Prepare directories.
+        run: |
+          mkdir %userprofile%\TBuild\Libraries
+          echo TBUILD=%userprofile%\TBuild>>%GITHUB_ENV%
+
       - name: Get repository name.
         shell: bash
-        working-directory: ${{ github.workspace }}
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - uses: ilammy/msvc-dev-cmd@v1.9.0
-        name: x86 Native Tools Command Prompt.
+      - uses: ilammy/msvc-dev-cmd@v1.10.0
+        name: Native Tools Command Prompt.
         with:
-          arch: win32
-
-      - name: Set up environment paths.
-        shell: bash
-        working-directory: ${{ github.workspace }}
-        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
-
-          echo "QT=${QT_VER//./_}" >> $GITHUB_ENV
-
-      - name: Save msbuild version.
-        run: |
-          call vcvars32.bat
-          msbuild -version > CACHE_KEY.txt
+          arch: ${{ matrix.arch }}
 
       - name: Clone.
-        uses: actions/checkout@v2
+        uses: LebedevRI/checkout@issue197
         with:
           submodules: recursive
-          path: ${{ env.REPO_NAME }}
-
-      - name: Generate cache key.
-        shell: bash
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -o $LibrariesPath/tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
-          curl -o $LibrariesPath/tg_angle-version.json https://api.github.com/repos/desktop-app/tg_angle/git/refs/heads/master
-          echo $MANUAL_CACHING >> CACHE_KEY.txt
-          if [ "$AUTO_CACHING" == "1" ]; then
-            thisFile=$REPO_NAME/.github/workflows/win.yml
-            echo `md5sum $thisFile | awk '{ print $1 }'` >> CACHE_KEY.txt
-          fi
-          echo "CACHE_KEY=`md5sum CACHE_KEY.txt | awk '{ print $1 }'`" >> $GITHUB_ENV
+          path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
 
       - name: Choco installs.
         run: |
-          choco install --allow-empty-checksums --no-progress -y yasm
-          choco install --no-progress -y nasm jom ninja
-          python -m pip install pywin32
+          choco install --no-progress -y nasm strawberryperl yasm jom ninja
+          py -m pip install pywin32
+
+      - name: Install msys64.
+        run: |
+          mkdir %TBUILD%\ThirdParty
+          xcopy /E /I C:\msys64 %TBUILD%\ThirdParty\msys64
+
+      - name: Set up environment paths.
+        shell: bash
+        run: |
+          echo "C:\\Strawberry\\perl\\bin\\" >> $GITHUB_PATH
+          echo "C:\\Program Files\\NASM\\" >> $GITHUB_PATH
+          echo "C:\\ProgramData\\chocolatey\\lib\\ninja\\tools\\" >> $GITHUB_PATH
+
+          echo "Configurate git for cherry-picks."
+          git config --global user.email "you@example.com"
+          git config --global user.name "Sample"
 
       - name: NuGet sources.
         run: |
           nuget sources Disable -Name "Microsoft Visual Studio Offline Packages"
           nuget sources Add -Source https://api.nuget.org/v3/index.json & exit 0
 
-      - name: Patches.
-        shell: bash
-        working-directory: ${{ github.workspace }}
-        run: |
-          echo "Find necessary commit from doc."
-          checkoutCommit=$(grep -A 1 "cd patches" $REPO_NAME/$PREPARE_PATH | sed -n 2p)
-          cd $LibrariesPath
-          git clone $GIT/desktop-app/patches.git
-          cd patches
-          eval $checkoutCommit
-
-      - name: LZMA.
-        run: |
-          git clone %GIT%/telegramdesktop/lzma.git
-          cd lzma
-          cd C\Util\LzmaLib
-          msbuild -m LzmaLib.sln /property:Configuration=Debug
-
-      - name: OpenSSL cache.
-        id: cache-openssl
+      - name: Libraries cache.
+        id: cache-libs
         uses: actions/cache@v2
         with:
-          path: ${{ env.LibrariesPath }}/openssl
-          key: ${{ runner.OS }}-${{ env.CACHE_KEY }}-${{ env.OPENSSL_VER }}
-      - name: OpenSSL.
-        if: steps.cache-openssl.outputs.cache-hit != 'true'
-        run: |
-          git clone -b OpenSSL_%OPENSSL_VER%-stable %GIT%/openssl/openssl.git
-          cd openssl
-          perl Configure no-shared no-tests debug-VC-WIN32
-          nmake
-          mkdir out.dbg
-          move libcrypto.lib out.dbg
-          move libssl.lib out.dbg
-          move ossl_static.pdb out.dbg\ossl_static
-          nmake clean
-          move out.dbg\ossl_static out.dbg\ossl_static.pdb
-          perl Configure no-shared no-tests VC-WIN32
-          nmake
-          mkdir out
-          move libcrypto.lib out
-          move libssl.lib out
-          move ossl_static.pdb out
+          path: ${{ env.TBUILD }}/Libraries
+          key: ${{ runner.OS }}-libs
 
-          rmdir /S /Q test
-          rmdir /S /Q .git
-
-      - name: Zlib.
-        run: |
-          git clone %GIT%/telegramdesktop/zlib.git
-          cd zlib
-          git checkout tdesktop
-          cd contrib\vstudio\vc14
-          msbuild -m zlibstat.vcxproj /property:Configuration=Debug
-
-      - name: MozJPEG.
-        shell: cmd
-        run: |
-          git clone -b v4.0.3 %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
-        with:
-          path: ${{ env.LibrariesPath }}/openal-soft
-          key: ${{ runner.OS }}-openal-soft-${{ env.CACHE_KEY }}
-      - name: OpenAL Soft.
-        if: steps.cache-openal.outputs.cache-hit != 'true'
-        run: |
-          git clone -b openal-soft-1.21.0 --depth=1 %GIT%/kcat/openal-soft.git
-          cd openal-soft\build
-          cmake .. ^
-          -G "Visual Studio 16 2019" ^
-          -A Win32 ^
-          -D LIBTYPE:STRING=STATIC ^
-          -D FORCE_STATIC_VCRT=ON ^
-          -D ALSOFT_BACKEND_DSOUND=OFF
-
-          msbuild -m OpenAL.vcxproj /property:Configuration=Debug
-
-      - name: Breakpad cache.
-        id: cache-breakpad
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/breakpad
-          key: ${{ runner.OS }}-breakpad-${{ env.CACHE_KEY }}-${{ hashFiles('**/breakpad.diff') }}
-      - name: Breakpad.
+      - name: Libraries.
         env:
-          GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\'
-          GYP_MSVS_VERSION: 2019
-        if: steps.cache-breakpad.outputs.cache-hit != 'true'
+          GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\'
+          GYP_MSVS_VERSION: 2022
         run: |
-          git clone https://chromium.googlesource.com/external/gyp
-          cd gyp
-          SET PATH=%cd%;%PATH%
-          git checkout d6c5dd51dc
-          git apply ../patches/gyp.diff
-
-          cd %LibrariesPath%
-
-          git clone https://chromium.googlesource.com/breakpad/breakpad
-          cd breakpad
-          git checkout bc8fb886
-          git apply ../patches/breakpad.diff
-          cd src
-          git clone %GIT%/google/googletest testing
-          cd client\windows
-          call gyp --no-circular-check breakpad_client.gyp --format=ninja
-          cd ..\..
-          ninja -C out/Debug common crash_generation_client exception_handler
-          ninja -C out/Release common crash_generation_client exception_handler
-          cd tools\windows\dump_syms
-          call gyp dump_syms.gyp --format=ninja
-          cd ..\..\..
-          ninja -C out/Release dump_syms
-
-      - name: Opus cache.
-        id: cache-opus
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/opus
-          key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
-      - name: Opus.
-        if: steps.cache-opus.outputs.cache-hit != 'true'
-        run: |
-          git clone -b v1.3.1 %GIT%/xiph/opus.git
-          cd opus
-          git cherry-pick 927de8453c
-          cmake -B out . ^
-          -A Win32 ^
-          -DCMAKE_INSTALL_PREFIX=%LibrariesPath%/local/opus ^
-          -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-          -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-          cmake --build out --config Debug
-          cmake --build out --config Release
-          cmake --install out --config Release
-
-      - name: Rnnoise.
-        run: |
-          git clone %GIT%/desktop-app/rnnoise.git
-          mkdir rnnoise\out
-          cd rnnoise\out
-          cmake -A Win32 ..
-          cmake --build . --config Debug
-
-      - name: FFmpeg cache.
-        id: cache-ffmpeg
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/ffmpeg
-          key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}-2-${{ hashFiles('**/build_ffmpeg_win.sh') }}
-      - name: FFmpeg.
-        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
-        run: |
-          choco install --no-progress -y msys2
-
-          git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg
-          cd ffmpeg
-          git checkout release/4.4
-          set CHERE_INVOKING=enabled_from_arguments
-          set MSYS2_PATH_TYPE=inherit
-          call c:\tools\msys64\usr\bin\bash --login ../patches/build_ffmpeg_win.sh
-
-          rmdir /S /Q .git
-
-      - name: Angle cache.
-        id: cache-angle
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/tg_angle
-          key: ${{ runner.OS }}-angle-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_angle-version.json') }}
-      - name: Angle.
-        if: steps.cache-angle.outputs.cache-hit != 'true'
-        run: |
-          git clone --recursive %GIT%/desktop-app/tg_angle.git
-          mkdir tg_angle\out\Debug
-          cd tg_angle\out\Debug
-          cmake -G Ninja ^
-          -DCMAKE_BUILD_TYPE=Debug ^
-          -DTG_ANGLE_SPECIAL_TARGET=win64 ^
-          -DTG_ANGLE_ZLIB_INCLUDE_PATH=%cd%/../../../zlib ../..
-          ninja
-
-          :: Cleanup.
-          cd %LibrariesPath%\tg_angle
-          move out\Debug\tg_angle.lib tg_angle.lib
-          rmdir /S /Q out
-          mkdir out\Debug
-          move tg_angle.lib out\Debug\tg_angle.lib
-
-      - name: Qt 5.15.2 cache.
-        id: cache-qt
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }}
-      - name: Configure Qt 5.15.2.
-        if: steps.cache-qt.outputs.cache-hit != 'true'
-        run: |
-          git clone git://code.qt.io/qt/qt5.git qt_%QT%
-          cd qt_%QT%
-          perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
-          git checkout v%QT_VER%
-          git submodule update qtbase
-          git submodule update qtimageformats
-          git submodule update qtsvg
-          cd qtbase
-          for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
-          cd ..
-
-          SET SSL=%LibrariesPath%\openssl
-          SET SSL_LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
-
-          SET ANGLE=%LibrariesPath%\tg_angle
-          SET ANGLE_LIBS=d3d9.lib dxgi.lib dxguid.lib
-
-          SET ZLIB=%LibrariesPath%\zlib\contrib\vstudio\vc14\x86
-
-          configure ^
-          -prefix "%LibrariesPath%\Qt-%QT_VER%" ^
-          -debug ^
-          -force-debug-info ^
-          -opensource ^
-          -confirm-license ^
-          -static ^
-          -static-runtime ^
-          -opengl es2 -no-angle ^
-          -I "%ANGLE%\include" ^
-          -D "GL_APICALL=" ^
-          QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS%" ^
-          QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS%" ^
-          -egl ^
-          -D "EGLAPI=" ^
-          -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
-          QMAKE_LIBS_EGL_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
-          QMAKE_LIBS_EGL_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
-          -openssl-linked ^
-          -I "%SSL%\include" ^
-          OPENSSL_LIBS_DEBUG="%SSL%\out.dbg\libssl.lib %SSL%\out.dbg\%SSL_LIBS%" ^
-          OPENSSL_LIBS_RELEASE="%SSL%\out\libssl.lib %SSL%\out\%SSL_LIBS%" ^
-          -I "%LibrariesPath%\mozjpeg" ^
-          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
-          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
-          -mp ^
-          -nomake examples ^
-          -nomake tests ^
-          -platform win32-msvc
-
-      - name: Qt 5.15.2 build.
-        if: steps.cache-qt.outputs.cache-hit != 'true'
-        run: |
-          cd qt_%QT%
-
-          jom -j%NUMBER_OF_PROCESSORS%
-          jom -j%NUMBER_OF_PROCESSORS% install
-
-          cd ..
-          rmdir /S /Q qt_%QT%
-
-      - name: WebRTC cache.
-        id: cache-webrtc
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/tg_owt
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
-      - name: WebRTC.
-        if: steps.cache-webrtc.outputs.cache-hit != 'true'
-        run: |
-          git clone --recursive %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_BUILD_AUDIO_BACKENDS=OFF ^
-          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
-          -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl/include ^
-          -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
-          -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ^
-          ../..
-
-          ninja
-
-          :: 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
+          C:
+          cd %TBUILD%
+          %REPO_NAME%/Telegram/build/prepare/win.bat skip-release silent
 
       - name: Read defines.
         shell: bash
@@ -438,16 +137,21 @@ jobs:
           echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
 
       - name: Free up some disk space.
-        working-directory: ${{ github.workspace }}
-        run: del /S *.pdb
+        run: |
+          C:
+          cd %TBUILD%
+          del /S Libraries\*.pdb
+          del /S Libraries\*.pch
+          del /S Libraries\*.obj
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
-        working-directory: ${{ github.workspace }}
         run: |
-          cd %REPO_NAME%\Telegram
+          C:
+          cd %TBUILD%\%REPO_NAME%\Telegram
 
           call configure.bat ^
+          ${{ matrix.arch }} ^
           -D TDESKTOP_API_TEST=ON ^
           -D DESKTOP_APP_USE_PACKAGED=OFF ^
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^
@@ -455,20 +159,17 @@ jobs:
           %TDESKTOP_BUILD_DEFINE% ^
           -DCMAKE_SYSTEM_VERSION=%SDK%
 
-          call vcvars32.bat
           cd ..\out
-          msbuild -m Telegram.sln /nologo /p:Configuration=Debug,Platform=Win32
+          msbuild -m Telegram.sln /p:Configuration=Debug,Platform=${{ matrix.arch }},DebugSymbols=false,DebugType=none
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
-        working-directory: ${{ github.workspace }}
         run: |
-          cd %REPO_NAME%\out\Debug
           mkdir artifact
-          move Telegram.exe artifact/
+          move %TBUILD%\%REPO_NAME%\out\Debug\Telegram.exe artifact/
       - uses: actions/upload-artifact@master
         name: Upload artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
         with:
           name: ${{ env.ARTIFACT_NAME }}
-          path: ${{ env.REPO_NAME }}\out\Debug\artifact\
+          path: artifact\

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
 	url = https://github.com/Microsoft/GSL.git
-[submodule "Telegram/ThirdParty/Catch"]
-	path = Telegram/ThirdParty/Catch
-	url = https://github.com/philsquared/Catch
 [submodule "Telegram/ThirdParty/xxHash"]
 	path = Telegram/ThirdParty/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
@@ -31,9 +28,6 @@
 [submodule "Telegram/lib_ui"]
 	path = Telegram/lib_ui
 	url = https://github.com/desktop-app/lib_ui.git
-[submodule "Telegram/lib_rlottie"]
-	path = Telegram/lib_rlottie
-	url = https://github.com/desktop-app/lib_rlottie.git
 [submodule "Telegram/lib_lottie"]
 	path = Telegram/lib_lottie
 	url = https://github.com/desktop-app/lib_lottie.git
@@ -58,9 +52,6 @@
 [submodule "Telegram/lib_qr"]
 	path = Telegram/lib_qr
 	url = https://github.com/desktop-app/lib_qr.git
-[submodule "Telegram/ThirdParty/libdbusmenu-qt"]
-	path = Telegram/ThirdParty/libdbusmenu-qt
-	url = https://github.com/desktop-app/libdbusmenu-qt.git
 [submodule "Telegram/ThirdParty/hunspell"]
 	path = Telegram/ThirdParty/hunspell
 	url = https://github.com/hunspell/hunspell
@@ -94,3 +85,18 @@
 [submodule "Telegram/ThirdParty/jemalloc"]
 	path = Telegram/ThirdParty/jemalloc
 	url = https://github.com/jemalloc/jemalloc
+[submodule "Telegram/ThirdParty/kwayland"]
+	path = Telegram/ThirdParty/kwayland
+	url = https://github.com/KDE/kwayland.git
+[submodule "Telegram/ThirdParty/dispatch"]
+	path = Telegram/ThirdParty/dispatch
+	url = https://github.com/apple/swift-corelibs-libdispatch
+[submodule "Telegram/ThirdParty/extra-cmake-modules"]
+	path = Telegram/ThirdParty/extra-cmake-modules
+	url = https://github.com/KDE/extra-cmake-modules.git
+[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
+	path = Telegram/ThirdParty/plasma-wayland-protocols
+	url = https://github.com/KDE/plasma-wayland-protocols.git
+[submodule "Telegram/ThirdParty/wayland-protocols"]
+	path = Telegram/ThirdParty/wayland-protocols
+	url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git

LEGAL

@@ -1,7 +1,7 @@
 This file is part of Telegram Desktop,
 the official desktop application for the Telegram messaging service.
 
-Copyright (c) 2014-2021 The Telegram Desktop Authors.
+Copyright (c) 2014-2022 The Telegram Desktop Authors.
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

README.md

@@ -37,7 +37,7 @@ Version **1.8.15** was the last that supports older systems
 
 ## Third-party
 
-* Qt 5.15.2, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
+* Qt 6 ([LGPL](http://doc.qt.io/qt-6/lgpl.html)) and Qt 5.15.2 ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) slightly patched
 * 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/LICENSE))
 * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))

Telegram/CMakeLists.txt

@@ -112,6 +112,8 @@ PRIVATE
     api/api_chat_filters.h
     api/api_chat_invite.cpp
     api/api_chat_invite.h
+    api/api_chat_participants.cpp
+    api/api_chat_participants.h
     api/api_cloud_password.cpp
     api/api_cloud_password.h
     api/api_common.h
@@ -145,14 +147,16 @@ PRIVATE
     api/api_text_entities.h
     api/api_toggling_media.cpp
     api/api_toggling_media.h
+    api/api_unread_things.cpp
+    api/api_unread_things.h
     api/api_updates.cpp
     api/api_updates.h
     api/api_user_privacy.cpp
     api/api_user_privacy.h
     api/api_views.cpp
     api/api_views.h
-    api/api_who_read.cpp
-    api/api_who_read.h
+    api/api_who_reacted.cpp
+    api/api_who_reacted.h
     boxes/filters/edit_filter_box.cpp
     boxes/filters/edit_filter_box.h
     boxes/filters/edit_filter_chats_list.cpp
@@ -174,12 +178,20 @@ PRIVATE
     boxes/peers/edit_peer_invite_link.h
     boxes/peers/edit_peer_invite_links.cpp
     boxes/peers/edit_peer_invite_links.h
-    boxes/peers/edit_peer_type_box.cpp
-    boxes/peers/edit_peer_type_box.h
     boxes/peers/edit_peer_history_visibility_box.cpp
     boxes/peers/edit_peer_history_visibility_box.h
     boxes/peers/edit_peer_permissions_box.cpp
     boxes/peers/edit_peer_permissions_box.h
+    boxes/peers/edit_peer_reactions.cpp
+    boxes/peers/edit_peer_reactions.h
+    boxes/peers/edit_peer_requests_box.cpp
+    boxes/peers/edit_peer_requests_box.h
+    boxes/peers/edit_peer_type_box.cpp
+    boxes/peers/edit_peer_type_box.h
+    boxes/peers/peer_short_info_box.cpp
+    boxes/peers/peer_short_info_box.h
+    boxes/peers/prepare_short_info_box.cpp
+    boxes/peers/prepare_short_info_box.h
     boxes/about_box.cpp
     boxes/about_box.h
     boxes/about_sponsored_box.cpp
@@ -252,6 +264,8 @@ PRIVATE
     boxes/username_box.h
     calls/group/calls_choose_join_as.cpp
     calls/group/calls_choose_join_as.h
+    calls/group/calls_cover_item.cpp
+    calls/group/calls_cover_item.h
     calls/group/calls_group_call.cpp
     calls/group/calls_group_call.h
     calls/group/calls_group_common.cpp
@@ -392,6 +406,8 @@ PRIVATE
     data/data_chat.h
     data/data_chat_filters.cpp
     data/data_chat_filters.h
+    data/data_chat_participant_status.cpp
+    data/data_chat_participant_status.h
     data/data_changes.cpp
     data/data_changes.h
     data/data_channel.cpp
@@ -433,6 +449,8 @@ PRIVATE
     data/data_media_types.h
     data/data_messages.cpp
     data/data_messages.h
+    data/data_message_reactions.cpp
+    data/data_message_reactions.h
     data/data_msg_id.h
     data/data_notify_settings.cpp
     data/data_notify_settings.h
@@ -509,33 +527,16 @@ PRIVATE
     editor/controllers/controllers.h
     editor/controllers/stickers_panel_controller.cpp
     editor/controllers/stickers_panel_controller.h
-    editor/controllers/undo_controller.cpp
-    editor/controllers/undo_controller.h
-    editor/editor_crop.cpp
-    editor/editor_crop.h
     editor/editor_paint.cpp
     editor/editor_paint.h
     editor/photo_editor.cpp
     editor/photo_editor.h
-    editor/photo_editor_common.cpp
-    editor/photo_editor_common.h
     editor/photo_editor_content.cpp
     editor/photo_editor_content.h
     editor/photo_editor_controls.cpp
     editor/photo_editor_controls.h
-    editor/photo_editor_inner_common.h
     editor/photo_editor_layer_widget.cpp
     editor/photo_editor_layer_widget.h
-    editor/scene/scene.cpp
-    editor/scene/scene.h
-    editor/scene/scene_item_base.cpp
-    editor/scene/scene_item_base.h
-    editor/scene/scene_item_canvas.cpp
-    editor/scene/scene_item_canvas.h
-    editor/scene/scene_item_image.cpp
-    editor/scene/scene_item_image.h
-    editor/scene/scene_item_line.cpp
-    editor/scene/scene_item_line.h
     editor/scene/scene_item_sticker.cpp
     editor/scene/scene_item_sticker.h
     export/export_manager.cpp
@@ -607,6 +608,12 @@ PRIVATE
     history/view/media/history_view_theme_document.cpp
     history/view/media/history_view_web_page.h
     history/view/media/history_view_web_page.cpp
+    history/view/reactions/message_reactions_list.cpp
+    history/view/reactions/message_reactions_list.h
+    history/view/reactions/message_reactions_selector.cpp
+    history/view/reactions/message_reactions_selector.h
+    history/view/history_view_bottom_info.cpp
+    history/view/history_view_bottom_info.h
     history/view/history_view_contact_status.cpp
     history/view/history_view_contact_status.h
     history/view/history_view_context_menu.cpp
@@ -619,8 +626,9 @@ PRIVATE
     history/view/history_view_emoji_interactions.h
     history/view/history_view_empty_list_bubble.cpp
     history/view/history_view_empty_list_bubble.h
-    history/view/history_view_group_call_tracker.cpp
-    history/view/history_view_group_call_tracker.h
+    history/view/history_view_group_call_bar.cpp
+    history/view/history_view_group_call_bar.h
+    history/view/history_view_item_preview.h
     history/view/history_view_list_widget.cpp
     history/view/history_view_list_widget.h
     history/view/history_view_message.cpp
@@ -632,8 +640,16 @@ PRIVATE
     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_react_animation.cpp
+    history/view/history_view_react_animation.h
+    history/view/history_view_react_button.cpp
+    history/view/history_view_react_button.h
+    history/view/history_view_reactions.cpp
+    history/view/history_view_reactions.h
     history/view/history_view_replies_section.cpp
     history/view/history_view_replies_section.h
+    history/view/history_view_requests_bar.cpp
+    history/view/history_view_requests_bar.h
     history/view/history_view_schedule_box.cpp
     history/view/history_view_schedule_box.h
     history/view/history_view_scheduled_section.cpp
@@ -642,6 +658,8 @@ PRIVATE
     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_spoiler_click_handler.cpp
+    history/view/history_view_spoiler_click_handler.h
     history/view/history_view_top_bar_widget.cpp
     history/view/history_view_top_bar_widget.h
     history/view/history_view_view_button.cpp
@@ -670,6 +688,8 @@ PRIVATE
     history/history_message.h
     history/history_service.cpp
     history/history_service.h
+    history/history_unread_things.cpp
+    history/history_unread_things.h
     history/history_widget.cpp
     history/history_widget.h
     info/info_content_widget.cpp
@@ -775,6 +795,8 @@ PRIVATE
     main/main_session.h
     main/main_session_settings.cpp
     main/main_session_settings.h
+    main/session/send_as_peers.cpp
+    main/session/send_as_peers.h
     media/system_media_controls_manager.h
     media/system_media_controls_manager.cpp
     media/audio/media_audio.cpp
@@ -915,6 +937,8 @@ PRIVATE
     platform/linux/file_utilities_linux.h
     platform/linux/launcher_linux.cpp
     platform/linux/launcher_linux.h
+    platform/linux/integration_linux.cpp
+    platform/linux/integration_linux.h
     platform/linux/main_window_linux.cpp
     platform/linux/main_window_linux.h
     platform/linux/notifications_manager_linux_dummy.cpp
@@ -926,6 +950,8 @@ PRIVATE
     platform/mac/file_utilities_mac.h
     platform/mac/launcher_mac.mm
     platform/mac/launcher_mac.h
+    platform/mac/integration_mac.mm
+    platform/mac/integration_mac.h
     platform/mac/mac_iconv_helper.c
     platform/mac/main_window_mac.mm
     platform/mac/main_window_mac.h
@@ -960,6 +986,8 @@ PRIVATE
     platform/win/file_utilities_win.h
     platform/win/launcher_win.cpp
     platform/win/launcher_win.h
+    platform/win/integration_win.cpp
+    platform/win/integration_win.h
     platform/win/main_window_win.cpp
     platform/win/main_window_win.h
     platform/win/notifications_manager_win.cpp
@@ -970,13 +998,15 @@ PRIVATE
     platform/win/windows_app_user_model_id.h
     platform/win/windows_dlls.cpp
     platform/win/windows_dlls.h
-    platform/win/windows_event_filter.cpp
-    platform/win/windows_event_filter.h
+    platform/win/windows_autostart_task.cpp
+    platform/win/windows_autostart_task.h
     platform/win/windows_toast_activator.cpp
     platform/win/windows_toast_activator.h
     platform/platform_audio.h
     platform/platform_file_utilities.h
     platform/platform_launcher.h
+    platform/platform_integration.cpp
+    platform/platform_integration.h
     platform/platform_main_window.h
     platform/platform_notifications_manager.h
     platform/platform_specific.h
@@ -1001,6 +1031,8 @@ PRIVATE
     settings/settings_codes.h
     settings/settings_common.cpp
     settings/settings_common.h
+    settings/settings_experimental.cpp
+    settings/settings_experimental.h
     settings/settings_folders.cpp
     settings/settings_folders.h
     settings/settings_information.cpp
@@ -1071,6 +1103,8 @@ PRIVATE
     ui/chat/attach/attach_item_single_file_preview.h
     ui/chat/attach/attach_item_single_media_preview.cpp
     ui/chat/attach/attach_item_single_media_preview.h
+    ui/chat/choose_send_as.cpp
+    ui/chat/choose_send_as.h
     ui/chat/choose_theme_controller.cpp
     ui/chat/choose_theme_controller.h
     ui/effects/fireworks_animation.cpp
@@ -1165,8 +1199,6 @@ PRIVATE
     window/themes/window_themes_generate_name.h
     apiwrap.cpp
     apiwrap.h
-    app.cpp
-    app.h
     config.h
     facades.cpp
     facades.h
@@ -1182,6 +1214,13 @@ PRIVATE
     stdafx.h
 )
 
+if (NOT build_winstore)
+    remove_target_sources(Telegram ${src_loc}
+        platform/win/windows_start_task.cpp
+        platform/win/windows_start_task.h
+    )
+endif()
+
 if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     remove_target_sources(Telegram ${src_loc}
         platform/linux/linux_xdp_file_dialog.cpp
@@ -1271,13 +1310,16 @@ elseif (APPLE)
         source_group(TREE ${res_loc} PREFIX Resources FILES ${strings_path})
     endforeach()
 
+    add_custom_command(TARGET Telegram
+    PRE_LINK
+        COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
+        COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
+    )
     if (NOT build_macstore)
         add_custom_command(TARGET Telegram
         PRE_LINK
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
             COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
-            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
-            COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
         )
         if (NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
             if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
@@ -1296,8 +1338,6 @@ else()
     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
         target_link_libraries(Telegram
         PRIVATE
-            desktop-app::external_statusnotifieritem
-            desktop-app::external_dbusmenu_qt
             desktop-app::external_glibmm
             desktop-app::external_glib
         )
@@ -1332,6 +1372,8 @@ if (build_macstore)
         COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks
         COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
         COMMAND cp -a ${libs_loc}/breakpad/src/client/mac/build/Release/Breakpad.framework $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework
+        COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework/Resources/crash_report_sender.app
+        COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework/Resources/Inspector
     )
 else()
     set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
@@ -1351,7 +1393,6 @@ set_target_properties(Telegram PROPERTIES
     XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${bundle_identifier}
     XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${desktop_app_version_string}
     XCODE_ATTRIBUTE_PRODUCT_NAME ${output_name}
-    XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT $<$<NOT:$<CONFIG:Debug>>:dwarf-with-dsym>
     XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
     XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES
     XCODE_ATTRIBUTE_COMBINE_HIDPI_IMAGES YES
@@ -1376,12 +1417,13 @@ PRIVATE
     G_LOG_DOMAIN="Telegram"
 )
 
-if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")
+if (APPLE
+    OR "${CMAKE_GENERATOR}" STREQUAL "Ninja Multi-Config"
+    OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL ""
+    OR NOT "${output_name}" STREQUAL "Telegram")
     set(output_folder ${CMAKE_BINARY_DIR})
-elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
-    set(output_folder ${CMAKE_BINARY_DIR}/bin)
 else()
-    set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>)
+    set(output_folder ${CMAKE_BINARY_DIR}/bin)
 endif()
 
 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
@@ -1476,12 +1518,26 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
 
         set_target_properties(Packer PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
     endif()
+elseif (build_winstore)
+    add_executable(StartupTask WIN32)
+    init_non_host_target(StartupTask)
+
+    add_dependencies(Telegram StartupTask)
+
+    nice_target_sources(StartupTask ${src_loc}
+    PRIVATE
+        _other/startup_task_win.cpp
+    )
+
+    set_target_properties(StartupTask PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY ${output_folder}
+    )
 endif()
 
 if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
-    configure_file("../lib/xdg/telegramdesktop.appdata.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" @ONLY)
-    generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml")
+    configure_file("../lib/xdg/telegramdesktop.metainfo.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml" @ONLY)
+    generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
     install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")
@@ -1491,5 +1547,5 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "telegram.png")
     install(FILES "../lib/xdg/telegramdesktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" RENAME "${TDESKTOP_LAUNCHER_BASENAME}.desktop")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo" RENAME "${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo" RENAME "${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml")
 endif()

Telegram/Resources/export_html/css/style.css

@@ -531,3 +531,16 @@ div.toast_shown {
     background-image: url(../images/media_video@2x.png)
 }
 }
+
+.spoiler {
+    background: #e8e8e8;
+}
+.spoiler.hidden {
+    background: #a9a9a9;
+    cursor: pointer;
+    border-radius: 3px;
+}
+.spoiler.hidden span {
+    opacity: 0;
+    user-select: none;
+}

Telegram/Resources/export_html/js/script.js

@@ -52,6 +52,12 @@ function ShowMentionName() {
     return false;
 }
 
+function ShowSpoiler(target) {
+    if (target.classList.contains("hidden")) {
+        target.classList.toggle("hidden");
+    }
+}
+
 function AddClass(element, name) {
     var current = element.className;
     var expression = new RegExp('(^|\\s)' + name + '(\\s|$)', 'g');