Merge remote-tracking branch 'tdesktop/dev' into dev

.github/workflows/linux.yml

@@ -29,7 +29,7 @@ jobs:
       QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.5"
       OPENSSL_VER: "1_1_1"
       OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1"
-      CMAKE_VER: "3.16.3"
+      CMAKE_VER: "3.17.0"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "6"
@@ -40,11 +40,6 @@ jobs:
       - name: Get repository name.
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
-      - name: Clone.
-        uses: actions/checkout@v1
-        with:
-          submodules: recursive
-
       - name: Disable man for further package installs.
         run: |
           cfgFile="/etc/dpkg/dpkg.cfg.d/no_man"
@@ -57,17 +52,13 @@ jobs:
           p locale
           p doc
 
-      - name: First set up.
+      - name: Apt install.
         shell: bash
         run: |
-          cd ..
-          mv $REPO_NAME temp
-          mkdir $REPO_NAME
-          mv temp $REPO_NAME/$REPO_NAME
-          cd $REPO_NAME
-
           sudo apt-get update
           sudo apt-get install software-properties-common -y && \
+          sudo add-apt-repository ppa:git-core/ppa -y && \
+          sudo apt-get update && \
           sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev \
           libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
           autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
@@ -86,6 +77,15 @@ jobs:
           sudo update-alternatives --config gcc && \
           sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test -y
 
+      - name: Clone.
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          path: ${{ env.REPO_NAME }}
+
+      - name: First set up.
+        shell: bash
+        run: |
           gcc --version
 
           gcc --version > CACHE_KEY.txt
@@ -127,6 +127,7 @@ jobs:
           sudo mkdir /opt/cmake
           sudo sh $file --prefix=/opt/cmake --skip-license
           sudo ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+          rm $file
 
           cmake --version
 
@@ -500,11 +501,14 @@ jobs:
             echo Define from matrix: $DEFINE
           fi
 
-          ./configure.sh -D TDESKTOP_API_TEST=ON -D DESKTOP_APP_USE_PACKAGED=OFF $DEFINE
+          ./configure.sh \
+          -D CMAKE_CXX_FLAGS="-s" \
+          -D TDESKTOP_API_TEST=ON \
+          -D DESKTOP_APP_USE_PACKAGED=OFF \
+          $DEFINE
 
           cd ../out/Debug
           make -j$(nproc)
-          strip -s bin/Kotatogram
 
       - name: Check.
         if: env.ONLY_CACHE == 'false'

.github/workflows/mac.yml

@@ -42,18 +42,13 @@ jobs:
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
+          path: ${{ env.REPO_NAME }}
 
       - name: First set up.
         run: |
-          cd ..
-          mv $REPO_NAME temp
-          mkdir $REPO_NAME
-          mv temp $REPO_NAME/$REPO_NAME
-          cd $REPO_NAME
-
           brew install automake fdk-aac lame libass libtool libvorbis libvpx \
           ninja opus sdl shtool texi2html theora x264 xvid yasm pkg-config
 

.github/workflows/snap.yml

@@ -23,33 +23,40 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: First set up.
         run: |
+          # Workaround for Heroku
+          curl https://cli-assets.heroku.com/apt/release.key | sudo apt-key add -
+
           sudo apt-get update
           sudo apt-get install gcc-8 g++-8 -y
           sudo snap install --classic snapcraft
 
           # Workaround for snapcraft
-          # See https://forum.snapcraft.io/t/permissions-problem-using-snapcraft-in-azure-pipelines/13258
+          # See https://forum.snapcraft.io/t/13258
           sudo chown root:root /
 
+          md5() {
+            md5cache=$(md5sum $1.txt | cut -c -32)
+            echo ::set-env name=$1::$md5cache
+          }
+          keyFor() {
+            keyName="${1^^}_CACHE_KEY"
+            awk -v RS="" -v ORS="\n\n" '/^  '"$1"':/' snap/snapcraft.yaml > $keyName.txt
+            md5 $keyName
+          }
+
           snapcraft --version > CACHE_KEY.txt
           gcc-8 --version >> CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
