Merge branch 'dev' into teamgram2

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -34,17 +34,17 @@ body:
  label: Operating system
  description: >
  Your operating system name, version and desktop environment.
- Please don't use kernel version (uname), it's useless.
+ **Don't use kernel version (uname), it's useless.**
  validations:
  required: true
  - type: input
  attributes:
  label: Version of Telegram Desktop
  description: >
  Please note we don't support versions from Linux distro repositories.
- If you need support for these versions, please contact your distro maintainer
+ If you need support for these versions, **please contact your distro maintainer**
  or your distro bugtracker.
- Don't use 'latest', specify actual version, that's a reason to close your issue.
+ **Don't use 'latest'**, specify actual version, **that's a reason to close your issue**.
  validations:
  required: true
  - type: dropdown
@@ -60,8 +60,19 @@ body:
  - Other (unofficial) source
  validations:
  required: true
+ - type: input
+ attributes:
+ label: Crash ID
+ description: >
+ If you're reporting a crash, please enter the crash ID from the crash reporter
+ opening on the next launch after crash. **You have to enable beta versions
+ installation in Settings -> Advanced for the reporter to appear.**
+ You don't have to wait for a beta version to arrive.
  - type: textarea
  attributes:
  label: Logs
+ description: >
+ You can find log.txt using the `viewlogs`
+ [cheat code](https://github.com/telegramdesktop/tdesktop/wiki/Cheat-Codes).
  placeholder: Insert log.txt here (if necessary)
  render: shell

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -2,7 +2,6 @@
 name: Feature request
 description: Suggest an idea.
 labels: [enhancement]
-title: "[Feature Request] "
 body:
  - type: textarea
  attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+ - name: API issue
+ url: https://bugs.telegram.org
+ about: Any bug report or feature request affecting more than only Telegram Desktop.
+ - name: Issue of other client
+ url: https://bugs.telegram.org
+ about: Any bug report or feature request not about Telegram Desktop.
+ - name: Question
+ url: https://t.me/TelegramDesktopTalk
+ about: Ask a question.

.github/workflows/docker.yml

@@ -20,7 +20,7 @@ jobs:
 
  steps:
  - name: Clone.
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.1.0
  with:
  submodules: recursive
 
@@ -31,7 +31,7 @@ jobs:
  run: |
  cd Telegram/build/docker/centos_env
  poetry install
- DEBUG= poetry run gen_dockerfile | docker buildx build -t $IMAGE_TAG -
+ DEBUG= LTO= poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t $IMAGE_TAG -
 
  - name: Push the Docker image.
  if: ${{ github.ref_name == github.event.repository.default_branch }}

.github/workflows/linux.yml

@@ -51,7 +51,7 @@ jobs:
 
  defaults:
  run:
- shell: scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}
+ shell: scl enable rh-python38 -- scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}
 
  strategy:
  matrix:
@@ -69,7 +69,7 @@ jobs:
  run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
  - name: Clone.
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.1.0
  with:
  submodules: recursive
  path: ${{ env.REPO_NAME }}
@@ -93,6 +93,8 @@ jobs:
  fi
 
  ./configure.sh \
+ -D CMAKE_C_FLAGS_DEBUG="" \
+ -D CMAKE_CXX_FLAGS_DEBUG="" \
  -D CMAKE_C_FLAGS="-Werror" \
  -D CMAKE_CXX_FLAGS="-Werror" \
  -D CMAKE_EXE_LINKER_FLAGS="-s" \

.github/workflows/mac.yml

@@ -56,15 +56,15 @@ jobs:
  run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
  - name: Clone.
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.1.0
  with:
  submodules: recursive
  path: ${{ env.REPO_NAME }}
 
  - name: First set up.
  run: |
  sudo chown -R `whoami`:admin /usr/local/share
- brew install automake
+ brew install automake ninja pkg-config
 
  # Disable spotlight.
  sudo mdutil -a -i off
@@ -73,15 +73,15 @@ jobs:
 
  - name: ThirdParty cache.
  id: cache-third-party
- uses: actions/cache@v2
+ uses: actions/cache@v3.0.11
  with:
  path: ThirdParty
  key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
  restore-keys: ${{ runner.OS }}-third-party-
 
  - name: Libraries cache.
  id: cache-libs
- uses: actions/cache@v2
+ uses: actions/cache@v3.0.11
  with:
  path: Libraries
  key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -113,6 +113,7 @@ jobs:
  ./configure.sh \
  -D CMAKE_C_FLAGS="-Werror" \
  -D CMAKE_CXX_FLAGS="-Werror" \
+ -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO \
  -D TDESKTOP_API_TEST=ON \
  -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
  $DEFINE

.github/workflows/master_updater.yml

@@ -11,7 +11,7 @@ jobs:
  SKIP: "0"
  to_branch: "master"
  steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v3.1.0
  if: env.SKIP == '0'
  - name: Push the code to the master branch.
  if: env.SKIP == '0'

.github/workflows/snap.yml

@@ -47,13 +47,14 @@ jobs:
 
  steps:
  - name: Clone.
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.1.0
  with:
  fetch-depth: 0
  submodules: recursive
 
  - name: First set up.
  run: |
+ sudo iptables -P FORWARD ACCEPT
  sudo snap install --classic snapcraft
  sudo usermod -aG lxd $USER
  sudo snap run lxd init --auto

.github/workflows/win.yml

