v1.11.32

* Fix accidental change of nightly deb name

* Remove stale deb-custom-control arg

.github/ISSUE_TEMPLATE/bug-desktop.yml

@@ -0,0 +1,76 @@
+name: Bug report for the Element desktop app (not in a browser)
+description: File a bug report if you are using the desktop Element application.
+labels: [T-Defect]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to fill out this bug report!
+
+              Please report security issues by email to security@matrix.org
+    - type: textarea
+      id: reproduction-steps
+      attributes:
+          label: Steps to reproduce
+          description: Please attach screenshots, videos or logs if you can.
+          placeholder: Tell us what you see!
+          value: |
+              1. Where are you starting? What can you see?
+              2. What do you click?
+              3. More steps…
+      validations:
+          required: true
+    - type: textarea
+      id: result
+      attributes:
+          label: Outcome
+          placeholder: Tell us what went wrong
+          value: |
+              #### What did you expect?
+
+              #### What happened instead?
+      validations:
+          required: true
+    - type: input
+      id: os
+      attributes:
+          label: Operating system
+          placeholder: Windows, macOS, Ubuntu, Arch Linux…
+      validations:
+          required: false
+    - type: input
+      id: version
+      attributes:
+          label: Application version
+          description: You can find the version information in Settings -> Help & About.
+          placeholder: e.g. Element version 1.7.34, olm version 3.2.3
+      validations:
+          required: false
+    - type: input
+      id: source
+      attributes:
+          label: How did you install the app?
+          description: Where did you install the app from? Please give a link or a description.
+          placeholder: e.g. From https://element.io/get-started
+      validations:
+          required: false
+    - type: input
+      id: homeserver
+      attributes:
+          label: Homeserver
+          description: |
+              Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
+          placeholder: e.g. matrix.org or Synapse 1.50.0rc1
+      validations:
+          required: false
+    - type: dropdown
+      id: rageshake
+      attributes:
+          label: Will you send logs?
+          description: |
+              Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
+          options:
+              - "Yes"
+              - "No"
+      validations:
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,36 @@
+name: Enhancement request
+description: Do you have a suggestion or feature request?
+labels: [T-Enhancement]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
+    - type: textarea
+      id: usecase
+      attributes:
+          label: Your use case
+          description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
+          placeholder: Tell us what you would like to do!
+          value: |
+              #### What would you like to do?
+
+              #### Why would you like to do it?
+
+              #### How would you like to achieve it?
+      validations:
+          required: true
+    - type: textarea
+      id: alternative
+      attributes:
+          label: Have you considered any alternatives?
+          placeholder: A clear and concise description of any alternative solutions or features you've considered.
+      validations:
+          required: false
+    - type: textarea
+      id: additional-context
+      attributes:
+          label: Additional context
+          placeholder: Is there anything else you'd like to add?
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/please-don-t-file-issues-here---use-the-element-web-project.md

@@ -1,10 +0,0 @@
----
-name: Please don't file issues here - use the element-web project
-about: Please don't file issues here - use the element-web project
-title: Please don't file issues here - use the element-web project
-labels: ''
-assignees: ''
-
----
-
-Please don't file issues here - use the [element-web project](https://github.com/vector-im/element-web/issues/)

.github/workflows/backport.yml

@@ -23,7 +23,7 @@ jobs:
               )
             )
         steps:
-            - uses: tibdex/backport@v2
+            - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac
               with:
                   labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
                   # We can't use GITHUB_TOKEN here or CI won't run on the new PR

.github/workflows/build_and_deploy.yaml

@@ -39,6 +39,7 @@ on:
                 required: true
                 type: boolean
                 default: true
+run-name: Element ${{ inputs.mode == 'release' && 'Desktop' || 'Nightly' }}
 concurrency: ${{ github.workflow }}
 env:
     R2_BUCKET: ${{ vars.R2_BUCKET }}
@@ -47,7 +48,7 @@ jobs:
         uses: ./.github/workflows/build_prepare.yaml
         with:
             config: element.io/${{ inputs.mode || 'nightly' }}
-            version: ${{ inputs.mode == 'release' && '' || 'develop' }}
+            version: ${{ inputs.mode != 'release' && 'develop' || '' }}
             nightly: ${{ inputs.mode != 'release' }}
         secrets:
             CF_R2_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
@@ -89,14 +90,18 @@ jobs:
             base-url: https://packages.element.io/${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
             version: ${{ needs.prepare.outputs.macos-version }}
 
-    # We do not put this call into deploy-mode as we do not want it to add to the packages.element.io artifact
+    # We do not put these calls into deploy-mode as we do not want it to add to the packages.element.io artifact
     # We ship this build via reprepro only
     linux:
         if: github.event_name != 'workflow_dispatch' || inputs.linux
         needs: prepare
-        name: Linux (sqlcipher system)
+        name: Linux ${{ matrix.arch }} (sqlcipher system)
+        strategy:
+            matrix:
+                arch: [amd64, arm64]
         uses: ./.github/workflows/build_linux.yaml
         with:
+            arch: ${{ matrix.arch }}
             config: element.io/${{ inputs.mode || 'nightly' }}
             sqlcipher: system
             version: ${{ needs.prepare.outputs.linux-version }}
@@ -108,6 +113,7 @@ jobs:
         name: Linux (sqlcipher static)
         uses: ./.github/workflows/build_linux.yaml
         with:
+            arch: amd64
             deploy-mode: true
             config: element.io/${{ inputs.mode || 'nightly' }}
             sqlcipher: static
@@ -154,9 +160,12 @@ jobs:
             - linux
             # We queue this after the other deploy stage as we want to abort if that fails
             - deploy
-        name: Run reprepro
+        name: Run reprepro ${{ matrix.arch }}
+        strategy:
+            matrix:
+                arch: [amd64, arm64]
         if: github.event_name != 'workflow_dispatch' || (inputs.deploy && inputs.linux)
         uses: ./.github/workflows/reprepro.yaml
         secrets: inherit
         with:
-            artifact-name: linux-sqlcipher-system
+            artifact-name: linux-${{ matrix.arch }}-sqlcipher-system

.github/workflows/build_and_test.yaml

@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@79adacd43ea069e57037edc891ea8d33013bc3da # v35
+              uses: tj-actions/changed-files@b2d17f51244a144849c6b37a3a6791b98a51d86f # v35
               with:
                   files: |
                       dockerbuild/*
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -63,7 +63,7 @@ jobs:
 
             - name: Build and push Docker image
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
               with:
                   context: dockerbuild
                   push: true
@@ -73,15 +73,22 @@ jobs:
         needs:
             - fetch
             - linux_docker
-        name: Linux
+        name: "Linux (${{ matrix.arch }}) (sqlcipher: ${{ matrix.sqlcipher }})"
         uses: ./.github/workflows/build_linux.yaml
         strategy:
             matrix:
                 sqlcipher: [system, static]
+                arch: [amd64, arm64]
+                exclude:
+                    # FIXME: This combination yields a broken Seshat at this time
+                    # Errors at launch with `undefined symbol: PKCS5_PBKDF2_HMAC
+                    - arch: arm64
+                      sqlcipher: static
         with:
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
             docker-image: ${{ needs.linux_docker.outputs.docker-image }}
+            arch: ${{ matrix.arch }}
 
     macos:
         needs: fetch
@@ -99,16 +106,16 @@ jobs:
                     - name: macOS Universal
                       os: macos
                       artifact: macos
-                      executable: "./dist/mac-universal/Element.app/Contents/MacOS/Element"
-                      prepare_cmd: "find ./dist/mac-universal/Element.app -type f | perl -lne 'print if -B' | tr '\\n' '\\0' | xargs -0 -n1 chmod 755"
-                    - name: "Linux (sqlcipher: system)"
+                      executable: "/Volumes/Element/Element.app/Contents/MacOS/Element"
+                      prepare_cmd: "hdiutil attach ./dist/*.dmg -mountpoint /Volumes/Element"
+                    - name: "Linux (amd64) (sqlcipher: system)"
                       os: ubuntu
-                      artifact: linux-sqlcipher-system
+                      artifact: linux-amd64-sqlcipher-system
                       executable: "element-desktop"
                       prepare_cmd: "sudo apt install ./dist/*.deb"
-                    - name: "Linux (sqlcipher: static)"
+                    - name: "Linux (amd64) (sqlcipher: static)"
                       os: ubuntu
-                      artifact: linux-sqlcipher-static
+                      artifact: linux-amd64-sqlcipher-static
                       executable: "element-desktop"
                       prepare_cmd: "sudo apt install ./dist/*.deb"
                     - name: Windows (x86)

.github/workflows/build_linux.yaml

@@ -4,6 +4,10 @@
 on:
     workflow_call:
         inputs:
+            arch:
+                type: string
+                required: true
+                description: "The architecture to build for, one of 'amd64' | 'arm64'"
             config:
                 type: string
                 required: true
@@ -33,6 +37,24 @@ jobs:
             run:
                 shell: bash
         steps:
+            - uses: kanga333/variable-mapper@master
+              id: config
+              with:
+                  key: "${{ inputs.arch }}"
+                  export_to: output
+                  map: |
+                      {
+                        "amd64": {
+                          "target": "x86_64-unknown-linux-gnu",
+                          "arch": "x86-64"
+                        },
+                        "arm64": {
+                          "target": "aarch64-unknown-linux-gnu",
+                          "arch": "aarch64",
+                          "build-args": "--arm64"
+                        }
+                      }
+
             - uses: actions/checkout@v3
 
             - uses: actions/download-artifact@v3
@@ -43,7 +65,7 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
@@ -58,11 +80,30 @@ jobs:
             - name: Install Deps
               run: "yarn install --frozen-lockfile"
 
+            - name: Prepare for static sqlcipher build
+              if: inputs.sqlcipher == 'static'
+              run: |
+                  echo "SQLCIPHER_BUNDLED=1" >> $GITHUB_ENV
+
+            # Ideally the docker image would be ready for cross-compilation but libsqlcipher-dev is not Multi-Arch compatible
+            # https://unix.stackexchange.com/a/349359
+            - name: Prepare for cross compilation
+              if: steps.cache.outputs.cache-hit != 'true' && inputs.arch == 'arm64'
+              run: |
+                  set -x
+                  sed -i 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main multiverse restricted universe" | tee -a /etc/apt/sources.list
+                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main multiverse restricted universe" | tee -a /etc/apt/sources.list
+                  dpkg --add-architecture arm64
+                  apt-get -qq update
+                  apt-get -qq install --no-install-recommends crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64 libgnome-keyring-dev:arm64
+                  rustup target add aarch64-unknown-linux-gnu
+                  mv dockerbuild/aarch64/.cargo .
+                  cat dockerbuild/aarch64/.env >> $GITHUB_ENV
+
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run: "yarn build:native"
-              env:
-                  SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
+              run: "yarn build:native --target ${{ steps.config.outputs.target }}"
 
             - name: "[Nightly] Resolve version"
               id: nightly
@@ -77,33 +118,38 @@ jobs:
                       echo "config-args=--deb-changelog changelog.Debian" >> $GITHUB_OUTPUT
                   fi
 
-                  cp "$DIR/control.template" debcontrol
-                  VERSION=${INPUT_VERSION:-$(cat package.json | jq -r .version)}
-                  echo "Version: $VERSION" >> debcontrol
-              env:
-                  DIR: ${{ inputs.config }}
-                  INPUT_VERSION: ${{ inputs.version }}
-
             - name: Build App
               run: |
                   npx ts-node scripts/generate-builder-config.ts \
                       ${{ steps.nightly.outputs.config-args }} \
-                      ${{ steps.debian.outputs.config-args }} \
-                      --deb-custom-control=debcontrol
-                  yarn build --publish never -l --config electron-builder.json
+                      ${{ steps.debian.outputs.config-args }}
+                  yarn build --publish never -l --config electron-builder.json ${{ steps.config.outputs.build-args }}
 
-            - name: Check ldd
+            - name: Check native libraries
               run: |
-                  ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node
-                  if [ "$SQLCIPHER_STATIC" == "1" ]; then
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libsqlcipher.so.0
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libcrypto.so.1.1
+                  set -x
+                  shopt -s globstar
+
+                  FILES=$(file dist/**/*.node)
+                  echo "$FILES"
+
+                  if [ grep -v "$ARCH" ]; then
+                      exit 1
+                  fi
+
+                  LIBS=$(readelf -d dist/**/*.node | grep NEEDED)
+                  echo "$LIBS"
+
+                  set +x
+                  assert_contains_string() { [[ "$1" == *"$2"* ]]; }
+                  ! assert_contains_string "$LIBS" "libcrypto.so.1.1"
+                  if [ "$SQLCIPHER_BUNDLED" == "1" ]; then
+                      ! assert_contains_string "$LIBS" "libsqlcipher.so.0"
                   else
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep libsqlcipher.so.0
-                      ldd dist/linux-unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node | grep -v libcrypto.so.1.1
+                      assert_contains_string "$LIBS" "libsqlcipher.so.0"
                   fi
               env:
-                  SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
+                  ARCH: ${{ steps.config.outputs.arch }}
 
             - name: Stash deb package
               if: inputs.deploy-mode
@@ -133,9 +179,12 @@ jobs:
                   ln -s "$(find . -type f -iname "*.tar.gz" | xargs -0 -n1 -- basename)" "element-desktop.tar.gz"
               working-directory: "dist/install/linux/glibc-x86-64"
 
+            # We exclude *-unpacked as it loses permissions and the tarball contains it with correct permissions
             - name: Upload Artifacts
               uses: actions/upload-artifact@v3
               with:
-                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-sqlcipher-{0}', inputs.sqlcipher) }}
-                  path: dist
+                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-{0}-sqlcipher-{1}', inputs.arch, inputs.sqlcipher) }}
+                  path: |
+                      dist
+                      !dist/*-unpacked/**
                   retention-days: 1

.github/workflows/build_macos.yaml

@@ -46,13 +46,13 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
             - name: Install Rust
               if: steps.cache.outputs.cache-hit != 'true'
-              uses: actions-rs/toolchain@v1
+              uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746
               with:
                   default: true
                   toolchain: stable
@@ -147,9 +147,12 @@ jobs:
                   ln -s "$(find . -type f -iname "*.dmg" | xargs -0 -n1 -- basename)" "Element.dmg"
               working-directory: "dist/install/macos"
 
+            # We exclude mac-universal as the unpacked app takes forever to upload and zip and dmg already contain it
             - name: Upload Artifacts
               uses: actions/upload-artifact@v3
               with:
                   name: ${{ inputs.deploy-mode && 'packages.element.io' || 'macos' }}
-                  path: dist
+                  path: |
+                      dist
+                      !dist/mac-universal/**
                   retention-days: 1

.github/workflows/build_prepare.yaml

@@ -62,7 +62,9 @@ jobs:
             - name: Generate cache hash files
               run: |
                   yarn run --silent electron --version > electronVersion
-                  cat package.json | jq -c .hakDependencies > hakDependencies.json
+                  cat package.json | jq -c .hakDependencies | sha1sum > hakHash
+                  find hak -type f -print0 | xargs -0 sha1sum >> hakHash
+                  find scripts/hak -type f -print0 | xargs -0 sha1sum >> hakHash
 
             - name: "[Nightly] Calculate versions"
               id: versions
@@ -112,6 +114,28 @@ jobs:
                   BODY: ${{ steps.release.outputs.body }}
                   PUBLISHED_AT: ${{ steps.release.outputs.published_at }}
 
+            - name: "[Nightly] Write summary"
+              if: inputs.nightly
+              run: |
+                  BUNDLE_HASH=$(npx asar l webapp.asar | grep /bundles/ | head -n 1 | sed 's|.*/||')
+                  WEBAPP_VERSION=$(./scripts/get-version.ts)
+                  WEB_VERSION=${WEBAPP_VERSION:0:12}
+                  REACT_VERSION=${WEBAPP_VERSION:19:12}
+                  JS_VERSION=${WEBAPP_VERSION:35:12}
+
+                  echo "### Nightly build" >> $GITHUB_STEP_SUMMARY
+                  echo "" >> $GITHUB_STEP_SUMMARY
+                  echo "| Component   | Version |" >> $GITHUB_STEP_SUMMARY
+                  echo "| ----------- | ------- |" >> $GITHUB_STEP_SUMMARY
+                  echo "| macOS       | ${{ steps.versions.outputs.macos }} |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Linux       | ${{ steps.versions.outputs.linux }} |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Windows x64 | ${{ steps.versions.outputs.win_x64 }} |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Windows x86 | ${{ steps.versions.outputs.win_x86 }} |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Bundle Hash | $BUNDLE_HASH |" >> $GITHUB_STEP_SUMMARY
+                  echo "| Element Web | [$WEB_VERSION](https://github.com/vector-im/element-web/commit/$WEB_VERSION) |" >> $GITHUB_STEP_SUMMARY
+                  echo "| React SDK   | [$REACT_VERSION](https://github.com/matrix-org/matrix-react-sdk/commit/$REACT_VERSION) |" >> $GITHUB_STEP_SUMMARY
+                  echo "| JS SDK      | [$JS_VERSION](https://github.com/matrix-org/matrix-js-sdk/commit/$JS_VERSION) |" >> $GITHUB_STEP_SUMMARY
+
             - uses: actions/upload-artifact@v3
               with:
                   name: webapp
@@ -120,5 +144,5 @@ jobs:
                       webapp.asar
                       package.json
                       electronVersion
-                      hakDependencies.json
+                      hakHash
                       changelog.Debian

.github/workflows/build_windows.yaml

@@ -34,7 +34,7 @@ jobs:
         env:
             SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe"
         steps:
-            - uses: kanga333/variable-mapper@master
+            - uses: kanga333/variable-mapper@3681b75f5c6c00162721168fb91ab74925eaebcb
               id: config
               with:
                   key: "${{ inputs.arch }}"
@@ -68,12 +68,12 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('hakHash', 'electronVersion') }}
                   path: |
                       ./.hak
 
             - name: Set up build tools
-              uses: ilammy/msvc-dev-cmd@v1
+              uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
               with:
                   arch: ${{ steps.config.outputs.arch || inputs.arch }}
 
@@ -95,7 +95,7 @@ jobs:
 
             - name: Install Rust
               if: steps.cache.outputs.cache-hit != 'true'
-              uses: actions-rs/toolchain@v1
+              uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746
               with:
                   default: true
                   toolchain: stable

.github/workflows/dockerbuild.yaml

@@ -20,7 +20,7 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -28,14 +28,14 @@ jobs:
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+              uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
               with:
                   context: dockerbuild
                   push: true

CHANGELOG.md