-          md5cache=$(md5sum CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=CACHE_KEY::$md5cache
+          md5 CACHE_KEY
 
-          awk -v RS="" -v ORS="\n\n" '/^  cmake:/' snap/snapcraft.yaml > CMAKE_CACHE_KEY.txt
-          md5cache=$(md5sum CMAKE_CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=CMAKE_CACHE_KEY::$md5cache
-
-          awk -v RS="" -v ORS="\n\n" '/^  ffmpeg:/' snap/snapcraft.yaml > FFMPEG_CACHE_KEY.txt
-          md5cache=$(md5sum FFMPEG_CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=FFMPEG_CACHE_KEY::$md5cache
+          keyFor cmake
+          keyFor ffmpeg
 
       - name: CMake cache.
         id: cache-cmake

.github/workflows/win.yml

@@ -38,19 +38,14 @@ jobs:
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
+          path: ${{ env.REPO_NAME }}
 
       - name: Set up environment variables.
         shell: cmd
         run: |
-          cd ..
-          move %REPO_NAME% temp
-          mkdir %REPO_NAME%
-          move temp %REPO_NAME%/%REPO_NAME%
-          cd %REPO_NAME%
-
           echo ::add-path::C:\Strawberry\perl\bin\
           echo ::add-path::"%programfiles%\NASM"
 
@@ -350,6 +345,7 @@ jobs:
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
+        shell: cmd
         run: |
           cd %REPO_NAME%\out\Debug
           mkdir artifact

Telegram/CMakeLists.txt

@@ -38,6 +38,7 @@ include(cmake/lib_tgvoip.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
@@ -49,7 +50,7 @@ set(style_files
     passport/passport.style
     profile/profile.style
     settings/settings.style
-    chat_helpers/chat_helpers.style
+    ui/filter_icons.style
     window/window.style
 )
 
@@ -134,6 +135,8 @@ nice_target_sources(Telegram ${src_loc}
 PRIVATE
     ${style_files}
 
+    api/api_chat_filters.cpp
+    api/api_chat_filters.h
     api/api_common.h
     api/api_hash.h
     api/api_self_destruct.cpp
@@ -146,6 +149,10 @@ PRIVATE
     api/api_single_message_search.h
     api/api_text_entities.cpp
     api/api_text_entities.h
+    boxes/filters/edit_filter_box.cpp
+    boxes/filters/edit_filter_box.h
+    boxes/filters/edit_filter_chats_list.cpp
+    boxes/filters/edit_filter_chats_list.h
     boxes/peers/add_participants_box.cpp
     boxes/peers/add_participants_box.h
     boxes/peers/edit_contact_box.cpp
@@ -274,6 +281,8 @@ PRIVATE
     chat_helpers/stickers.h
     chat_helpers/stickers_emoji_pack.cpp
     chat_helpers/stickers_emoji_pack.h
+    chat_helpers/stickers_dice_pack.cpp
+    chat_helpers/stickers_dice_pack.h
     chat_helpers/stickers_list_widget.cpp
     chat_helpers/stickers_list_widget.h
     chat_helpers/tabbed_panel.cpp
@@ -326,6 +335,8 @@ PRIVATE
     data/data_auto_download.h
     data/data_chat.cpp
     data/data_chat.h
+    data/data_chat_filters.cpp
+    data/data_chat_filters.h
     data/data_channel.cpp
     data/data_channel.h
     data/data_channel_admins.cpp
@@ -440,6 +451,8 @@ PRIVATE
     history/view/media/history_view_call.cpp
     history/view/media/history_view_contact.h
     history/view/media/history_view_contact.cpp
+    history/view/media/history_view_dice.h
+    history/view/media/history_view_dice.cpp
     history/view/media/history_view_document.h
     history/view/media/history_view_document.cpp
     history/view/media/history_view_file.h
@@ -833,6 +846,8 @@ PRIVATE
     settings/settings_codes.h
     settings/settings_common.cpp
     settings/settings_common.h
+    settings/settings_folders.cpp
+    settings/settings_folders.h
     settings/settings_information.cpp
     settings/settings_information.h
     settings/settings_intro.cpp
@@ -915,6 +930,10 @@ PRIVATE
     ui/countryinput.h
     ui/empty_userpic.cpp
     ui/empty_userpic.h
+    ui/filter_icons.cpp
+    ui/filter_icons.h
+    ui/filter_icon_panel.cpp
+    ui/filter_icon_panel.h
     ui/grouped_layout.cpp
     ui/grouped_layout.h
     ui/resize_area.h
@@ -943,6 +962,8 @@ PRIVATE
     window/window_connecting_widget.h
     window/window_controller.cpp
     window/window_controller.h
+    window/window_filters_menu.cpp
+    window/window_filters_menu.h
     window/window_history_hider.cpp
     window/window_history_hider.h
     window/window_lock_widgets.cpp