@@ -60,28 +60,28 @@ jobs:
  steps:
  - name: Prepare directories.
  run: |
+ mkdir %userprofile%\TBuild
+ mklink /d %GITHUB_WORKSPACE%\TBuild %userprofile%\TBuild
+ echo TBUILD=%GITHUB_WORKSPACE%\TBuild>>%GITHUB_ENV%
+
  mkdir %userprofile%\TBuild Libraries
  mklink /d %userprofile%\TBuild\Libraries %GITHUB_WORKSPACE%\Libraries
- echo TBUILD=%userprofile%\TBuild>>%GITHUB_ENV%
 
  - name: Get repository name.
  shell: bash
  run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
- - uses: ilammy/msvc-dev-cmd@v1.10.0
+ - uses: ilammy/msvc-dev-cmd@v1.12.0
  name: Native Tools Command Prompt.
  with:
  arch: ${{ matrix.arch }}
 
  - name: Clone.
- uses: LebedevRI/checkout@issue197
+ uses: actions/checkout@v3.1.0
  with:
  submodules: recursive
  path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
 
- - name: Python installs.
- run: pip3 install --upgrade pywin32 six
-
  - name: Set up environment paths.
  shell: bash
  run: |
@@ -98,7 +98,7 @@ jobs:
 
  - name: Libraries cache.
  id: cache-libs
- uses: actions/cache@v2
+ uses: actions/cache@v3.0.11
  with:
  path: Libraries
  key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
@@ -116,13 +116,20 @@ jobs:
  DEFINE=""
  if [ -n "${{ matrix.defines }}" ]; then
  DEFINE="-D ${{ matrix.defines }}=ON"
- echo Define from matrix: $DEFINE
+ echo "Define from matrix: $DEFINE"
  echo "ARTIFACT_NAME=Telegram_${{ matrix.arch }}_${{ matrix.defines }}" >> $GITHUB_ENV
  else
  echo "ARTIFACT_NAME=Telegram_${{ matrix.arch }}" >> $GITHUB_ENV
  fi
  echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
 
+ API="-D TDESKTOP_API_TEST=ON"
+ if [ ${{ github.ref == 'refs/heads/nightly' }} ]; then
+ echo "Use the open credentials."
+ API="-D TDESKTOP_API_ID=611335 -D TDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
+ fi
+ echo "TDESKTOP_BUILD_API=$API" >> $GITHUB_ENV
+
  - name: Free up some disk space.
  run: |
  del /S Libraries\*.pdb
@@ -132,12 +139,11 @@ jobs:
  - name: Telegram Desktop build.
  if: env.ONLY_CACHE == 'false'
  run: |
- C:
  cd %TBUILD%\%REPO_NAME%\Telegram
 
  call configure.bat ^
  ${{ matrix.arch }} ^
- -D TDESKTOP_API_TEST=ON ^
+ %TDESKTOP_BUILD_API% ^
  -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^
  -D DESKTOP_APP_NO_PDB=ON ^
  %TDESKTOP_BUILD_DEFINE% ^
@@ -147,13 +153,13 @@ jobs:
  msbuild -m Telegram.sln /p:Configuration=Debug,Platform=${{ matrix.arch }},DebugSymbols=false,DebugType=none
 
  - name: Move artifact.
- if: env.UPLOAD_ARTIFACT == 'true'
+ if: (env.UPLOAD_ARTIFACT == 'true') || ${{ github.ref == 'refs/heads/nightly' }}
  run: |
  mkdir artifact
  move %TBUILD%\%REPO_NAME%\out\Debug\Telegram.exe artifact/
  - uses: actions/upload-artifact@master
  name: Upload artifact.
- if: env.UPLOAD_ARTIFACT == 'true'
+ if: (env.UPLOAD_ARTIFACT == 'true') || ${{ github.ref == 'refs/heads/nightly' }}
  with:
  name: ${{ env.ARTIFACT_NAME }}
  path: artifact\

.gitmodules

@@ -97,3 +97,6 @@
 [submodule "Telegram/ThirdParty/kcoreaddons"]
  path = Telegram/ThirdParty/kcoreaddons
  url = https://github.com/KDE/kcoreaddons.git
+[submodule "Telegram/ThirdParty/cld3"]
+ path = Telegram/ThirdParty/cld3
+ url = https://github.com/google/cld3.git

CMakeLists.txt

@@ -36,6 +36,10 @@ get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
 get_filename_component(submodules_loc "Telegram" REALPATH)
 get_filename_component(cmake_helpers_loc "cmake" REALPATH)
 
+if (NOT DESKTOP_APP_USE_PACKAGED AND WIN32)
+ set(Python_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/python/Scripts/python)
+endif()
+
 include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
 include(cmake/target_compile_options_if_exists.cmake)
@@ -52,11 +56,9 @@ include(cmake/options.cmake)
 
 if (NOT DESKTOP_APP_USE_PACKAGED)
  if (WIN32)
- set(qt_version 5.15.4)
+ set(qt_version 5.15.8)
  elseif (APPLE)
- set(qt_version 6.3.1)
- else()
- set(qt_version 6.4.0)
+ set(qt_version 6.3.2)
  endif()
 endif()
 include(cmake/external/qt/package.cmake)

LEGAL

@@ -1,7 +1,7 @@
 This file is part of Telegram Desktop,
 the official desktop application for the Telegram messaging service.
 
-Copyright (c) 2014-2022 The Telegram Desktop Authors.
+Copyright (c) 2014-2023 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