@@ -1,3 +1,143 @@
+Changes in [1.11.32](https://github.com/vector-im/element-desktop/releases/tag/v1.11.32) (2023-06-06)
+=====================================================================================================
+
+## ✨ Features
+ * Redirect to the SSO page if `sso_redirect_options.on_welcome_page` is enabled and the URL hash is empty ([\#25495](https://github.com/vector-im/element-web/pull/25495)). Contributed by @dhenneke.
+ * vector/index.html: Allow fetching blob urls ([\#25336](https://github.com/vector-im/element-web/pull/25336)). Contributed by @SuperKenVery.
+ * When joining room in sub-space join the parents too ([\#11011](https://github.com/matrix-org/matrix-react-sdk/pull/11011)).
+ * Include thread replies in message previews ([\#10631](https://github.com/matrix-org/matrix-react-sdk/pull/10631)). Fixes vector-im/element-web#23920.
+ * Use semantic headings in space preferences ([\#11021](https://github.com/matrix-org/matrix-react-sdk/pull/11021)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - Ignored users ([\#11006](https://github.com/matrix-org/matrix-react-sdk/pull/11006)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - profile ([\#10973](https://github.com/matrix-org/matrix-react-sdk/pull/10973)). Fixes vector-im/element-web#25461. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - account ([\#10972](https://github.com/matrix-org/matrix-react-sdk/pull/10972)). Contributed by @kerryarchibald.
+ * Support `Insert from iPhone or iPad` in Safari ([\#10851](https://github.com/matrix-org/matrix-react-sdk/pull/10851)). Fixes vector-im/element-web#25327. Contributed by @SuperKenVery.
+ * Specify supportedStages for User Interactive Auth ([\#10975](https://github.com/matrix-org/matrix-react-sdk/pull/10975)). Fixes vector-im/element-web#19605.
+ * Pass device id to widgets ([\#10209](https://github.com/matrix-org/matrix-react-sdk/pull/10209)). Contributed by @Fox32.
+ * Use semantic headings in user settings - discovery ([\#10838](https://github.com/matrix-org/matrix-react-sdk/pull/10838)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings -  Notifications ([\#10948](https://github.com/matrix-org/matrix-react-sdk/pull/10948)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - spellcheck and language ([\#10959](https://github.com/matrix-org/matrix-react-sdk/pull/10959)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Appearance ([\#10827](https://github.com/matrix-org/matrix-react-sdk/pull/10827)). Contributed by @kerryarchibald.
+ * Use semantic heading in user settings Sidebar & Voip ([\#10782](https://github.com/matrix-org/matrix-react-sdk/pull/10782)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Security ([\#10774](https://github.com/matrix-org/matrix-react-sdk/pull/10774)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings - integrations and account deletion ([\#10837](https://github.com/matrix-org/matrix-react-sdk/pull/10837)). Fixes vector-im/element-web#25378. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Preferences ([\#10794](https://github.com/matrix-org/matrix-react-sdk/pull/10794)). Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Keyboard ([\#10793](https://github.com/matrix-org/matrix-react-sdk/pull/10793)). Contributed by @kerryarchibald.
+ * RTE plain text mentions as pills ([\#10852](https://github.com/matrix-org/matrix-react-sdk/pull/10852)). Contributed by @alunturner.
+ * Allow welcome.html logo to be replaced by config ([\#25339](https://github.com/vector-im/element-web/pull/25339)). Fixes vector-im/element-web#8636.
+ * Use semantic headings in user settings Labs ([\#10773](https://github.com/matrix-org/matrix-react-sdk/pull/10773)). Contributed by @kerryarchibald.
+ * Use semantic list elements for menu lists and tab lists ([\#10902](https://github.com/matrix-org/matrix-react-sdk/pull/10902)). Fixes vector-im/element-web#24928.
+ * Fix aria-required-children axe violation ([\#10900](https://github.com/matrix-org/matrix-react-sdk/pull/10900)). Fixes vector-im/element-web#25342.
+ * Enable pagination for overlay timelines ([\#10757](https://github.com/matrix-org/matrix-react-sdk/pull/10757)). Fixes vector-im/voip-internal#107.
+ * Add tooltip to disabled invite button due to lack of permissions ([\#10869](https://github.com/matrix-org/matrix-react-sdk/pull/10869)). Fixes vector-im/element-web#9824.
+ * Respect configured auth_header_logo_url for default Welcome page ([\#10870](https://github.com/matrix-org/matrix-react-sdk/pull/10870)).
+ * Specify lazy loading for avatars ([\#10866](https://github.com/matrix-org/matrix-react-sdk/pull/10866)). Fixes vector-im/element-web#1983.
+ * Room and user mentions for plain text editor ([\#10665](https://github.com/matrix-org/matrix-react-sdk/pull/10665)). Contributed by @alunturner.
+ * Add audible notifcation on broadcast error ([\#10654](https://github.com/matrix-org/matrix-react-sdk/pull/10654)). Fixes vector-im/element-web#25132.
+ * Fall back from server generated thumbnail to original image ([\#10853](https://github.com/matrix-org/matrix-react-sdk/pull/10853)).
+ * Use semantically correct elements for room sublist context menu ([\#10831](https://github.com/matrix-org/matrix-react-sdk/pull/10831)). Fixes vector-im/customer-retainer#46.
+ * Avoid calling prepareToEncrypt onKeyDown ([\#10828](https://github.com/matrix-org/matrix-react-sdk/pull/10828)).
+ * Allows search to recognize full room links ([\#8275](https://github.com/matrix-org/matrix-react-sdk/pull/8275)). Contributed by @bolu-tife.
+ * "Show rooms with unread messages first" should not be on by default for new users ([\#10820](https://github.com/matrix-org/matrix-react-sdk/pull/10820)). Fixes vector-im/element-web#25304. Contributed by @kerryarchibald.
+ * Fix emitter handler leak in ThreadView ([\#10803](https://github.com/matrix-org/matrix-react-sdk/pull/10803)).
+ * Add better error for email invites without identity server ([\#10739](https://github.com/matrix-org/matrix-react-sdk/pull/10739)). Fixes vector-im/element-web#16893.
+ * Move reaction message previews out of labs ([\#10601](https://github.com/matrix-org/matrix-react-sdk/pull/10601)). Fixes vector-im/element-web#25083.
+ * Sort muted rooms to the bottom of their section of the room list ([\#10592](https://github.com/matrix-org/matrix-react-sdk/pull/10592)). Fixes vector-im/element-web#25131. Contributed by @kerryarchibald.
+ * Use semantic headings in user settings Help & About ([\#10752](https://github.com/matrix-org/matrix-react-sdk/pull/10752)). Contributed by @kerryarchibald.
+ * use ExternalLink components for external links ([\#10758](https://github.com/matrix-org/matrix-react-sdk/pull/10758)). Contributed by @kerryarchibald.
+ * Use semantic headings in space settings ([\#10751](https://github.com/matrix-org/matrix-react-sdk/pull/10751)). Contributed by @kerryarchibald.
+ * Use semantic headings for room settings content ([\#10734](https://github.com/matrix-org/matrix-react-sdk/pull/10734)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Use consistent fonts for Japanese text ([\#10980](https://github.com/matrix-org/matrix-react-sdk/pull/10980)). Fixes vector-im/element-web#22333 and vector-im/element-web#23899.
+ * Fix: server picker validates unselected option ([\#11020](https://github.com/matrix-org/matrix-react-sdk/pull/11020)). Fixes vector-im/element-web#25488. Contributed by @kerryarchibald.
+ * Fix room list notification badges going missing in compact layout ([\#11022](https://github.com/matrix-org/matrix-react-sdk/pull/11022)). Fixes vector-im/element-web#25372.
+ * Fix call to `startSingleSignOn` passing enum in place of idpId ([\#10998](https://github.com/matrix-org/matrix-react-sdk/pull/10998)). Fixes vector-im/element-web#24953.
+ * Remove hover effect from user name on a DM creation UI ([\#10887](https://github.com/matrix-org/matrix-react-sdk/pull/10887)). Fixes vector-im/element-web#25305. Contributed by @luixxiul.
+ * Fix layout regression in public space invite dialog ([\#11009](https://github.com/matrix-org/matrix-react-sdk/pull/11009)). Fixes vector-im/element-web#25458.
+ * Fix layout regression in session dropdown ([\#10999](https://github.com/matrix-org/matrix-react-sdk/pull/10999)). Fixes vector-im/element-web#25448.
+ * Fix spacing regression in user settings - roles & permissions ([\#10993](https://github.com/matrix-org/matrix-react-sdk/pull/10993)). Fixes vector-im/element-web#25447 and vector-im/element-web#25451. Contributed by @kerryarchibald.
+ * Fall back to receipt timestamp if we have no event (react-sdk part) ([\#10974](https://github.com/matrix-org/matrix-react-sdk/pull/10974)). Fixes vector-im/element-web#10954. Contributed by @andybalaam.
+ * Fix: Room header 'view your device list' does not link to new session manager ([\#10979](https://github.com/matrix-org/matrix-react-sdk/pull/10979)). Fixes vector-im/element-web#25440. Contributed by @kerryarchibald.
+ * Fix display of devices without encryption support in Settings dialog ([\#10977](https://github.com/matrix-org/matrix-react-sdk/pull/10977)). Fixes vector-im/element-web#25413.
+ * Use aria descriptions instead of labels for TextWithTooltip ([\#10952](https://github.com/matrix-org/matrix-react-sdk/pull/10952)). Fixes vector-im/element-web#25398.
+ * Use grapheme-splitter instead of lodash for saving emoji from being ripped apart ([\#10976](https://github.com/matrix-org/matrix-react-sdk/pull/10976)). Fixes vector-im/element-web#22196.
+ * Fix: content overflow in settings subsection ([\#10960](https://github.com/matrix-org/matrix-react-sdk/pull/10960)). Fixes vector-im/element-web#25416. Contributed by @kerryarchibald.
+ * Make `Privacy Notice` external link on integration manager ToS clickable ([\#10914](https://github.com/matrix-org/matrix-react-sdk/pull/10914)). Fixes vector-im/element-web#25384. Contributed by @luixxiul.
+ * Ensure that open message context menus are updated when the event is sent ([\#10950](https://github.com/matrix-org/matrix-react-sdk/pull/10950)).
+ * Ensure that open sticker picker dialogs are updated when the widget configuration is updated. ([\#10945](https://github.com/matrix-org/matrix-react-sdk/pull/10945)).
+ * Fix big emoji in replies ([\#10932](https://github.com/matrix-org/matrix-react-sdk/pull/10932)). Fixes vector-im/element-web#24798.
+ * Hide empty `MessageActionBar` on message edit history dialog ([\#10447](https://github.com/matrix-org/matrix-react-sdk/pull/10447)). Fixes vector-im/element-web#24903. Contributed by @luixxiul.
+ * Fix roving tab index getting confused after dragging space order ([\#10901](https://github.com/matrix-org/matrix-react-sdk/pull/10901)).
+ * Attempt a potential workaround for stuck notifs ([\#3384](https://github.com/matrix-org/matrix-js-sdk/pull/3384)). Fixes vector-im/element-web#25406. Contributed by @andybalaam.
+ * Update to seshat 3.0.1 ([\#960](https://github.com/vector-im/element-desktop/pull/960)). Fixes #959.
+ * Fix macos update check exploding ([\#944](https://github.com/vector-im/element-desktop/pull/944)). Fixes #668.
+ * Handle trailing dot FQDNs for domain-specific config.json files ([\#25351](https://github.com/vector-im/element-web/pull/25351)). Fixes vector-im/element-web#8858.
+ * Ignore edits in message previews when they concern messages other than latest ([\#10868](https://github.com/matrix-org/matrix-react-sdk/pull/10868)). Fixes vector-im/element-web#14872.
+ * Send correct receipts when viewing a room ([\#10864](https://github.com/matrix-org/matrix-react-sdk/pull/10864)). Fixes vector-im/element-web#25196.
+ * Fix timeline search bar being overlapped by the right panel ([\#10809](https://github.com/matrix-org/matrix-react-sdk/pull/10809)). Fixes vector-im/element-web#25291. Contributed by @luixxiul.
+ * Fix the state shown for call in rooms ([\#10833](https://github.com/matrix-org/matrix-react-sdk/pull/10833)).
+ * Add string for membership event where both displayname & avatar change ([\#10880](https://github.com/matrix-org/matrix-react-sdk/pull/10880)). Fixes vector-im/element-web#18026.
+ * Fix people space notification badge not updating for new DM invites ([\#10849](https://github.com/matrix-org/matrix-react-sdk/pull/10849)). Fixes vector-im/element-web#23248.
+ * Fix regression in emoji picker order mangling after clearing filter ([\#10854](https://github.com/matrix-org/matrix-react-sdk/pull/10854)). Fixes vector-im/element-web#25323.
+ * Fix: Edit history modal crash ([\#10834](https://github.com/matrix-org/matrix-react-sdk/pull/10834)). Fixes vector-im/element-web#25309. Contributed by @kerryarchibald.
+ * Fix long room address and name not being clipped on room info card and update `_RoomSummaryCard.pcss` ([\#10811](https://github.com/matrix-org/matrix-react-sdk/pull/10811)). Fixes vector-im/element-web#25293. Contributed by @luixxiul.
+ * Treat thumbnail upload failures as complete upload failures ([\#10829](https://github.com/matrix-org/matrix-react-sdk/pull/10829)). Fixes vector-im/element-web#7069.
+ * Update finite automata to match user identifiers as per spec ([\#10798](https://github.com/matrix-org/matrix-react-sdk/pull/10798)). Fixes vector-im/element-web#25246.
+ * Fix icon on empty notification panel ([\#10817](https://github.com/matrix-org/matrix-react-sdk/pull/10817)). Fixes vector-im/element-web#25298 and vector-im/element-web#25302. Contributed by @luixxiul.
+ * Fix: Threads button is highlighted when I create a new room ([\#10819](https://github.com/matrix-org/matrix-react-sdk/pull/10819)). Fixes vector-im/element-web#25284. Contributed by @kerryarchibald.
+ * Fix the top heading of notification panel ([\#10818](https://github.com/matrix-org/matrix-react-sdk/pull/10818)). Fixes vector-im/element-web#25303. Contributed by @luixxiul.
+ * Fix the color of the verified E2EE icon on `RoomSummaryCard` ([\#10812](https://github.com/matrix-org/matrix-react-sdk/pull/10812)). Fixes vector-im/element-web#25295. Contributed by @luixxiul.
+ * Fix: No feedback when waiting for the server on a /delete_devices request with SSO ([\#10795](https://github.com/matrix-org/matrix-react-sdk/pull/10795)). Fixes vector-im/element-web#23096. Contributed by @kerryarchibald.
+ * Fix: reveal images when image previews are disabled ([\#10781](https://github.com/matrix-org/matrix-react-sdk/pull/10781)). Fixes vector-im/element-web#25271. Contributed by @kerryarchibald.
+ * Fix accessibility issues around the room list and space panel ([\#10717](https://github.com/matrix-org/matrix-react-sdk/pull/10717)). Fixes vector-im/element-web#13345.
+ * Ensure tooltip contents is linked via aria to the target element ([\#10729](https://github.com/matrix-org/matrix-react-sdk/pull/10729)). Fixes vector-im/customer-retainer#43.
+
+Changes in [1.11.31](https://github.com/vector-im/element-desktop/releases/tag/v1.11.31) (2023-05-10)
+=====================================================================================================
+
+## 🚨 BREAKING CHANGES
+ * If you package Element Desktop with a static sqlcipher, you may need to tweak some build scripts: SQLCIPHER_STATIC became SQLCIPHER_BUNDLED, and OpenSSL is now included too.
+
+## ✨ Features
+ * Start packaging for Debian & Ubuntu aarch64 ([\#895](https://github.com/vector-im/element-desktop/pull/895)).
+ * Use a fully static seshat build ([\#631](https://github.com/vector-im/element-desktop/pull/631)). Contributed by @MatMaul.
+ * Improve Content-Security-Policy ([\#25210](https://github.com/vector-im/element-web/pull/25210)).
+ * Add UIFeature.locationSharing to hide location sharing ([\#10727](https://github.com/matrix-org/matrix-react-sdk/pull/10727)).
+ * Memoize field validation results ([\#10714](https://github.com/matrix-org/matrix-react-sdk/pull/10714)).
+ * Commands for plain text editor ([\#10567](https://github.com/matrix-org/matrix-react-sdk/pull/10567)). Contributed by @alunturner.
+ * Allow 16 lines of text in the rich text editors ([\#10670](https://github.com/matrix-org/matrix-react-sdk/pull/10670)). Contributed by @alunturner.
+ * Bail out of `RoomSettingsDialog` when room is not found ([\#10662](https://github.com/matrix-org/matrix-react-sdk/pull/10662)). Contributed by @kerryarchibald.
+ * Element-R: Populate device list for right-panel ([\#10671](https://github.com/matrix-org/matrix-react-sdk/pull/10671)). Contributed by @florianduros.
+ * Make existing and new issue URLs configurable ([\#10710](https://github.com/matrix-org/matrix-react-sdk/pull/10710)). Fixes vector-im/element-web#24424.
+ * Fix usages of ARIA tabpanel ([\#10628](https://github.com/matrix-org/matrix-react-sdk/pull/10628)). Fixes vector-im/element-web#25016.
+ * Element-R: Starting a DMs with a user ([\#10673](https://github.com/matrix-org/matrix-react-sdk/pull/10673)). Contributed by @florianduros.
+ * ARIA Accessibility improvements ([\#10675](https://github.com/matrix-org/matrix-react-sdk/pull/10675)).
+ * ARIA Accessibility improvements ([\#10674](https://github.com/matrix-org/matrix-react-sdk/pull/10674)).
+ * Add arrow key controls to emoji and reaction pickers ([\#10637](https://github.com/matrix-org/matrix-react-sdk/pull/10637)). Fixes vector-im/element-web#17189.
+ * Translate credits in help about section ([\#10676](https://github.com/matrix-org/matrix-react-sdk/pull/10676)).
+
+## 🐛 Bug Fixes
+ * Fix macos update check exploding ([\#944](https://github.com/vector-im/element-desktop/pull/944)). Fixes #668.
+ * Fix: reveal images when image previews are disabled ([\#10781](https://github.com/matrix-org/matrix-react-sdk/pull/10781)). Fixes vector-im/element-web#25271. Contributed by @kerryarchibald.
+ * Workaround Squirrel.Mac wedging app restart after failed update check ([\#629](https://github.com/vector-im/element-desktop/pull/629)).
+ * Fix autocomplete not resetting properly on message send ([\#10741](https://github.com/matrix-org/matrix-react-sdk/pull/10741)). Fixes vector-im/element-web#25170.
+ * Fix start_sso not working with guests disabled ([\#10720](https://github.com/matrix-org/matrix-react-sdk/pull/10720)). Fixes vector-im/element-web#16624.
+ * Fix soft crash with Element call widgets ([\#10684](https://github.com/matrix-org/matrix-react-sdk/pull/10684)).
+ * Send correct receipt when marking a room as read ([\#10730](https://github.com/matrix-org/matrix-react-sdk/pull/10730)). Fixes vector-im/element-web#25207.
+ * Offload some more waveform processing onto a worker ([\#9223](https://github.com/matrix-org/matrix-react-sdk/pull/9223)). Fixes vector-im/element-web#19756.
+ * Consolidate login errors ([\#10722](https://github.com/matrix-org/matrix-react-sdk/pull/10722)). Fixes vector-im/element-web#17520.
+ * Fix all rooms search generating permalinks to wrong room id ([\#10625](https://github.com/matrix-org/matrix-react-sdk/pull/10625)). Fixes vector-im/element-web#25115.
+ * Posthog properly handle Analytics ID changing from under us ([\#10702](https://github.com/matrix-org/matrix-react-sdk/pull/10702)). Fixes vector-im/element-web#25187.
+ * Fix Clock being read as an absolute time rather than duration ([\#10706](https://github.com/matrix-org/matrix-react-sdk/pull/10706)). Fixes vector-im/element-web#22582.
+ * Properly translate errors in `ChangePassword.tsx` so they show up translated to the user but not in our logs ([\#10615](https://github.com/matrix-org/matrix-react-sdk/pull/10615)). Fixes vector-im/element-web#9597. Contributed by @MadLittleMods.
+ * Honour feature toggles in guest mode ([\#10651](https://github.com/matrix-org/matrix-react-sdk/pull/10651)). Fixes vector-im/element-web#24513. Contributed by @andybalaam.
+ * Fix default content in devtools event sender ([\#10699](https://github.com/matrix-org/matrix-react-sdk/pull/10699)). Contributed by @tulir.
+ * Fix a crash when a call ends while you're in it ([\#10681](https://github.com/matrix-org/matrix-react-sdk/pull/10681)). Fixes vector-im/element-web#25153.
+ * Fix lack of screen reader indication when triggering auto complete ([\#10664](https://github.com/matrix-org/matrix-react-sdk/pull/10664)). Fixes vector-im/element-web#11011.
+ * Fix typing tile duplicating users ([\#10678](https://github.com/matrix-org/matrix-react-sdk/pull/10678)). Fixes vector-im/element-web#25165.
+ * Fix wrong room topic tooltip position ([\#10667](https://github.com/matrix-org/matrix-react-sdk/pull/10667)). Fixes vector-im/element-web#25158.
+ * Fix create subspace dialog not working ([\#10652](https://github.com/matrix-org/matrix-react-sdk/pull/10652)). Fixes vector-im/element-web#24882.
+
 Changes in [1.11.30](https://github.com/vector-im/element-desktop/releases/tag/v1.11.30) (2023-04-25)
 =====================================================================================================
 

dockerbuild/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
   libsecret-1-dev libgnome-keyring-dev \
   libopenjp2-tools \
   # Used by github actions \
-  jq grep \
+  jq grep file \
   # Used by seshat (when not SQLCIPHER_STATIC) \
   libsqlcipher-dev && \
   # git-lfs

dockerbuild/aarch64/.cargo/config.toml

@@ -0,0 +1,3 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+rustflags = ["-L/usr/lib/aarch64-linux-gnu"]

dockerbuild/aarch64/.env

@@ -0,0 +1,11 @@
+AS=/usr/bin/aarch64-linux-gnu-as
+STRIP=/usr/bin/aarch64-linux-gnu-strip
+AR=/usr/bin/aarch64-linux-gnu-ar
+CC=/usr/bin/aarch64-linux-gnu-gcc
+CPP=/usr/bin/aarch64-linux-gnu-cpp
+CXX=/usr/bin/aarch64-linux-gnu-g++
+LD=/usr/bin/aarch64-linux-gnu-ld
+FC=/usr/bin/aarch64-linux-gnu-gfortran
+PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+CFLAGS=-L/usr/lib/aarch64-linux-gnu
+RUSTFLAGS=-L/usr/lib/aarch64-linux-gnu

docs/native-node-modules.md

@@ -71,9 +71,9 @@ as usual using:
 
 On Windows & macOS we always statically link libsqlcipher for it is not generally available.
 On Linux by default we will use a system package, on debian & ubuntu this is `libsqlcipher0`,
-but this is problematic for some other packages.
-By including `SQLCIPHER_STATIC=1` in the build environment, the build scripts will statically link sqlcipher,
-note that this will want a `libcrypto1.1` shared library available in the system.
+but this is problematic for some other packages, and we found that it may crashes for unknown reasons.
+By including `SQLCIPHER_BUNDLED=1` in the build environment, the build scripts will fully statically
+link sqlcipher, including a static build of OpenSSL.
 
 More info can be found at https://github.com/matrix-org/seshat/issues/102
 and https://github.com/vector-im/element-web/issues/20926.

element.io/nightly/control.template

@@ -1,12 +0,0 @@
-Package: element-nightly
-License: Apache-2.0
-Vendor: support@element.io
-Architecture: amd64
-Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
-Recommends: libsqlcipher0, element-io-archive-keyring
-Section: net
-Priority: extra
-Homepage: https://element.io/
-Description:
- riot.im A feature-rich client for Matrix.org (nightly unstable build).

element.io/nightly/riot-nightly_2020071502_all/DEBIAN/control

@@ -1,9 +0,0 @@
-Package: riot-nightly
-Version: 2020071502
-Depends: element-nightly
-Maintainer: packages@element.io
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.

element.io/release/control.template

@@ -1,14 +0,0 @@
-Package: element-desktop
-License: Apache-2.0
-Vendor: support@element.io
-Architecture: amd64
-Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
-Recommends: libsqlcipher0, element-io-archive-keyring
-Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
-Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
-Section: net
-Priority: extra
-Homepage: https://element.io/
-Description:
-  A feature-rich client for Matrix.org

element.io/release/riot-desktop_1.7.0_all/DEBIAN/control

@@ -1,9 +0,0 @@
-Package: riot-desktop
-Version: 1.7.0
-Depends: element-desktop
-Maintainer: packages@element.io
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.

hak/keytar/build.ts

@@ -27,7 +27,7 @@ export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: Dependency
     await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             path.join(moduleInfo.nodeModuleBinDir, "node-gyp" + (hakEnv.isWin() ? ".cmd" : "")),
-            ["rebuild"],
+            ["rebuild", "--arch", hakEnv.getTargetArch()],
             {
                 cwd: moduleInfo.moduleBuildDir,
                 env,

hak/matrix-seshat/build.ts

@@ -14,303 +14,46 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import path from "path";
 import childProcess from "child_process";
-import mkdirp from "mkdirp";
-import fsExtra from "fs-extra";
 
 import HakEnv from "../../scripts/hak/hakEnv";
 import { DependencyInfo } from "../../scripts/hak/dep";
 
-type WinConfiguration =
-    | "VC-WIN32"
-    | "VC-WIN64A"
-    | "VC-WIN64-ARM"
-    | "VC-WIN64-CLANGASM-ARM"
-    | "VC-CLANG-WIN64-CLANGASM-ARM"
-    | "VC-WIN32-HYBRIDCRT"
-    | "VC-WIN64A-HYBRIDCRT";
-
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.isWin()) {
-        await buildOpenSslWin(hakEnv, moduleInfo);
-        await buildSqlCipherWin(hakEnv, moduleInfo);
-    } else if (hakEnv.wantsStaticSqlCipherUnix()) {
-        await buildSqlCipherUnix(hakEnv, moduleInfo);
-    }
-    await buildMatrixSeshat(hakEnv, moduleInfo);
-}
-
-async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
-
-    let openSslArch: WinConfiguration;
-    switch (hakEnv.getTargetArch()) {
-        case "x64":
-            openSslArch = "VC-WIN64A";
-            break;
-        case "ia32":
-            openSslArch = "VC-WIN32";
-            break;
-        case "arm64":
-            openSslArch = "VC-WIN64-ARM";
-            break;
-    }
-
-    console.log("Building openssl in " + openSslDir);
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn(
-            "perl",
-            [
-                "Configure",
-                "--prefix=" + moduleInfo.depPrefix,
-                // sqlcipher only uses about a tiny part of openssl. We link statically
-                // so will only pull in the symbols we use, but we may as well turn off
-                // as much as possible to save on build time.
-                "no-afalgeng",
-                "no-capieng",
-                "no-cms",
-                "no-ct",
-                "no-deprecated",
-                "no-dgram",
-                "no-dso",
-                "no-ec",
-                "no-ec2m",
-                "no-gost",
-                "no-nextprotoneg",
-                "no-ocsp",
-                "no-sock",
-                "no-srp",
-                "no-srtp",
-                "no-tests",
-                "no-ssl",
-                "no-tls",
-                "no-dtls",
-                "no-shared",
-                "no-aria",
-                "no-camellia",
-                "no-cast",
-                "no-chacha",
-                "no-cmac",
-                "no-des",
-                "no-dh",
-                "no-dsa",
-                "no-ecdh",
-                "no-ecdsa",
-                "no-idea",
-                "no-md4",
-                "no-mdc2",
-                "no-ocb",
-                "no-poly1305",
-                "no-rc2",
-                "no-rc4",
-                "no-rmd160",
-                "no-scrypt",
-                "no-seed",
-                "no-siphash",
-                "no-sm2",
-                "no-sm3",
-                "no-sm4",
-                "no-whirlpool",
-                openSslArch,
-            ],
-            {
-                cwd: openSslDir,
-                stdio: "inherit",
-            },
-        );
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["build_libs"], {
-            cwd: openSslDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["install_dev"], {
-            cwd: openSslDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-}
-
-async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-    const buildDir = path.join(sqlCipherDir, "bld");
-
-    await mkdirp(buildDir);
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("nmake", ["/f", path.join("..", "Makefile.msc"), "libsqlite3.lib", "TOP=.."], {
-            cwd: buildDir,
-            stdio: "inherit",
-            env: Object.assign({}, process.env, {
-                CCOPTS: "-DSQLITE_HAS_CODEC -I" + path.join(moduleInfo.depPrefix, "include"),
-                LTLIBPATHS: "/LIBPATH:" + path.join(moduleInfo.depPrefix, "lib"),
-                LTLIBS: "libcrypto.lib",
-            }),
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await fsExtra.copy(path.join(buildDir, "libsqlite3.lib"), path.join(moduleInfo.depPrefix, "lib", "sqlcipher.lib"));
-
-    await fsExtra.copy(path.join(buildDir, "sqlite3.h"), path.join(moduleInfo.depPrefix, "include", "sqlcipher.h"));
-}
-
-async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-
-    const args = [
-        "--prefix=" + moduleInfo.depPrefix + "",
-        "--enable-tempstore=yes",
-        "--enable-shared=no",
-        "--enable-tcl=no",
-    ];
-
-    if (hakEnv.isMac()) {
-        args.push("--with-crypto-lib=commoncrypto");
-    }
-
-    if (hakEnv.wantsStaticSqlCipherUnix()) {
-        args.push("--enable-tcl=no");
-
-        if (hakEnv.isLinux()) {
-            args.push("--with-pic=yes");
-        }
-    }
-
-    if (!hakEnv.isHost()) {
-        // In the nonsense world of `configure`, it is assumed you are building
-        // a compiler like `gcc`, so the `host` option actually means the target
-        // the build output runs on.
-        args.push(`--host=${hakEnv.getTargetId()}`);
-    }
-
-    const cflags = ["-DSQLITE_HAS_CODEC"];
-
-    if (!hakEnv.isHost()) {
-        // `clang` uses more logical option naming.
-        cflags.push(`--target=${hakEnv.getTargetId()}`);
-    }
-
-    if (cflags.length) {
-        args.push(`CFLAGS=${cflags.join(" ")}`);
-    }
-
-    const ldflags: string[] = [];
-
-    if (hakEnv.isMac()) {
-        ldflags.push("-framework Security");
-        ldflags.push("-framework Foundation");
-    }
-
-    if (ldflags.length) {
-        args.push(`LDFLAGS=${ldflags.join(" ")}`);
-    }
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn(path.join(sqlCipherDir, "configure"), args, {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("make", [], {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    await new Promise<void>((resolve, reject) => {
-        const proc = childProcess.spawn("make", ["install"], {
-            cwd: sqlCipherDir,
-            stdio: "inherit",
-        });
-        proc.on("exit", (code) => {
-            code ? reject(code) : resolve();
-        });
-    });
-}
-
-async function buildMatrixSeshat(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    // seshat now uses n-api so we shouldn't need to specify a node version to
-    // build against, but it does seems to still need something in here, so leaving
-    // it for now: we should confirm how much of this it still actually needs.
     const env = hakEnv.makeGypEnv();
 
-    if (!hakEnv.isLinux() || hakEnv.wantsStaticSqlCipherUnix()) {
-        Object.assign(env, {
-            SQLCIPHER_STATIC: 1,
-            SQLCIPHER_LIB_DIR: path.join(moduleInfo.depPrefix, "lib"),
-            SQLCIPHER_INCLUDE_DIR: path.join(moduleInfo.depPrefix, "include"),
-        });
-    }
-
-    if (hakEnv.isLinux() && hakEnv.wantsStaticSqlCipherUnix()) {
-        // Ensure Element uses the statically-linked seshat build, and prevent other applications
-        // from attempting to use this one. Detailed explanation:
-        //
-        // RUSTFLAGS
-        //     An environment variable containing a list of arguments to pass to rustc.
-        // -Clink-arg=VALUE
-        //     A rustc argument to pass a single argument to the linker.
-        // -Wl,
-        //     gcc syntax to pass an argument (from gcc) to the linker (ld).
-        // -Bsymbolic:
-        //     Prefer local/statically linked symbols over those in the environment.
-        //     Prevent overriding native libraries by LD_PRELOAD etc.
-        // --exclude-libs ALL
-        //     Prevent symbols from being exported by any archive libraries.
-        //     Reduces output filesize and prevents being dynamically linked against.
-        env.RUSTFLAGS = "-Clink-arg=-Wl,-Bsymbolic -Clink-arg=-Wl,--exclude-libs,ALL";
-    }
-
-    if (hakEnv.isWin()) {
-        env.RUSTFLAGS = "-Ctarget-feature=+crt-static -Clink-args=libcrypto.lib";
-        // Note that in general, you can specify targets in Rust without having to have
-        // the matching toolchain, however for this, cargo gets confused when building
-        // the build scripts since they run on the host, but vcvarsall.bat sets the c
-        // compiler in the path to be the one for the target, so we just use the matching
-        // toolchain for the target architecture which makes everything happy.
-        env.RUSTUP_TOOLCHAIN = `stable-${hakEnv.getTargetId()}`;
-    }
-
     if (!hakEnv.isHost()) {
         env.CARGO_BUILD_TARGET = hakEnv.getTargetId();
     }
 
-    console.log("Running neon with env", env);
+    console.log("Running yarn install");
     await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
-            path.join(moduleInfo.nodeModuleBinDir, "neon" + (hakEnv.isWin() ? ".cmd" : "")),
-            ["build", "--release"],
+            "yarn" + (hakEnv.isWin() ? ".cmd" : ""),
+            ["install"],
             {
                 cwd: moduleInfo.moduleBuildDir,
                 env,
+                shell: true,
+                stdio: "inherit",
+            },
+        );
+        proc.on("exit", (code) => {
+            code ? reject(code) : resolve();
+        });
+    });
+
+    const buildTarget = hakEnv.wantsStaticSqlCipher() ? "build-bundled" : "build";
+
+    console.log("Running yarn build");
+    await new Promise<void>((resolve, reject) => {
+        const proc = childProcess.spawn(
+            "yarn" + (hakEnv.isWin() ? ".cmd" : ""),
+            ["run", buildTarget],
+            {
+                cwd: moduleInfo.moduleBuildDir,
+                env,
+                shell: true,
                 stdio: "inherit",
             },
         );

hak/matrix-seshat/check.ts

@@ -21,23 +21,6 @@ import HakEnv from "../../scripts/hak/hakEnv";
 import { DependencyInfo } from "../../scripts/hak/dep";
 
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.wantsStaticSqlCipher()) {
-        // of course tcl doesn't have a --version
-        await new Promise<void>((resolve, reject) => {
-            const proc = childProcess.spawn("tclsh", [], {
-                stdio: ["pipe", "ignore", "ignore"],
-            });
-            proc.on("exit", (code) => {
-                if (code !== 0) {
-                    reject("Can't find tclsh - have you installed TCL?");
-                } else {
-                    resolve();
-                }
-            });
-            proc.stdin.end();
-        });
-    }
-
     const tools = [
         ["rustc", "--version"],
         ["python", "--version"], // node-gyp uses python for reasons beyond comprehension
@@ -70,7 +53,7 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
     await new Promise((resolve, reject) => {
         const rustc = childProcess.execFile(
             "rustc",
-            ["--target", hakEnv.getTargetId(), "-o", "tmp", "-"],
+            ["--target", hakEnv.getTargetId(), "--emit=obj", "-o", "tmp", "-"],
             (err, out) => {
                 if (err) {
                     reject(
@@ -86,6 +69,8 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
             },
         );
         rustc.stdin!.write("fn main() {}");
+        rustc.stdout!.pipe(process.stdout);
+        rustc.stderr!.pipe(process.stderr);
         rustc.stdin!.end();
     });
 }

hak/matrix-seshat/fetchDeps.ts

@@ -1,129 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import path from "path";
-import childProcess from "child_process";
-import fs from "fs";
-import fsProm from "fs/promises";
-import tar from "tar";
-import fetch from "node-fetch";
-import { promises as stream } from "stream";
-
-import HakEnv from "../../scripts/hak/hakEnv";
-import { DependencyInfo } from "../../scripts/hak/dep";
-
-async function download(url: string, filename: string): Promise<void> {
-    const resp = await fetch(url);
-    if (!resp.ok) throw new Error(`unexpected response ${resp.statusText}`);
-    if (!resp.body) throw new Error(`unexpected response has no body ${resp.statusText}`);
-    await stream.pipeline(resp.body, fs.createWriteStream(filename));
-}
-
-export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    if (hakEnv.wantsStaticSqlCipher()) {
-        await getSqlCipher(hakEnv, moduleInfo);
-    }
-
-    if (hakEnv.isWin()) {
-        await getOpenSsl(hakEnv, moduleInfo);
-    }
-}
-
-async function getSqlCipher(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
-
-    let haveSqlcipher: boolean;
-    try {
-        await fsProm.stat(sqlCipherDir);
-        haveSqlcipher = true;
-    } catch (e) {
-        haveSqlcipher = false;
-    }
-
-    if (haveSqlcipher) return;
-
-    const sqlCipherTarball = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}.tar.gz`);
-    let haveSqlcipherTar: boolean;
-    try {
-        await fsProm.stat(sqlCipherTarball);
-        haveSqlcipherTar = true;
-    } catch (e) {
-        haveSqlcipherTar = false;
-    }
-    if (!haveSqlcipherTar) {
-        await download(`https://github.com/sqlcipher/sqlcipher/archive/v${version}.tar.gz`, sqlCipherTarball);
-    }
-
-    // Extract the tarball to per-target directories, then we avoid cross-contaiminating archs
-    await tar.x({
-        file: sqlCipherTarball,
-        cwd: moduleInfo.moduleTargetDotHakDir,
-    });
-
-    if (hakEnv.isWin()) {
-        // On Windows, we need to patch the makefile because it forces TEMP_STORE to
-        // default to files (1) but the README specifically says you '*must*' set it
-        // set it to 2 (default to memory).
-        const patchFile = path.join(moduleInfo.moduleHakDir, `sqlcipher-${version}-win.patch`);
-
-        await new Promise<void>((resolve, reject) => {
-            const readStream = fs.createReadStream(patchFile);
-
-            const proc = childProcess.spawn("patch", ["-p1"], {
-                cwd: sqlCipherDir,
-                stdio: ["pipe", "inherit", "inherit"],
-            });
-            proc.on("exit", (code) => {
-                code ? reject(code) : resolve();
-            });
-            readStream.pipe(proc.stdin);
-        });
-    }
-}
-
-async function getOpenSsl(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
-
-    let haveOpenSsl: boolean;
-    try {
-        await fsProm.stat(openSslDir);
-        haveOpenSsl = true;
-    } catch (e) {
-        haveOpenSsl = false;
-    }
-
-    if (haveOpenSsl) return;
-
-    const openSslTarball = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}.tar.gz`);
-    let haveOpenSslTar: boolean;
-    try {
-        await fsProm.stat(openSslTarball);
-        haveOpenSslTar = true;
-    } catch (e) {
-        haveOpenSslTar = false;
-    }
-    if (!haveOpenSslTar) {
-        await download(`https://www.openssl.org/source/openssl-${version}.tar.gz`, openSslTarball);
-    }
-
-    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);
-    await tar.x({
-        file: openSslTarball,
-        cwd: moduleInfo.moduleTargetDotHakDir,
-    });
-}

hak/matrix-seshat/hak.json

@@ -1,13 +1,7 @@
 {
     "scripts": {
         "check": "check.ts",
-        "fetchDeps": "fetchDeps.ts",
         "build": "build.ts"
     },
-    "prune": "native",
-    "copy": "native/index.node",
-    "dependencies": {
-        "openssl": "1.1.1f",
-        "sqlcipher": "4.3.0"
-    }
+    "copy": "index.node"
 }

hak/matrix-seshat/sqlcipher-4.3.0-win.patch

@@ -1,14 +0,0 @@
-diff -Nur sqlcipher-4.3.0-orig/Makefile.msc sqlcipher-4.3.0-mod/Makefile.msc
---- sqlcipher-4.3.0-orig/Makefile.msc	2019-12-20 16:40:26.000000000 +0000
-+++ sqlcipher-4.3.0-mod/Makefile.msc	2020-02-14 11:31:39.000000000 +0000
-@@ -985,8 +985,8 @@
- # default to file, 2 to default to memory, and 3 to force temporary
- # tables to always be in memory.
- #
--TCC = $(TCC) -DSQLITE_TEMP_STORE=1
--RCC = $(RCC) -DSQLITE_TEMP_STORE=1
-+TCC = $(TCC) -DSQLITE_TEMP_STORE=2
-+RCC = $(RCC) -DSQLITE_TEMP_STORE=2
- 
- # Enable/disable loadable extensions, and other optional features
- # based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).

hak/tsconfig.json

@@ -5,7 +5,7 @@
         "target": "es2016",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2019"]
+        "lib": ["es2020"]
     },
     "include": ["../scripts/@types/*.d.ts", "./**/*.ts"],
     "ts-node": {

package.json

@@ -1,181 +1,210 @@
 {
-  "name": "element-desktop",
-  "productName": "Element",
-  "main": "lib/electron-main.js",
-  "version": "1.11.30",
-  "description": "A feature-rich client for Matrix.org",
-  "author": "Element",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/vector-im/element-desktop"
-  },
-  "license": "Apache-2.0",
-  "files": [],
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "i18n": "matrix-gen-i18n",
-    "prunei18n": "matrix-prune-i18n",
-    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-    "mkdirs": "mkdirp packages deploys",
-    "fetch": "yarn run mkdirs && ts-node scripts/fetch-package.ts",
-    "asar-webapp": "asar p webapp webapp.asar",
-    "start": "yarn run build:ts && yarn run build:res && electron .",
-    "lint": "yarn lint:types && yarn lint:js",
-    "lint:js": "yarn lint:js:src && yarn lint:js:test && yarn lint:js:scripts && yarn lint:js:hak",
-    "lint:js:src": "eslint --max-warnings 0 src",
-    "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js test",
-    "lint:js:scripts": "eslint --max-warnings 0 --config .eslintrc-scripts.js scripts",
-    "lint:js:hak": "eslint --max-warnings 0 --config .eslintrc-hak.js hak",
-    "lint:js-fix": "yarn lint:js-fix:src &&yarn lint:js-fix:test && yarn lint:js-fix:scripts && yarn lint:js-fix:hak",
-    "lint:js-fix:src": "eslint --fix --max-warnings 0 src",
-    "lint:js-fix:test": "eslint --fix --max-warnings 0 --config .eslintrc-test.js test",
-    "lint:js-fix:scripts": "eslint --fix --max-warnings 0 --config .eslintrc-scripts.js scripts",
-    "lint:js-fix:hak": "eslint --fix --max-warnings 0 --config .eslintrc-hak.js hak",
-    "lint:types": "yarn lint:types:src && yarn lint:types:test && yarn lint:types:scripts && yarn lint:types:hak",
-    "lint:types:src": "tsc --noEmit",
-    "lint:types:test": "tsc --noEmit -p test/tsconfig.json",
-    "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
-    "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
-    "build:native": "yarn run hak",
-    "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
-    "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
-    "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
-    "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
-    "build": "yarn run build:ts && yarn run build:res && electron-builder",
-    "build:ts": "tsc",
-    "build:res": "ts-node scripts/copy-res.ts",
-    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
-    "docker:build:native": "scripts/in-docker.sh yarn run hak",
-    "docker:build": "scripts/in-docker.sh yarn run build",
-    "docker:install": "scripts/in-docker.sh yarn install",
-    "clean": "rimraf webapp.asar dist packages deploys lib",
-    "hak": "ts-node scripts/hak/index.ts",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@sentry/electron": "^4.3.0",
-    "auto-launch": "^5.0.5",
-    "counterpart": "^0.18.6",
-    "electron-clear-data": "^1.0.5",
-    "electron-store": "^8.0.2",
-    "electron-window-state": "^5.0.3",
-    "minimist": "^1.2.6",
-    "node-fetch": "^2",
-    "png-to-ico": "^2.1.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.18.10",
-    "@babel/preset-env": "^7.18.10",
-    "@babel/preset-typescript": "^7.18.6",
-    "@electron/asar": "^3.2.3",
-    "@electron/notarize": "^1.2.3",
-    "@types/auto-launch": "^5.0.1",
-    "@types/counterpart": "^0.18.1",
-    "@types/detect-libc": "^1.0.0",
-    "@types/jest": "^29.0.0",
-    "@types/minimist": "^1.2.1",
-    "@types/mkdirp": "^1.0.2",
-    "@types/node": "16.18.23",
-    "@types/pacote": "^11.1.1",
-    "@types/tar": "^6.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "allchange": "^1.0.6",
-    "app-builder-lib": "24.0.0",
-    "babel-jest": "^29.0.0",
-    "chokidar": "^3.5.2",
-    "detect-libc": "^1.0.3",
-    "electron": "^24.0.0",
-    "electron-builder": "24.0.0",
-    "electron-builder-squirrel-windows": "24.1.2",
-    "electron-devtools-installer": "^3.2.0",
-    "eslint": "^8.26.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^1.0.0",
-    "eslint-plugin-unicorn": "^46.0.0",
-    "expect-playwright": "^0.8.0",
-    "find-npm-prefix": "^1.0.2",
-    "fs-extra": "^11.0.0",
-    "glob": "^9.0.0",
-    "jest": "^29.0.0",
-    "matrix-web-i18n": "^1.3.0",
-    "mkdirp": "^2.0.0",
-    "node-pre-gyp": "^0.17.0",
-    "pacote": "^15.0.0",
-    "playwright": "^1.25.0",
-    "prettier": "^2.8.1",
-    "rimraf": "^4.4.1",
-    "tar": "^6.1.2",
-    "ts-jest": "^29.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "5.0.3"
-  },
-  "hakDependencies": {
-    "matrix-seshat": "^2.3.3",
-    "keytar": "^7.9.0"
-  },
-  "resolutions": {
-    "@types/node": "16.18.23"
-  },
-  "build": {
-    "appId": "im.riot.app",
-    "asarUnpack": "**/*.node",
-    "files": [
-      "package.json",
-      {
-        "from": ".hak/hakModules",
-        "to": "node_modules"
-      },
-      "lib/**"
-    ],
-    "extraResources": [
-      {
-        "from": "res/img",
-        "to": "img"
-      },
-      "webapp.asar"
-    ],
-    "linux": {
-      "target": [
-        "tar.gz",
-        "deb"
-      ],
-      "category": "Network;InstantMessaging;Chat",
-      "maintainer": "support@element.io"
+    "name": "element-desktop",
+    "productName": "Element",
+    "main": "lib/electron-main.js",
+    "version": "1.11.32",
+    "description": "A feature-rich client for Matrix.org",
+    "author": "Element",
+    "homepage": "https://element.io",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/vector-im/element-desktop"
     },
-    "mac": {
-      "category": "public.app-category.social-networking",
-      "darkModeSupport": true,
-      "gatekeeperAssess": true
+    "license": "Apache-2.0",
+    "files": [],
+    "engines": {
+        "node": ">=16.0.0"
     },
-    "win": {
-      "target": [
-        "squirrel"
-      ]
+    "scripts": {
+        "i18n": "matrix-gen-i18n",
+        "prunei18n": "matrix-prune-i18n",
+        "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+        "mkdirs": "mkdirp packages deploys",
+        "fetch": "yarn run mkdirs && ts-node scripts/fetch-package.ts",
+        "asar-webapp": "asar p webapp webapp.asar",
+        "start": "yarn run build:ts && yarn run build:res && electron .",
+        "lint": "yarn lint:types && yarn lint:js",
+        "lint:js": "yarn lint:js:src && yarn lint:js:test && yarn lint:js:scripts && yarn lint:js:hak",
+        "lint:js:src": "eslint --max-warnings 0 src",
+        "lint:js:test": "eslint --max-warnings 0 --config .eslintrc-test.js test",
+        "lint:js:scripts": "eslint --max-warnings 0 --config .eslintrc-scripts.js scripts",
+        "lint:js:hak": "eslint --max-warnings 0 --config .eslintrc-hak.js hak",
+        "lint:js-fix": "yarn lint:js-fix:src &&yarn lint:js-fix:test && yarn lint:js-fix:scripts && yarn lint:js-fix:hak",
+        "lint:js-fix:src": "eslint --fix --max-warnings 0 src",
+        "lint:js-fix:test": "eslint --fix --max-warnings 0 --config .eslintrc-test.js test",
+        "lint:js-fix:scripts": "eslint --fix --max-warnings 0 --config .eslintrc-scripts.js scripts",
+        "lint:js-fix:hak": "eslint --fix --max-warnings 0 --config .eslintrc-hak.js hak",
+        "lint:types": "yarn lint:types:src && yarn lint:types:test && yarn lint:types:scripts && yarn lint:types:hak",
+        "lint:types:src": "tsc --noEmit",
+        "lint:types:test": "tsc --noEmit -p test/tsconfig.json",
+        "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
+        "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
+        "build:native": "yarn run hak",
+        "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
+        "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
+        "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
+        "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
+        "build": "yarn run build:ts && yarn run build:res && electron-builder",
+        "build:ts": "tsc",
+        "build:res": "ts-node scripts/copy-res.ts",
+        "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
+        "docker:build:native": "scripts/in-docker.sh yarn run hak",
+        "docker:build": "scripts/in-docker.sh yarn run build",
+        "docker:install": "scripts/in-docker.sh yarn install",
+        "clean": "rimraf webapp.asar dist packages deploys lib",
+        "hak": "ts-node scripts/hak/index.ts",
+        "test": "jest"
     },
-    "directories": {
-      "output": "dist"
+    "dependencies": {
+        "@sentry/electron": "^4.3.0",
+        "auto-launch": "^5.0.5",
+        "counterpart": "^0.18.6",
+        "electron-clear-data": "^1.0.5",
+        "electron-store": "^8.0.2",
+        "electron-window-state": "^5.0.3",
+        "minimist": "^1.2.6",
+        "node-fetch": "^2",
+        "png-to-ico": "^2.1.1"
     },
-    "protocols": [
-      {
-        "name": "element",
-        "schemes": [
-          "element"
+    "devDependencies": {
+        "@babel/core": "^7.18.10",
+        "@babel/preset-env": "^7.18.10",
+        "@babel/preset-typescript": "^7.18.6",
+        "@electron/asar": "^3.2.3",
+        "@electron/notarize": "^1.2.3",
+        "@types/auto-launch": "^5.0.1",
+        "@types/counterpart": "^0.18.1",
+        "@types/detect-libc": "^1.0.0",
+        "@types/jest": "^29.0.0",
+        "@types/minimist": "^1.2.1",
+        "@types/mkdirp": "^1.0.2",
+        "@types/node": "16.18.30",
+        "@types/pacote": "^11.1.1",
+        "@types/tar": "^6.1.3",
+        "@typescript-eslint/eslint-plugin": "^5.42.0",
+        "@typescript-eslint/parser": "^5.42.0",
+        "allchange": "^1.0.6",
+        "app-builder-lib": "24.4.0",
+        "babel-jest": "^29.0.0",
+        "chokidar": "^3.5.2",
+        "detect-libc": "^1.0.3",
+        "electron": "^24.0.0",
+        "electron-builder": "24.4.0",
+        "electron-builder-squirrel-windows": "24.4.0",
+        "electron-devtools-installer": "^3.2.0",
+        "eslint": "^8.26.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-import": "^2.25.4",
+        "eslint-plugin-matrix-org": "^1.0.0",
+        "eslint-plugin-unicorn": "^47.0.0",
+        "expect-playwright": "^0.8.0",
+        "find-npm-prefix": "^1.0.2",
+        "fs-extra": "^11.0.0",
+        "glob": "^10.0.0",
+        "jest": "^29.0.0",
+        "matrix-web-i18n": "^1.3.0",
+        "mkdirp": "^3.0.0",
+        "node-pre-gyp": "^0.17.0",
+        "pacote": "^15.0.0",
+        "playwright": "^1.25.0",
+        "prettier": "^2.8.1",
+        "rimraf": "^5.0.0",
+        "tar": "^6.1.2",
+        "ts-jest": "^29.0.0",
+        "ts-node": "^10.9.1",
+        "typescript": "5.0.4"
+    },
+    "hakDependencies": {
+        "matrix-seshat": "^3.0.1",
+        "keytar": "^7.9.0"
+    },
+    "resolutions": {
+        "@types/node": "16.18.30"
+    },
+    "build": {
+        "appId": "im.riot.app",
+        "asarUnpack": "**/*.node",
+        "files": [
+            "package.json",
+            {
+                "from": ".hak/hakModules",
+                "to": "node_modules"
+            },
+            "lib/**"
+        ],
+        "extraResources": [
+            {
+                "from": "res/img",
+                "to": "img"
+            },
+            "webapp.asar"
+        ],
+        "linux": {
+            "target": [
+                "tar.gz",
+                "deb"
+            ],
+            "category": "Network;InstantMessaging;Chat",
+            "maintainer": "support@element.io",
+            "icon": "build/icons"
+        },
+        "deb": {
+            "packageCategory": "net",
+            "depends": [
+                "libgtk-3-0",
+                "libnotify4",
+                "libnss3",
+                "libxss1",
+                "libxtst6",
+                "xdg-utils",
+                "libatspi2.0-0",
+                "libuuid1",
+                "libsecret-1-0",
+                "libasound2",
+                "libgbm1"
+            ],
+            "recommends": [
+                "libsqlcipher0",
+                "element-io-archive-keyring"
+            ]
+        },
+        "mac": {
+            "category": "public.app-category.social-networking",
+            "darkModeSupport": true,
+            "hardenedRuntime": true,
+            "gatekeeperAssess": true,
+            "entitlements": "./build/entitlements.mac.plist",
+            "icon": "build/icons/icon.icns"
+        },
+        "win": {
+            "target": [
+                "squirrel"
+            ],
+            "signingHashAlgorithms": [
+                "sha256"
+            ],
+            "icon": "build/icons/icon.ico"
+        },
+        "directories": {
+            "output": "dist"
+        },
+        "protocols": [
+            {
+                "name": "element",
+                "schemes": [
+                    "element"
+                ]
+            }
         ]
-      }
-    ]
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "testMatch": [
-      "<rootDir>/test/**/*-test.[jt]s?(x)"
-    ],
-    "setupFilesAfterEnv": [
-      "expect-playwright"
-    ]
-  }
+    },
+    "jest": {
+        "testEnvironment": "node",
+        "testMatch": [
+            "<rootDir>/test/**/*-test.[jt]s?(x)"
+        ],
+        "setupFilesAfterEnv": [
+            "expect-playwright"
+        ]
+    }
 }

scripts/generate-builder-config.ts

@@ -13,6 +13,7 @@
  * On Linux:
  *  Replaces spaces in the product name with dashes as spaces in paths can cause issues
  *  Passes --deb-custom-control to build.deb.fpm if specified
+ *  Removes libsqlcipher0 recommended dependency if env SQLCIPHER_BUNDLED is asserted.
  */
 
 import parseArgs from "minimist";
@@ -24,23 +25,16 @@ const ELECTRON_BUILDER_CFG_FILE = "electron-builder.json";
 
 const NIGHTLY_APP_ID = "im.riot.nightly";
 const NIGHTLY_APP_NAME = "element-desktop-nightly";
+const NIGHTLY_DEB_NAME = "element-nightly";
 
 const argv = parseArgs<{
     "nightly"?: string;
     "signtool-thumbprint"?: string;
     "signtool-subject-name"?: string;
     "notarytool-team-id"?: string;
-    "deb-custom-control"?: string;
     "deb-changelog"?: string;
 }>(process.argv.slice(2), {
-    string: [
-        "nightly",
-        "deb-custom-control",
-        "deb-changelog",
-        "signtool-thumbprint",
-        "signtool-subject-name",
-        "notarytool-team-id",
-    ],
+    string: ["nightly", "deb-changelog", "signtool-thumbprint", "signtool-subject-name", "notarytool-team-id"],
 });
 
 type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
@@ -50,12 +44,14 @@ interface PackageBuild extends DeepWriteable<Omit<Configuration, "extraMetadata"
         productName?: string;
         name?: string;
         version?: string;
+        description?: string;
     };
 }
 
 interface Package {
     build: PackageBuild;
     productName: string;
+    description: string;
 }
 
 async function main(): Promise<number | void> {
@@ -66,13 +62,18 @@ async function main(): Promise<number | void> {
         ...pkg.build,
         extraMetadata: {
             productName: pkg.productName,
+            description: pkg.description,
         },
     };
 
+    if (!cfg.deb!.fpm) cfg.deb!.fpm = [];
+
     if (argv.nightly) {
         cfg.appId = NIGHTLY_APP_ID;
         cfg.extraMetadata!.productName += " Nightly";
         cfg.extraMetadata!.name = NIGHTLY_APP_NAME;
+        cfg.extraMetadata!.description += " (nightly unstable build)";
+        cfg.deb!.fpm!.push("--name", NIGHTLY_DEB_NAME);
 
         let version = argv.nightly;
         if (os.platform() === "win32") {
@@ -84,10 +85,12 @@ async function main(): Promise<number | void> {
             version = "0.0.1-nightly." + version;
         }
         cfg.extraMetadata!.version = version;
+    } else {
+        cfg.deb!.fpm!.push("--deb-field", "Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)");
+        cfg.deb!.fpm!.push("--deb-field", "Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)");
     }
 
     if (argv["signtool-thumbprint"] && argv["signtool-subject-name"]) {
-        cfg.win!.signingHashAlgorithms = ["sha256"];
         cfg.win!.certificateSubjectName = argv["signtool-subject-name"];
         cfg.win!.certificateSha1 = argv["signtool-thumbprint"];
     }
@@ -103,15 +106,13 @@ async function main(): Promise<number | void> {
         // https://github.com/vector-im/element-web/issues/13171
         cfg.extraMetadata!.productName = cfg.extraMetadata!.productName!.replace(/ /g, "-");
 
-        cfg.deb = {
-            fpm: [],
-        };
-
-        if (argv["deb-custom-control"]) {
-            cfg.deb.fpm!.push(`--deb-custom-control=${argv["deb-custom-control"]}`);
-        }
         if (argv["deb-changelog"]) {
-            cfg.deb.fpm!.push(`--deb-changelog=${argv["deb-changelog"]}`);
+            cfg.deb!.fpm!.push(`--deb-changelog=${argv["deb-changelog"]}`);
+        }
+
+        if (process.env.SQLCIPHER_BUNDLED) {
+            // Remove sqlcipher dependency when using bundled
+            cfg.deb!.recommends = cfg.deb!.recommends?.filter((d) => d !== "libsqlcipher0");
         }
     }
 

scripts/get-version.ts

@@ -0,0 +1,25 @@
+#!/usr/bin/env -S npx ts-node
+
+/*
+ * Checks for the presence of a webapp, inspects its version and prints it
+ */
+
+import { versionFromAsar } from "./set-version";
+
+async function main(): Promise<number> {
+    const version = await versionFromAsar();
+    console.log(version);
+
+    return 0;
+}
+
+if (require.main === module) {
+    main()
+        .then((ret) => {
+            process.exit(ret);
+        })
+        .catch((e) => {
+            console.error(e);
+            process.exit(1);
+        });
+}

scripts/hak/README.md

@@ -62,7 +62,6 @@ Hak is divided into lifecycle stages, in order:
 
 -   fetch - Download and extract the source of the dependency
 -   link - Link the copy of the dependency into your node_modules directory
--   fetchDeps - Fetch & extract any native dependencies required to build the module.
 -   build - The Good Stuff. Configure and build any native dependencies, then the module itself.
 -   copy - Copy the built artifact from the module build directory to the module output directory.
 

scripts/hak/clean.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import path from "path";
-import rimraf from "rimraf";
+import { rimraf } from "rimraf";
 
 import { DependencyInfo } from "./dep";
 import HakEnv from "./hakEnv";

scripts/hak/copy.ts

@@ -17,9 +17,9 @@ limitations under the License.
 import path from "path";
 import fsProm from "fs/promises";
 import childProcess from "child_process";
-import rimraf from "rimraf";
+import { rimraf } from "rimraf";
 import { glob } from "glob";
-import mkdirp from "mkdirp";
+import { mkdirp } from "mkdirp";
 
 import HakEnv from "./hakEnv";
 import { DependencyInfo } from "./dep";

scripts/hak/fetchDeps.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import mkdirp from "mkdirp";
+import { mkdirp } from "mkdirp";
 
 import { DependencyInfo } from "./dep";
 import HakEnv from "./hakEnv";

scripts/hak/hakEnv.ts

@@ -101,11 +101,7 @@ export default class HakEnv {
         });
     }
 
-    public wantsStaticSqlCipherUnix(): boolean {
-        return this.isMac() || process.env.SQLCIPHER_STATIC == "1";
-    }
-
     public wantsStaticSqlCipher(): boolean {
-        return this.isWin() || this.wantsStaticSqlCipherUnix();
+        return !this.isLinux() || process.env.SQLCIPHER_BUNDLED == "1";
     }
 }

scripts/hak/index.ts

@@ -24,17 +24,17 @@ import { DependencyInfo } from "./dep";
 const GENERALCOMMANDS = ["target"];
 
 // These can only be run on specific modules
-const MODULECOMMANDS = ["check", "fetch", "link", "fetchDeps", "build", "copy", "clean"];
+const MODULECOMMANDS = ["check", "fetch", "link", "build", "copy", "clean"];
 
 // Shortcuts for multiple commands at once (useful for building universal binaries
 // because you can run the fetch/fetchDeps/build for each arch and then copy/link once)
 const METACOMMANDS: Record<string, string[]> = {
-    fetchandbuild: ["check", "fetch", "fetchDeps", "build"],
+    fetchandbuild: ["check", "fetch", "build"],
     copyandlink: ["copy", "link"],
 };
 
 // Scripts valid in a hak.json 'scripts' section
-const HAKSCRIPTS = ["check", "fetch", "fetchDeps", "build"];
+const HAKSCRIPTS = ["check", "fetch", "build"];
 
 async function main(): Promise<void> {
     const prefix = await findNpmPrefix(process.cwd());
@@ -113,7 +113,7 @@ async function main(): Promise<void> {
 
     let cmds: string[];
     if (process.argv.length < 3) {
-        cmds = ["check", "fetch", "fetchDeps", "build", "copy", "link"];
+        cmds = ["check", "fetch", "build", "copy", "link"];
     } else if (METACOMMANDS[process.argv[2]]) {
         cmds = METACOMMANDS[process.argv[2]];
     } else {

scripts/tsconfig.json

@@ -7,7 +7,7 @@
         "module": "commonjs",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2019", "dom"]
+        "lib": ["es2020", "dom"]
     },
     "include": ["../src/@types", "./**/*.ts"],
     "ts-node": {

src/i18n/strings/el.json

@@ -42,5 +42,6 @@
     "Save image as...": "Αποθήκευση εικόνας ως...",
     "Copy link address": "Αντιγραφή διεύθυνσης συνδέσμου",
     "Copy image address": "Αντιγραφή διεύθυνσης εικόνας",
-    "Copy image": "Αντιγραφή εικόνας"
+    "Copy image": "Αντιγραφή εικόνας",
+    "Close %(brand)s": "Κλείσιμο %(brand)s"
 }

src/i18n/strings/pl.json

@@ -4,9 +4,9 @@
     "The image failed to save": "Obraz nie został zapisany",
     "Failed to save image": "Nie udało się zapisać obrazu",
     "Save image as...": "Zapisz obraz jako...",
-    "Copy link address": "Skopiuj adres łącza",
-    "Copy email address": "Skopiuj adres email",
-    "Copy image": "Skopiuj obraz",
+    "Copy link address": "Kopiuj adres odnośnika",
+    "Copy email address": "Kopiuj adres e-mail",
+    "Copy image": "Kopiuj obraz",
     "File": "Plik",
     "Zoom": "Powiększenie",
     "Stop Speaking": "Przestań mówić",
@@ -20,27 +20,28 @@
     "Element Help": "Pomoc Element",
     "Help": "Pomoc",
     "Close": "Zamknij",
-    "Minimize": "Zminimalizuj",
+    "Minimize": "Minimalizuj",
     "Window": "Okno",
     "Toggle Developer Tools": "Przełącz na narzędzia deweloperskie",
     "Toggle Full Screen": "Przełącz na pełny ekran",
     "Preferences": "Preferencje",
     "Zoom Out": "Pomniejsz",
     "Zoom In": "Powiększ",
-    "Actual Size": "Rzeczywisty rozmiar",
+    "Actual Size": "Rozmiar rzeczywisty",
     "View": "Pokaż",
     "Select All": "Zaznacz wszystko",
     "Delete": "Usuń",
     "Paste and Match Style": "Wklej i dopasuj styl",
     "Paste": "Wklej",
-    "Copy": "Skopiuj",
+    "Copy": "Kopiuj",
     "Cut": "Wytnij",
-    "Redo": "Powtórz",
+    "Redo": "Ponów",
     "Undo": "Cofnij",
     "Edit": "Edytuj",
     "Quit": "Zamknij",
     "Show/Hide": "Pokaż/Ukryj",
     "Are you sure you want to quit?": "Czy na pewno chcesz zamknąć?",
     "Cancel": "Anuluj",
-    "Copy image address": "Skopiuj adres obrazu"
+    "Copy image address": "Kopiuj adres obrazu",
+    "Close %(brand)s": "Zamknij %(brand)s"
 }

src/i18n/strings/uk.json

@@ -1 +1,47 @@
-{}
+{
+    "Add to dictionary": "Додати до словника",
+    "The image failed to save": "Не вдалося зберегти зображення",
+    "Failed to save image": "Не вдалося зберегти зображення",
+    "Save image as...": "Зберегти зображення як...",
+    "Copy link address": "Копіювати адресу посилання",
+    "Copy image address": "Копіювати адресу зображення",
+    "Copy email address": "Копіювати адресу е-пошти",
+    "Copy image": "Копіювати зображення",
+    "File": "Файл",
+    "Bring All to Front": "Винести все вперед",
+    "Zoom": "Масштаб",
+    "Stop Speaking": "Припинити говорити",
+    "Start Speaking": "Почати говорити",
+    "Speech": "Мовлення",
+    "Unhide": "Показати",
+    "Hide Others": "Сховати інші",
+    "Hide": "Сховати",
+    "Services": "Служби",
+    "About": "Про застосунок",
+    "Element Help": "Довідка Element",
+    "Help": "Довідка",
+    "Close": "Закрити",
+    "Minimize": "Згорнути",
+    "Window": "Вікно",
+    "Toggle Developer Tools": "Перемкнути інструменти розробника",
+    "Toggle Full Screen": "Перемкнути повноекранний режим",
+    "Preferences": "Параметри",
+    "Zoom Out": "Зменшити",
+    "Zoom In": "Збільшити",
+    "Actual Size": "Фактичний розмір",
+    "View": "Перегляд",
+    "Select All": "Вибрати все",
+    "Delete": "Видалити",
+    "Paste and Match Style": "Вставити з таким же стилем",
+    "Paste": "Вставити",
+    "Copy": "Копіювати",
+    "Cut": "Вирізати",
+    "Redo": "Повторити дію",
+    "Undo": "Скасувати дію",
+    "Edit": "Змінити",
+    "Quit": "Вийти",
+    "Show/Hide": "Показати/Сховати",
+    "Are you sure you want to quit?": "Ви впевнені, що хочете вийти?",
+    "Close %(brand)s": "Закрити %(brand)s",
+    "Cancel": "Скасувати"
+}

src/i18n/strings/vi.json

@@ -1,7 +1,7 @@
 {
     "Add to dictionary": "Thêm vào từ điển",
     "The image failed to save": "Ảnh không lưu được",
-    "Failed to save image": "Lưu ảnh thất bại",
+    "Failed to save image": "Không lưu được ảnh",
     "Save image as...": "Lưu ảnh…",
     "Copy link address": "Sao chép địa chỉ liên kết",
     "Copy email address": "Sao chép địa chỉ email",
@@ -17,12 +17,12 @@
     "Hide": "Ẩn",
     "Services": "Dịch vụ",
     "About": "Giới thiệu",
-    "Element Help": "Trợ giúp Element",
+    "Element Help": "Trợ giúp",
     "Help": "Hỗ trợ",
     "Close": "Đóng",
     "Minimize": "Thu nhỏ",
     "Window": "Cửa sổ",
-    "Toggle Developer Tools": "Công cụ cho Nhà phát triển",
+    "Toggle Developer Tools": "Công cụ phát triển",
     "Toggle Full Screen": "Toàn màn hình",
     "Preferences": "Tùy chọn",
     "Zoom Out": "Thu nhỏ",
@@ -39,8 +39,9 @@
     "Undo": "Hoàn tác",
     "Edit": "Chỉnh sửa",
     "Quit": "Thoát",
-    "Show/Hide": "Hiển thị/Ẩn",
+    "Show/Hide": "Hiện/Ẩn",
     "Are you sure you want to quit?": "Bạn có chắc chắn muốn thoát?",
     "Cancel": "Hủy bỏ",
-    "Copy image address": "Sao chép địa chỉ ảnh"
+    "Copy image address": "Sao chép địa chỉ ảnh",
+    "Close %(brand)s": "Đóng %(brand)s"
 }

src/ipc.ts

@@ -253,7 +253,7 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) {
             return;
     }
 
-    global.mainWindow.webContents.send("ipcReply", {
+    global.mainWindow?.webContents.send("ipcReply", {
         id: payload.id,
         reply: ret,
     });

src/seshat.ts

@@ -304,14 +304,14 @@ ipcMain.on("seshat", async function (_ev: IpcMainEvent, payload): Promise<void>
             break;
 
         default:
-            global.mainWindow.webContents.send("seshatReply", {
+            global.mainWindow?.webContents.send("seshatReply", {
                 id: payload.id,
                 error: "Unknown IPC Call: " + payload.name,
             });
             return;
     }
 
-    global.mainWindow.webContents.send("seshatReply", {
+    global.mainWindow?.webContents.send("seshatReply", {
         id: payload.id,
         reply: ret,
     });

src/squirrelhooks.ts

@@ -36,20 +36,24 @@ function checkSquirrelHooks(): boolean {
     if (process.platform !== "win32") return false;
     const cmd = process.argv[1];
     const target = path.basename(process.execPath);
-    if (cmd === "--squirrel-install") {
-        runUpdateExe(["--createShortcut=" + target]).then(() => app.quit());
-        return true;
-    } else if (cmd === "--squirrel-updated") {
-        app.quit();
-        return true;
-    } else if (cmd === "--squirrel-uninstall") {
-        runUpdateExe(["--removeShortcut=" + target]).then(() => app.quit());
-        return true;
-    } else if (cmd === "--squirrel-obsolete") {
-        app.quit();
-        return true;
+
+    switch (cmd) {
+        case "--squirrel-install":
+            runUpdateExe(["--createShortcut=" + target]).then(() => app.quit());
+            return true;
+
+        case "--squirrel-updated":
+        case "--squirrel-obsolete":
+            app.quit();
+            return true;
+
+        case "--squirrel-uninstall":
+            runUpdateExe(["--removeShortcut=" + target]).then(() => app.quit());
+            return true;
+
+        default:
+            return false;
     }
-    return false;
 }
 
 if (checkSquirrelHooks()) {

src/updater.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { autoUpdater, ipcMain } from "electron";
+import { app, autoUpdater, ipcMain } from "electron";
 
 const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
 const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
@@ -26,7 +26,37 @@ function installUpdate(): void {
     autoUpdater.quitAndInstall();
 }
 
-function pollForUpdates(): void {
+// Workaround for Squirrel.Mac wedging auto-restart if latest check for update failed
+// From https://github.com/vector-im/element-web/issues/12433#issuecomment-1508995119
+async function safeCheckForUpdate(): Promise<void> {
+    if (process.platform === "darwin") {
+        const feedUrl = autoUpdater.getFeedURL();
+        // On Mac if the user has already downloaded an update but not installed it and
+        // we check again and no additional new update is available the app ends up in a
+        // bad state and doesn't restart after installing any updates that are downloaded.
+        // To avoid this we check manually whether an update is available and call the
+        // autoUpdater.checkForUpdates() when something new is there.
+        try {
+            const res = await global.fetch(feedUrl);
+            const { currentRelease } = await res.json();
+            const latestVersionDownloaded = latestUpdateDownloaded?.releaseName;
+            console.info(
+                `Latest version from release download: ${currentRelease} (current: ${app.getVersion()}, most recent downloaded ${latestVersionDownloaded}})`,
+            );
+            if (currentRelease === app.getVersion() || currentRelease === latestVersionDownloaded) {
+                ipcChannelSendUpdateStatus(false);
+                return;
+            }
+        } catch (err) {
+            console.error(`Error checking for updates ${feedUrl}`, err);
+            ipcChannelSendUpdateStatus(false);
+            return;
+        }
+    }
+    autoUpdater.checkForUpdates();
+}
+
+async function pollForUpdates(): Promise<void> {
     try {
         // If we've already got a new update downloaded, then stop trying to check for new ones, as according to the doc
         // at https://github.com/electron/electron/blob/main/docs/api/auto-updater.md#autoupdatercheckforupdates
@@ -34,7 +64,7 @@ function pollForUpdates(): void {
         // As a hunch, this might also be causing https://github.com/vector-im/element-web/issues/12433
         // due to the update checks colliding with the pending install somehow
         if (!latestUpdateDownloaded) {
-            autoUpdater.checkForUpdates();
+            await safeCheckForUpdate();
         } else {
             console.log("Skipping update check as download already present");
             global.mainWindow?.webContents.send("update-downloaded", latestUpdateDownloaded);
@@ -101,7 +131,7 @@ interface ICachedUpdate {
 }
 
 // cache the latest update which has been downloaded as electron offers no api to read it
-let latestUpdateDownloaded: ICachedUpdate;
+let latestUpdateDownloaded: ICachedUpdate | undefined;
 autoUpdater
     .on("update-available", function () {
         ipcChannelSendUpdateStatus(true);

test/launch-test.ts

@@ -48,19 +48,19 @@ describe("App launch", () => {
             },
         });
         window = await app.firstWindow();
-    }, 30000);
+    }, 60000);
 
     afterAll(async () => {
         await app?.close().catch((e) => {
             console.error(e);
         });
         fs.rmSync(tmpDir, { recursive: true });
-    }, 30000);
+    }, 60000);
 
     it("should launch and render the welcome view successfully", async () => {
         await window.locator("#matrixchat").waitFor();
         await window.locator(".mx_Welcome").waitFor();
         await expect(window).toMatchURL("vector://vector/webapp/#/welcome");
         await window.screenshot({ path: path.join(artifactsPath, "welcome.png") });
-    }, 30000);
+    }, 60000);
 });

test/tsconfig.json

@@ -7,7 +7,7 @@
         "module": "commonjs",
         "sourceMap": false,
         "strict": true,
-        "lib": ["es2019", "dom"]
+        "lib": ["es2020", "dom"]
     },
     "include": ["./**/*.ts"],
     "ts-node": {

tsconfig.json

@@ -10,7 +10,7 @@
         "rootDir": "./src",
         "declaration": true,
         "typeRoots": ["src/@types", "node_modules/@types"],
-        "lib": ["es2019", "dom"],
+        "lib": ["es2020", "dom"],
         "types": ["node"],
         "strict": true
     },