diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..afc525a07 --- /dev/null +++ b/.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 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 000000000..dc456da5c --- /dev/null +++ b/.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 diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml index db58d86bd..44782fa45 100644 --- a/.github/workflows/issue_closer.yml +++ b/.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 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2877e804a..b9cc4e0bd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -78,7 +78,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: | @@ -136,11 +136,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: | @@ -164,6 +164,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 @@ -189,7 +205,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) @@ -446,7 +462,6 @@ jobs: -confirm-license \ -qt-zlib \ -qt-libpng \ - -qt-libjpeg \ -qt-harfbuzz \ -qt-pcre \ -qt-xcb \ @@ -538,7 +553,7 @@ jobs: cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ -DTG_OWT_SPECIAL_TARGET=linux \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \ + -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 \ @@ -563,9 +578,9 @@ jobs: if [ -n "${{ matrix.defines }}" ]; then DEFINE="-D ${{ matrix.defines }}=ON" echo Define from matrix: $DEFINE - echo ::set-env name=ARTIFACT_NAME::Kotatogram_${{ matrix.defines }} + echo "ARTIFACT_NAME=Kotatogram_${{ matrix.defines }}" >> $GITHUB_ENV else - echo ::set-env name=ARTIFACT_NAME::Kotatogram + echo "ARTIFACT_NAME=Kotatogram" >> $GITHUB_ENV fi ./configure.sh \ diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index f1afd2e4f..b74ae209c 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -76,7 +76,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 @@ -101,13 +101,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: | @@ -139,6 +139,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 @@ -176,17 +190,14 @@ jobs: with: path: ${{ env.LibrariesPath }}/opus-cache key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }} - - name: Opus clone. - run: | - cd $LibrariesPath - - git clone -b v1.3 --depth=1 $GIT/xiph/opus - - name: Opus build. + - name: Opus. if: steps.cache-opus.outputs.cache-hit != 'true' run: | cd $LibrariesPath + git clone $GIT/xiph/opus cd opus + git checkout v1.3 ./autogen.sh CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --prefix=$PREFIX make -j$(nproc) @@ -453,7 +464,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 @@ -477,7 +491,7 @@ jobs: cd tg_owt/out/Debug cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \ -DTG_OWT_SPECIAL_TARGET=mac \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \ + -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 \ @@ -500,9 +514,9 @@ jobs: if [ -n "${{ matrix.defines }}" ]; then DEFINE="-D ${{ matrix.defines }}=ON" echo Define from matrix: $DEFINE - echo ::set-env name=ARTIFACT_NAME::Kotatogram_${{ matrix.defines }} + echo "ARTIFACT_NAME=Kotatogram_${{ matrix.defines }}" >> $GITHUB_ENV else - echo ::set-env name=ARTIFACT_NAME::Kotatogram + echo "ARTIFACT_NAME=Kotatogram" >> $GITHUB_ENV fi ./configure.sh \ diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index 20f42540b..044ee2887 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -83,7 +83,7 @@ jobs: if: env.UPLOAD_ARTIFACT == 'true' run: | artifact_name=$(echo kotatogram-desktop_*.snap) - echo ::set-env name=ARTIFACT_NAME::$artifact_name + echo "ARTIFACT_NAME=$artifact_name" >> $GITHUB_ENV mkdir artifact mv $artifact_name artifact diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml new file mode 100644 index 000000000..eee5c8b2c --- /dev/null +++ b/.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, + }); diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 02f691592..519ed4194 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -75,10 +75,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 @@ -86,38 +107,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 @@ -130,21 +131,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% @@ -161,7 +159,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% @@ -187,7 +184,6 @@ jobs: rmdir /S /Q .git - name: Zlib. - shell: cmd run: | %VC% @@ -197,6 +193,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 @@ -204,7 +214,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% @@ -232,7 +241,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% @@ -269,7 +277,6 @@ jobs: key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }} - name: Opus. if: steps.cache-opus.outputs.cache-hit != 'true' - shell: cmd run: | %VC% @@ -288,7 +295,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 @@ -310,7 +316,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% @@ -342,10 +347,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% @@ -364,32 +371,16 @@ jobs: 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 - - 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\ - - :: WebRTC. - cd %LibrariesPath% - 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%/../../../qt_%QT%/qtbase/src/3rdparty/libjpeg ^ + -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 ^ @@ -404,9 +395,6 @@ jobs: mkdir out\Debug move tg_owt.lib out\Debug\tg_owt.lib - cd %LibrariesPath% - rmdir /S /Q qt_%QT% - - name: Read defines. shell: bash run: | @@ -414,16 +402,14 @@ jobs: if [ -n "${{ matrix.defines }}" ]; then DEFINE="-D ${{ matrix.defines }}=ON" echo Define from matrix: $DEFINE - echo ::set-env name=ARTIFACT_NAME::Kotatogram_${{ matrix.defines }} + echo "ARTIFACT_NAME=Kotatogram_${{ matrix.defines }}" >> $GITHUB_ENV else - echo ::set-env name=ARTIFACT_NAME::Kotatogram + echo "ARTIFACT_NAME=Kotatogram" >> $GITHUB_ENV fi - echo "::set-env name=TDESKTOP_BUILD_DEFINE::$DEFINE" + echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV - name: Kotatogram Desktop build. if: env.ONLY_CACHE == 'false' - shell: cmd - timeout-minutes: 120 run: | cd %REPO_NAME%\Telegram @@ -441,7 +427,6 @@ jobs: - name: Move artifact. if: env.UPLOAD_ARTIFACT == 'true' - shell: cmd run: | cd %REPO_NAME%\out\Debug mkdir artifact diff --git a/.gitmodules b/.gitmodules index a44efb082..dfcb38b0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,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 diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index efb6154be..67429e11f 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -21,9 +21,6 @@ add_subdirectory(lib_qr) add_subdirectory(lib_webrtc) add_subdirectory(codegen) -include(lib_ui/cmake/generate_styles.cmake) -include(cmake/generate_numbers.cmake) - get_filename_component(src_loc SourceFiles REALPATH) get_filename_component(res_loc Resources REALPATH) @@ -37,36 +34,6 @@ include(cmake/td_lang.cmake) include(cmake/td_scheme.cmake) include(cmake/td_ui.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 - ${src_loc}/ui/td_common.style -) - -generate_styles(Telegram ${src_loc} "${style_files}" "${dependent_style_files}") -generate_numbers(Telegram ${res_loc}/numbers.txt) - set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON) target_link_libraries(Telegram @@ -106,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 @@ -137,35 +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="Kotatogram") - if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION) find_package(PkgConfig REQUIRED) @@ -191,6 +124,8 @@ 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 @@ -394,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 @@ -573,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 @@ -594,6 +529,12 @@ 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 @@ -768,14 +709,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 @@ -1067,8 +1000,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 @@ -1076,8 +1009,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 @@ -1305,6 +1236,7 @@ target_compile_definitions(Telegram PRIVATE TDESKTOP_API_ID=${TDESKTOP_API_ID} TDESKTOP_API_HASH=${TDESKTOP_API_HASH} + G_LOG_DOMAIN="Kotatogram" ) if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Kotatogram") diff --git a/Telegram/Resources/art/bball_idle.tgs b/Telegram/Resources/art/bball_idle.tgs new file mode 100644 index 000000000..e82b62639 Binary files /dev/null and b/Telegram/Resources/art/bball_idle.tgs differ diff --git a/Telegram/Resources/art/fball_idle.tgs b/Telegram/Resources/art/fball_idle.tgs new file mode 100644 index 000000000..b1d71e43a Binary files /dev/null and b/Telegram/Resources/art/fball_idle.tgs differ diff --git a/Telegram/Resources/art/slot_0_idle.tgs b/Telegram/Resources/art/slot_0_idle.tgs new file mode 100644 index 000000000..1d8a0955f Binary files /dev/null and b/Telegram/Resources/art/slot_0_idle.tgs differ diff --git a/Telegram/Resources/art/slot_1_idle.tgs b/Telegram/Resources/art/slot_1_idle.tgs new file mode 100644 index 000000000..b6549225f Binary files /dev/null and b/Telegram/Resources/art/slot_1_idle.tgs differ diff --git a/Telegram/Resources/art/slot_2_idle.tgs b/Telegram/Resources/art/slot_2_idle.tgs new file mode 100644 index 000000000..c13193e81 Binary files /dev/null and b/Telegram/Resources/art/slot_2_idle.tgs differ diff --git a/Telegram/Resources/art/slot_back.tgs b/Telegram/Resources/art/slot_back.tgs new file mode 100644 index 000000000..5eaa214a3 Binary files /dev/null and b/Telegram/Resources/art/slot_back.tgs differ diff --git a/Telegram/Resources/art/slot_pull.tgs b/Telegram/Resources/art/slot_pull.tgs new file mode 100644 index 000000000..478b69067 Binary files /dev/null and b/Telegram/Resources/art/slot_pull.tgs differ diff --git a/Telegram/Resources/icons/history_pin.png b/Telegram/Resources/icons/history_pin.png new file mode 100644 index 000000000..55066f98b Binary files /dev/null and b/Telegram/Resources/icons/history_pin.png differ diff --git a/Telegram/Resources/icons/history_pin@2x.png b/Telegram/Resources/icons/history_pin@2x.png new file mode 100644 index 000000000..285b91659 Binary files /dev/null and b/Telegram/Resources/icons/history_pin@2x.png differ diff --git a/Telegram/Resources/icons/history_pin@3x.png b/Telegram/Resources/icons/history_pin@3x.png new file mode 100644 index 000000000..7ef2fce37 Binary files /dev/null and b/Telegram/Resources/icons/history_pin@3x.png differ diff --git a/Telegram/Resources/icons/pinned_show_all.png b/Telegram/Resources/icons/pinned_show_all.png new file mode 100644 index 000000000..af6e182ad Binary files /dev/null and b/Telegram/Resources/icons/pinned_show_all.png differ diff --git a/Telegram/Resources/icons/pinned_show_all@2x.png b/Telegram/Resources/icons/pinned_show_all@2x.png new file mode 100644 index 000000000..f00311c0c Binary files /dev/null and b/Telegram/Resources/icons/pinned_show_all@2x.png differ diff --git a/Telegram/Resources/icons/pinned_show_all@3x.png b/Telegram/Resources/icons/pinned_show_all@3x.png new file mode 100644 index 000000000..09e63eb9a Binary files /dev/null and b/Telegram/Resources/icons/pinned_show_all@3x.png differ diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 4fecc8f9b..3b04c89c7 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/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."; @@ -1103,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."; @@ -1524,9 +1543,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..."; @@ -2272,6 +2290,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"; diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc index 051bc815d..33f0dac0d 100644 --- a/Telegram/Resources/qrc/telegram/telegram.qrc +++ b/Telegram/Resources/qrc/telegram/telegram.qrc @@ -59,6 +59,13 @@ ../../art/sunrise.jpg ../../art/dice_idle.tgs ../../art/dart_idle.tgs + ../../art/bball_idle.tgs + ../../art/fball_idle.tgs + ../../art/slot_0_idle.tgs + ../../art/slot_1_idle.tgs + ../../art/slot_2_idle.tgs + ../../art/slot_back.tgs + ../../art/slot_pull.tgs ../../day-blue.tdesktop-theme ../../night.tdesktop-theme ../../night-green.tdesktop-theme diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl index ce2e3b0b7..06f21cc28 100644 --- a/Telegram/Resources/tl/api.tl +++ b/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 solution:flags.1?string solution_entities:flags.1?Vector = 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; @@ -141,7 +141,7 @@ 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#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 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 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 = 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 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 = 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; @@ -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 credentials:SecureCredentialsEncrypted = MessageAction; messageActionSecureValuesSent#d95c6154 types:Vector = 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; @@ -195,7 +196,7 @@ photoStrippedSize#e0b0bc2e type:string bytes:bytes = PhotoSize; photoSizeProgressive#5aa86a51 type:string location:FileLocation w:int h:int sizes:Vector = 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; @@ -247,8 +248,8 @@ messages.dialogsSlice#71e094f3 count:int dialogs:Vector messages:Vector< messages.dialogsNotModified#f0e3e596 count:int = messages.Dialogs; messages.messages#8c718e87 messages:Vector chats:Vector users:Vector = messages.Messages; -messages.messagesSlice#c8edce1e flags:# inexact:flags.1?true count:int next_rate:flags.0?int messages:Vector chats:Vector users:Vector = messages.Messages; -messages.channelMessages#99262e37 flags:# inexact:flags.1?true pts:int count:int messages:Vector chats:Vector users:Vector = 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 chats:Vector users:Vector = messages.Messages; +messages.channelMessages#64479808 flags:# inexact:flags.1?true pts:int count:int offset_id_offset:flags.2?int messages:Vector chats:Vector users:Vector = messages.Messages; messages.messagesNotModified#74535f21 count:int = messages.Messages; messages.chats#64ff9fd5 chats:Vector = messages.Chats; @@ -274,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; @@ -313,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; @@ -338,8 +339,6 @@ updateChannelReadMessagesContents#89893b45 channel_id:int messages:Vector = 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 pts:int pts_count:int = Update; @@ -361,6 +360,8 @@ updateReadChannelDiscussionInbox#1cc7de54 flags:# channel_id:int top_msg_id:int 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 pts:int pts_count:int = Update; +updatePinnedChannelMessages#8588878b flags:# pinned:flags.0?true channel_id:int messages:Vector pts:int pts_count:int = Update; updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State; @@ -607,6 +608,7 @@ channelParticipantSelf#a3289a6d user_id:int inviter_id:int date:int = ChannelPar 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; @@ -615,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 users:Vector = channels.ChannelParticipants; channels.channelParticipantsNotModified#f0173fe9 = channels.ChannelParticipants; @@ -628,7 +631,7 @@ messages.savedGifs#2e0709a5 hash:int gifs:Vector = messages.SavedGifs; inputBotInlineMessageMediaAuto#3380c786 flags:# message:string entities:flags.1?Vector reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage; inputBotInlineMessageText#3dcd7a87 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector 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; @@ -640,7 +643,7 @@ inputBotInlineResultGame#4fa417f2 id:string short_name:string send_message:Input botInlineMessageMediaAuto#764cf810 flags:# message:string entities:flags.1?Vector reply_markup:flags.2?ReplyMarkup = BotInlineMessage; botInlineMessageText#8c7f65e2 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector 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; @@ -1164,8 +1167,6 @@ messageViews#455b853d flags:# views:flags.0?int forwards:flags.1?int replies:fla messages.messageViews#b6c4f543 views:Vector chats:Vector users:Vector = messages.MessageViews; -stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats; - messages.discussionMessage#f5dd8f9d flags:# messages:Vector max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int chats:Vector users:Vector = 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; @@ -1174,6 +1175,8 @@ messageReplies#4128faac flags:# comments:flags.0?true replies:int replies_pts:in 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; @@ -1299,7 +1302,7 @@ contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_hi messages.getMessages#63c66506 id:Vector = 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#4e17810b flags:# peer:InputPeer q:string from_id:flags.0?InputUser 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.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 = messages.AffectedMessages; @@ -1393,7 +1396,7 @@ messages.getSplitRanges#1cff7e08 = Vector; messages.markDialogUnread#c286d98f flags:# unread:flags.0?true peer:InputDialogPeer = Bool; messages.getDialogUnreadMarks#22e24e22 = Vector; 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 = Updates; messages.getPollResults#73bb643b peer:InputPeer msg_id:int = Updates; messages.getOnlines#6e2be050 peer:InputPeer = ChatOnlines; @@ -1422,6 +1425,7 @@ messages.getOldFeaturedStickers#5fe7025b offset:int limit:int hash:int = message 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; @@ -1543,4 +1547,4 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages; stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats; -// LAYER 119 +// LAYER 120 diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index e170c4e21..de007958c 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.7.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index b9b3048db..3f9b139bd 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,3,0 - PRODUCTVERSION 2,4,3,0 + FILEVERSION 2,4,7,0 + PRODUCTVERSION 2,4,7,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.4.3.0" + VALUE "FileVersion", "2.4.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.3.0" + VALUE "ProductVersion", "2.4.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 0636b1189..ca046b74e 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,3,0 - PRODUCTVERSION 2,4,3,0 + FILEVERSION 2,4,7,0 + PRODUCTVERSION 2,4,7,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.4.3.0" + VALUE "FileVersion", "2.4.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.3.0" + VALUE "ProductVersion", "2.4.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/api/api_attached_stickers.cpp b/Telegram/SourceFiles/api/api_attached_stickers.cpp new file mode 100644 index 000000000..dc38822da --- /dev/null +++ b/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 api) +: _api(&api->instance()) { +} + +void AttachedStickers::request( + not_null 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 &result) { + _requestId = 0; + const auto strongController = weak.get(); + if (!strongController) { + return; + } + if (result.v.isEmpty()) { + Ui::show(Box(tr::lng_stickers_not_found(tr::now))); + return; + } else if (result.v.size() > 1) { + Ui::show(Box(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(strongController, setId), + Ui::LayerOption::KeepOther); + }).fail([=](const RPCError &error) { + _requestId = 0; + Ui::show(Box(tr::lng_stickers_not_found(tr::now))); + }).send(); +} + +void AttachedStickers::requestAttachedStickerSets( + not_null controller, + not_null photo) { + request( + controller, + MTPmessages_GetAttachedStickers( + MTP_inputStickeredMediaPhoto(photo->mtpInput()))); +} + +void AttachedStickers::requestAttachedStickerSets( + not_null controller, + not_null document) { + request( + controller, + MTPmessages_GetAttachedStickers( + MTP_inputStickeredMediaDocument(document->mtpInput()))); +} + +} // namespace Api diff --git a/Telegram/SourceFiles/api/api_attached_stickers.h b/Telegram/SourceFiles/api/api_attached_stickers.h new file mode 100644 index 000000000..d0dd18bb4 --- /dev/null +++ b/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 api); + + void requestAttachedStickerSets( + not_null controller, + not_null photo); + + void requestAttachedStickerSets( + not_null controller, + not_null document); + +private: + void request( + not_null controller, + MTPmessages_GetAttachedStickers &&mtpRequest); + + MTP::Sender _api; + mtpRequestId _requestId = 0; + +}; + +} // namespace Api diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp index e96b11da0..6def1f9cd 100644 --- a/Telegram/SourceFiles/api/api_send_progress.cpp +++ b/Telegram/SourceFiles/api/api_send_progress.cpp @@ -10,6 +10,9 @@ 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 { @@ -17,6 +20,7 @@ namespace { constexpr auto kCancelTypingActionTimeout = crl::time(5000); constexpr auto kSetMyActionForMs = 10 * crl::time(1000); +constexpr auto kSendTypingsToOfflineFor = TimeId(30); } // namespace @@ -98,6 +102,9 @@ bool SendProgressManager::updated(const Key &key, bool doing) { } 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); @@ -135,6 +142,26 @@ void SendProgressManager::send(const Key &key, int progress) { } } +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) { diff --git a/Telegram/SourceFiles/api/api_send_progress.h b/Telegram/SourceFiles/api/api_send_progress.h index dc5dc7802..22bed6ac1 100644 --- a/Telegram/SourceFiles/api/api_send_progress.h +++ b/Telegram/SourceFiles/api/api_send_progress.h @@ -90,6 +90,8 @@ private: void send(const Key &key, int progress); void done(const MTPBool &result, mtpRequestId requestId); + [[nodiscard]] bool skipRequest(const Key &key) const; + const not_null _session; base::flat_map _requests; base::flat_map _updated; diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp index 32da40ea5..4ad6bc49a 100644 --- a/Telegram/SourceFiles/api/api_sending.cpp +++ b/Telegram/SourceFiles/api/api_sending.cpp @@ -22,8 +22,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" @@ -237,8 +238,12 @@ bool SendDice(Api::MessageToSend &message) { auto &account = message.action.history->session().account(); auto &config = account.appConfig(); static const auto hardcoded = std::vector{ - 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>( "emojies_send_dice", @@ -604,8 +609,10 @@ void SendLocationPoint( MTP_int(replyTo), MTP_inputMediaGeoPoint( MTP_inputGeoPoint( + MTP_flags(0), MTP_double(data.lat()), - MTP_double(data.lon()))), + MTP_double(data.lon()), + MTP_int(0))), MTP_string(), MTP_long(rand_value()), MTPReplyMarkup(), diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp index 4322cf935..4b853a1e2 100644 --- a/Telegram/SourceFiles/api/api_updates.cpp +++ b/Telegram/SourceFiles/api/api_updates.cpp @@ -63,6 +63,22 @@ enum class DataIsLoadedResult { Ok = 3, }; +void ProcessScheduledMessageWithElapsedTime( + not_null 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_")); } @@ -958,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( @@ -1057,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( @@ -1075,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()); @@ -1090,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()"); } } @@ -1385,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(); @@ -1991,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 diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 61ed7ca47..7c540db2c 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -8,6 +8,7 @@ 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" @@ -63,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" @@ -188,6 +190,7 @@ ApiWrap::ApiWrap(not_null session) , _topPromotionTimer([=] { refreshTopPromotion(); }) , _updateNotifySettingsTimer([=] { sendNotifySettingsUpdates(); }) , _authorizations(std::make_unique(this)) +, _attachedStickers(std::make_unique(this)) , _selfDestruct(std::make_unique(this)) , _sensitiveContent(std::make_unique(this)) , _globalPrivacy(std::make_unique(this)) { @@ -1690,6 +1693,9 @@ void ApiWrap::requestSelfParticipant(not_null 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) { @@ -3564,6 +3570,9 @@ void ApiWrap::sharedMediaDone( parsed.noSkipRange, parsed.fullCount )); + if (type == SharedMediaType::Pinned && !parsed.messageIds.empty()) { + peer->setHasPinnedMessages(true); + } } void ApiWrap::requestUserPhotos( @@ -4496,7 +4505,7 @@ void ApiWrap::sendVoiceMessage( } void ApiWrap::editMedia( - Storage::PreparedList &&list, + Ui::PreparedList &&list, SendMediaType type, TextWithTags &&caption, const SendAction &action, @@ -4518,21 +4527,18 @@ void ApiWrap::editMedia( } void ApiWrap::sendFiles( - Storage::PreparedList &&list, + Ui::PreparedList &&list, SendMediaType type, TextWithTags &&caption, std::shared_ptr 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); @@ -4542,23 +4548,18 @@ void ApiWrap::sendFiles( auto tasks = std::vector>(); tasks.reserve(list.files.size()); for (auto &file : list.files) { - if (album) { - switch (file.type) { - case Storage::PreparedFile::AlbumType::Photo: - type = SendMediaType::Photo; - break; - case Storage::PreparedFile::AlbumType::Video: - type = SendMediaType::File; - break; - default: Unexpected("AlbumType in uploadFilesAfterConfirmation"); - } - } + const auto uploadWithType = !album + ? type + : (file.type == Ui::PreparedFile::Type::Photo + && type != SendMediaType::File) + ? SendMediaType::Photo + : SendMediaType::File; tasks.push_back(std::make_unique( &session(), file.path, file.content, std::move(file.information), - type, + uploadWithType, to, caption, album)); @@ -5553,6 +5554,10 @@ Api::Authorizations &ApiWrap::authorizations() { return *_authorizations; } +Api::AttachedStickers &ApiWrap::attachedStickers() { + return *_attachedStickers; +} + Api::SelfDestruct &ApiWrap::selfDestruct() { return *_selfDestruct; } diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 79c12acc9..920064100 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/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,10 +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; @@ -392,7 +396,7 @@ public: int duration, const SendAction &action); void sendFiles( - Storage::PreparedList &&list, + Ui::PreparedList &&list, SendMediaType type, TextWithTags &&caption, std::shared_ptr album, @@ -403,7 +407,7 @@ public: const SendAction &action); void editMedia( - Storage::PreparedList &&list, + Ui::PreparedList &&list, SendMediaType type, TextWithTags &&caption, const SendAction &action, @@ -458,6 +462,7 @@ public: rpl::producer blockedPeersSlice(); [[nodiscard]] Api::Authorizations &authorizations(); + [[nodiscard]] Api::AttachedStickers &attachedStickers(); [[nodiscard]] Api::SelfDestruct &selfDestruct(); [[nodiscard]] Api::SensitiveContent &sensitiveContent(); [[nodiscard]] Api::GlobalPrivacy &globalPrivacy(); @@ -821,6 +826,7 @@ private: rpl::event_stream _blockedPeersChanges; const std::unique_ptr _authorizations; + const std::unique_ptr _attachedStickers; const std::unique_ptr _selfDestruct; const std::unique_ptr _sensitiveContent; const std::unique_ptr _globalPrivacy; diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index 61a0b95cb..8c244d6fa 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/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 @@ -66,14 +67,6 @@ HistoryView::Element *hoveredItem = nullptr, *pressedLinkItem = nullptr, *mousedItem = nullptr; -struct CornersPixmaps { - QPixmap p[4]; -}; -QVector corners; -using CornersMap = QMap; -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); - } - } diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h index fc7c3c6a8..5d12e4665 100644 --- a/Telegram/SourceFiles/app.h +++ b/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); - } - }; diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 4ea4f62e7..4f842acbb 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -15,7 +15,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" @@ -126,7 +125,7 @@ void AboutBox::showVersionHistory() { Ui::show(Box("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")); } } diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index aab5438ba..c0419a5ef 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/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" diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp index 6597fe75a..487cf333f 100644 --- a/Telegram/SourceFiles/boxes/background_preview_box.cpp +++ b/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" diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 87257f0aa..73a71d6a7 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -489,7 +489,7 @@ backgroundScroll: ScrollArea(boxScroll) { deltab: 10px; } -editMediaButtonSize: 29px; +editMediaButtonSize: 28px; editMediaButtonSkip: 8px; editMediaButtonFileSkipRight: 1px; editMediaButtonFileSkipTop: 7px; @@ -508,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; @@ -705,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); diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index f6456deee..b28aebf0a 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -69,6 +69,21 @@ TextParseOptions kMarkedTextBoxOptions = { Qt::LayoutDirectionAuto, // dir }; +[[nodiscard]] bool IsOldForPin(MsgId id, not_null 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( @@ -444,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), false, 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), + false, + 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); } @@ -465,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); } } @@ -485,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, diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h index 3b8f80e05..dea112536 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.h +++ b/Telegram/SourceFiles/boxes/confirm_box.h @@ -183,10 +183,13 @@ private: const not_null _peer; MTP::Sender _api; - MsgId _msgId; + MsgId _msgId = 0; + bool _pinningOld = false; object_ptr _text; object_ptr _notify = { nullptr }; + object_ptr _pinForPeer = { nullptr }; + QPointer _checkbox; mtpRequestId _requestId = 0; diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index 9cf8ae2db..a32d67fb1 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/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" diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index ef5c75254..edcb57b56 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -47,17 +47,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h" #include "ui/text/format_values.h" -#include "ui/special_buttons.h" -#include "ui/text_options.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 @@ -67,13 +70,13 @@ using namespace ::Media::Streaming; using Data::PhotoSize; auto ListFromMimeData(not_null 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( 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; @@ -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; @@ -490,9 +514,10 @@ void EditCaptionBox::updateEditPreview() { auto shouldAsDoc = true; auto docPhotoSize = QSize(); if (const auto image = std::get_if(fileMedia)) { - shouldAsDoc = !Storage::ValidateThumbDimensions( + 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()); @@ -509,7 +534,7 @@ void EditCaptionBox::updateEditPreview() { if (shouldAsDoc) { auto nameString = filename; if (const auto song = std::get_if(fileMedia)) { - nameString = DocumentData::ComposeNameString( + 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(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 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 = std::get_if(fileMedia)) { - return !Storage::ValidateThumbDimensions( - image->data.width(), - image->data.height()); - } - return false; - }(); - - if (!data->hasText() || imageAsDoc) { - Ui::show( - Box(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