v1.11.52

Backport 1375 to staging

.github/CODEOWNERS

@@ -1,4 +1,5 @@
-*                         @vector-im/element-web
-/.github/workflows/**     @vector-im/element-web-app-team
-/package.json             @vector-im/element-web-app-team
-/yarn.lock                @vector-im/element-web-app-team
+*                         @element-hq/element-web
+/.github/workflows/**     @element-hq/element-web-app-team
+/package.json             @element-hq/element-web-app-team
+/yarn.lock                @element-hq/element-web-app-team
+/src/i18n/strings

.github/labels.yml

@@ -0,0 +1,31 @@
+- name: "A-Install"
+  color: "72A447"
+- name: "A-Seshat"
+  color: "8262BE"
+- name: "A-Update"
+  color: "17BE67"
+- name: "Story"
+  description: "A change to the product that generates user value on its own. Unit of delivery."
+  color: "0BAC47"
+- name: "X-Breaking-Change"
+  color: "ff7979"
+- name: "Z-Arch"
+  color: "D601BE"
+- name: "Z-ARM"
+  color: "5DEC5B"
+- name: "Z-Flatpak"
+  color: "0CA856"
+- name: "Z-Linux"
+  color: "7B4A9C"
+- name: "Z-macOS"
+  color: "500605"
+- name: "Z-Official"
+  color: "1D2B20"
+- name: "Z-Snap"
+  color: "29CD95"
+- name: "Z-Suse"
+  color: "79D07B"
+- name: "Z-Wayland"
+  color: "94C519"
+- name: "Z-Windows"
+  color: "0632DE"

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: element-hq/element-web

.github/workflows/build_and_deploy.yaml

@@ -108,8 +108,6 @@ jobs:
             sqlcipher: static
             version: ${{ needs.prepare.outputs.nightly-version }}
 
-    # This deploy job only handles Windows, macOS & linux_static as those are stateless and static.
-    # Linux will be deployed via reprepro after it, but we list it as a dependency to abort if it fails.
     deploy:
         needs:
             - prepare
@@ -120,20 +118,16 @@ jobs:
         runs-on: ubuntu-latest
         name: Deploy
         if: |
-            (
+            always() && !failure() && !cancelled() && ((
                 github.event_name != 'workflow_dispatch' &&
                 github.event.release.prerelease != true
             ) || (
-                always() && !failure() && !cancelled() && inputs.deploy &&
-                (inputs.macos || inputs.windows || inputs.linux)
-            )
+                inputs.deploy && (inputs.macos || inputs.windows || inputs.linux)
+            ))
         environment: packages.element.io
         steps:
             - name: Download artifacts
               uses: actions/download-artifact@v3
-              with:
-                  name: packages.element.io
-                  path: packages.element.io
 
             - name: Deploy artifacts
               run: |
@@ -148,26 +142,34 @@ jobs:
               uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: vector-im/packages.element.io
+                  repository: element-hq/packages.element.io
                   event-type: packages-index
 
-    reprepro:
-        needs:
-            - linux
-            # We queue this after the other deploy stage as we want to abort if that fails
-            - deploy
-        name: Run reprepro ${{ matrix.arch }}
-        strategy:
-            matrix:
-                arch: [amd64, arm64]
-        if: |
-            (
-                github.event_name != 'workflow_dispatch' &&
-                github.event.release.prerelease != true
-            ) || (
-                always() && !failure() && !cancelled() && inputs.deploy && inputs.linux
-            )
-        uses: ./.github/workflows/reprepro.yaml
-        secrets: inherit
-        with:
-            artifact-name: linux-${{ matrix.arch }}-sqlcipher-system
+            - name: Find debs
+              id: deb
+              if: needs.linux.result == 'success'
+              run: |
+                  for arch in amd64 arm64
+                  do
+                      echo "$arch=$(ls linux-$arch-sqlcipher-system/*.deb | tail -n1)" >> $GITHUB_OUTPUT
+                  done
+
+            - name: Publish amd64 deb to packages.element.io
+              uses: element-hq/packages.element.io@master
+              if: needs.linux.result == 'success'
+              with:
+                  file: ${{ steps.deb.outputs.amd64 }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  bucket-api: ${{ vars.CF_R2_S3_API }}
+                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}
+
+            - name: Publish arm64 deb to packages.element.io
+              uses: element-hq/packages.element.io@master
+              if: needs.linux.result == 'success'
+              with:
+                  file: ${{ steps.deb.outputs.arm64 }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  bucket-api: ${{ vars.CF_R2_S3_API }}
+                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}

.github/workflows/build_and_test.yaml

@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@6ee9cdc5816333acda68e01cf12eedc619e28316 # v39
+              uses: tj-actions/changed-files@da093c1609db0edd0a037ce9664e135f74bf30d9 # v40
               with:
                   files: |
-                      dockerbuild/*
+                      dockerbuild/**
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@a5609cb39f57be157c39b77359abfaa43aeaeb8f
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
               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@4e4ee680f69700760d5620a94c020aef883043aa
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: dockerbuild
                   push: true

.github/workflows/build_linux.yaml

@@ -27,12 +27,12 @@ on:
             docker-image:
                 type: string
                 required: false
-                description: "The docker image to use for the build, defaults to ghcr.io/vector-im/element-desktop-dockerbuild"
+                description: "The docker image to use for the build, defaults to ghcr.io/element-hq/element-desktop-dockerbuild"
 jobs:
     build:
         runs-on: ubuntu-latest
         container:
-            image: ${{ inputs.docker-image || format('ghcr.io/vector-im/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
+            image: ${{ inputs.docker-image || format('ghcr.io/element-hq/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
         defaults:
             run:
                 shell: bash

.github/workflows/build_macos.yaml

@@ -67,7 +67,10 @@ jobs:
 
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run: "yarn build:native:universal"
+              run: |
+                  # Python 3.12 drops distutils which keytar relies on
+                  pip3 install setuptools
+                  yarn build:native:universal
 
             - name: "[Nightly] Resolve version"
               id: nightly

.github/workflows/build_prepare.yaml

@@ -124,7 +124,7 @@ jobs:
                   echo "| Component   | Version |" >> $GITHUB_STEP_SUMMARY
                   echo "| ----------- | ------- |" >> $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 "| Element Web | [$WEB_VERSION](https://github.com/element-hq/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
 

.github/workflows/dockerbuild.yaml

@@ -20,7 +20,7 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@a5609cb39f57be157c39b77359abfaa43aeaeb8f
+              uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -28,14 +28,14 @@ jobs:
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@b67fef219a3c5542bf1d0948862a08152653b4d4
+              uses: docker/metadata-action@2a4836ac76fe8f5d0ee3a0d89aa12a80cc552ad3
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |
                       type=ref,event=branch
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: dockerbuild
                   push: true

.github/workflows/localazy_download.yaml

@@ -1,6 +1,8 @@
 name: Localazy Download
 on:
     workflow_dispatch: {}
+    schedule:
+        - cron: "0 6 * * 1,3,5" # Every Monday, Wednesday and Friday at 6am UTC
 jobs:
     download:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_download.yaml@main

.github/workflows/localazy_upload.yaml

@@ -3,7 +3,7 @@ on:
     push:
         branches: [develop]
         paths:
-            - "src/strings/i18n/en_EN.json"
+            - "src/i18n/strings/en_EN.json"
 jobs:
     upload:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_upload.yaml@main

.github/workflows/release-drafter.yml

@@ -0,0 +1,21 @@
+name: Release Drafter
+on:
+    push:
+        branches: [staging]
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
+concurrency: ${{ github.workflow }}
+jobs:
+    draft:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}

.github/workflows/release-gitflow.yml

@@ -0,0 +1,11 @@
+# Gitflow merge-back master->develop
+name: Merge master -> develop
+on:
+    push:
+        branches: [master]
+concurrency: ${{ github.repository }}-${{ github.workflow }}
+jobs:
+    merge:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Release Process
+on:
+    workflow_dispatch:
+        inputs:
+            mode:
+                description: What type of release
+                required: true
+                default: rc
+                type: choice
+                options:
+                    - rc
+                    - final
+concurrency: ${{ github.workflow }}
+jobs:
+    release:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+            GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        with:
+            final: ${{ inputs.mode == 'final' }}
+            include-changes: element-hq/element-web@$VERSION
+            gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
+            expected-asset-count: 1

.github/workflows/reprepro.yaml

@@ -1,49 +0,0 @@
-on:
-    workflow_call:
-        inputs:
-            artifact-name:
-                type: string
-                required: true
-                description: "The name of the artifact containing the deb to include"
-        secrets:
-            ELEMENT_BOT_TOKEN:
-                required: true
-            CF_R2_ACCESS_KEY_ID:
-                required: true
-            CF_R2_TOKEN:
-                required: true
-# Protect reprepro database using concurrency
-concurrency: reprepro
-jobs:
-    reprepro:
-        name: Deploy debian package
-        environment: packages.element.io
-        runs-on: ubuntu-latest
-        env:
-            R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
-            R2_URL: ${{ vars.CF_R2_S3_API }}
-        steps:
-            - name: Download artifact
-              uses: actions/download-artifact@v3
-              with:
-                  name: ${{ inputs.artifact-name }}
-                  path: dist
-
-            - name: Upload incoming deb
-              id: upload
-              run: |
-                  deb="$(ls *.deb | tail -n1)"
-                  echo "incoming=$deb" >> $GITHUB_OUTPUT
-                  aws s3 cp "$deb" "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto
-              working-directory: dist
-              env:
-                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-
-            - name: Notify packages.element.io of incoming deb
-              uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2
-              with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: vector-im/packages.element.io
-                  event-type: reprepro-incoming
-                  client-payload: '{"incoming": "${{ steps.upload.outputs.incoming }}"}'

.github/workflows/static_analysis.yaml

@@ -41,3 +41,20 @@ jobs:
 
             - name: Run Linter
               run: "yarn run lint:js"
+
+    workflow_lint:
+        name: "Workflow Lint"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+
+            # Does not need branch matching as only analyses this layer
+            - name: Install Deps
+              run: "yarn install --frozen-lockfile"
+
+            - name: Run Linter
+              run: "yarn lint:workflows"

.github/workflows/sync-labels.yml

@@ -0,0 +1,21 @@
+name: Sync labels
+on:
+    workflow_dispatch: {}
+    schedule:
+        - cron: "0 2 * * *" # 2am every day
+    push:
+        branches:
+            - develop
+        paths:
+            - .github/labels.yml
+jobs:
+    sync-labels:
+        uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
+        with:
+            LABELS: |
+                element-hq/element-web
+                .github/labels.yml
+            DELETE: true
+            WET: true
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-labelled.yml

@@ -0,0 +1,10 @@
+name: Move labelled issues to correct projects
+
+on:
+    issues:
+        types: [labeled]
+
+jobs:
+    call-triage-labelled:
+        uses: element-hq/element-web/.github/workflows/triage-labelled.yml@develop
+        secrets: inherit

.github/workflows/upgrade_dependencies.yml

@@ -1,8 +0,0 @@
-name: Upgrade Dependencies
-on:
-    workflow_dispatch: {}
-jobs:
-    upgrade:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

docs/SUMMARY.md

@@ -0,0 +1,17 @@
+# Summary
+
+-   [Introduction](../README.md)
+
+# Build
+
+-   [Native Node modules](native-node-modules.md)
+-   [Windows requirements](windows-requirements.md)
+
+# Distribution
+
+-   [Updates](updates.md)
+-   [Packaging](packaging.md)
+
+# Setup
+
+-   [Config](config.md)

docs/config.md

@@ -0,0 +1,15 @@
+# Configuration
+
+All Element Web options documented [here](https://github.com/vector-im/element-web/blob/develop/docs/config.md) can be used as well as the following:
+
+---
+
+The app contains a configuration file specified at build time using [these instructions](https://github.com/vector-im/element-desktop/#config).
+This config can be overwritten by the end using by creating a `config.json` file at the paths described [here](https://github.com/vector-im/element-desktop/#user-specified-configjson).
+
+After changing the config, the app will need to be exited fully (including via the task tray) and re-started.
+
+---
+
+1. `update_base_url`: Specifies the URL of the update server, see [document](https://github.com/vector-im/element-desktop/blob/develop/docs/updates.md).
+2. `web_base_url`: Specifies the Element Web URL when performing actions such as popout widget. Defaults to `https://app.element.io/`.

docs/packaging.md

@@ -0,0 +1,60 @@
+## Packaging nightlies
+
+Element Desktop nightly builds are build automatically by the [Github Actions workflow](https://github.com/vector-im/element-desktop/blob/develop/.github/workflows/build_and_deploy.yaml).
+The schedule is currently set for once a day at 9am UTC. It will deploy to packages.element.io upon completion.
+
+## Triggering a manual nightly build
+
+Simply go to https://github.com/vector-im/element-desktop/actions/workflows/build_and_deploy.yaml
+
+1. Click `Run workflow`
+1. Feel free to make changes to the checkboxes depending on the circumstances
+1. Click the green `Run workflow`
+
+## Packaging releases
+
+**Don't do this for RCs! We don't build Element Desktop for RCs.**
+
+For releasing Element Desktop, we assume the following prerequisites:
+
+-   a tag of `element-desktop` repo with the Element Desktop version to be released set in `package.json`.
+-   an Element Web tarball published to GitHub with a matching version number.
+
+**Both of these are done automatically when you run the release automation.**
+
+Once those are ready, the **manual** release build can be manually invoked using https://github.com/vector-im/element-desktop/actions/workflows/build_and_deploy.yaml
+
+1. Click `Run workflow`
+1. Specify the `master` branch
+1. Switch type to release
+1. Click the green `Run workflow`
+
+### More detail on the github actions
+
+We moved to Github Actions for the following reasons:
+
+1. Removing single point of failure
+2. Improving reliability
+3. Unblocking the packaging on a single individual
+4. Improving parallelism
+
+The Windows builds are signed by SSL.com using their Cloud Key Adapter for eSigner.
+This allows us to use Microsoft's signtool to interface with eSigner and send them a hash of the exe along with
+credentials in exchange for a signed certificate which we attach onto all the relevant files.
+
+The Apple builds are signed using standard code signing means and then notarised to appease GateKeeper.
+
+The Linux builds are distributed via a signed reprepro repository.
+
+The packages.element.io site is a public Cloudflare R2 bucket which is deployed to solely from Github Actions.
+The main bucket in R2 is `packages-element-io` which is a direct mapping of packages.element.io,
+we have a workflow which generates the index.html files there to imitate a public index which Cloudflare does not currently support.
+The reprepro database lives in `packages-element-io-db`.
+There is an additional pair of buckets of same name but appended with `-test` which can be used for testing,
+these land on https://packages-element-io-test.element.io/.
+
+### Debian/Ubuntu Distributions
+
+We used to add a new distribution to match each Debian and Ubuntu release. As of April 2020, we have created a `default` distribution that everyone can use (since the packages have never differed by distribution anyway).
+
+The distribution configuration lives in https://github.com/vector-im/packages.element.io/blob/master/debian/conf/distributions as a canonical source.

element.io/nightly/config.json

@@ -53,7 +53,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call-livekit.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

package.json

@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.44",
+    "version": "1.11.52",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",
@@ -24,7 +24,7 @@
         "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": "yarn lint:types && yarn lint:js && yarn lint:workflows",
         "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",
@@ -40,6 +40,7 @@
         "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",
+        "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'",
         "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",
@@ -69,61 +70,62 @@
         "uuid": "^9.0.0"
     },
     "devDependencies": {
+        "@action-validator/cli": "^0.5.3",
+        "@action-validator/core": "^0.5.3",
         "@babel/core": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/preset-typescript": "^7.18.6",
         "@electron/asar": "^3.2.3",
-        "@electron/notarize": "^2.0.0",
         "@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.48",
+        "@types/node": "16.18.52",
         "@types/pacote": "^11.1.1",
         "@types/tar": "^6.1.3",
         "@types/uuid": "^9.0.2",
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
         "allchange": "^1.0.6",
-        "app-builder-lib": "24.6.4",
+        "app-builder-lib": "24.9.1",
         "babel-jest": "^29.0.0",
         "chokidar": "^3.5.2",
         "detect-libc": "^1.0.3",
-        "electron": "^26.2.1",
-        "electron-builder": "24.6.4",
-        "electron-builder-squirrel-windows": "24.6.4",
+        "electron": "^27.0.0",
+        "electron-builder": "24.9.1",
+        "electron-builder-squirrel-windows": "24.9.1",
         "electron-devtools-installer": "^3.2.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-unicorn": "^48.0.0",
+        "eslint-plugin-unicorn": "^49.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": "^3.1.1",
+        "matrix-web-i18n": "^3.1.3",
         "mkdirp": "^3.0.0",
         "node-pre-gyp": "^0.17.0",
         "pacote": "^17.0.0",
-        "playwright": "^1.25.0",
+        "playwright": "1.37.1",
         "prettier": "^2.8.1",
         "rimraf": "^5.0.0",
         "tar": "^6.1.2",
         "ts-jest": "^29.0.0",
         "ts-node": "^10.9.1",
-        "typescript": "5.1.6"
+        "typescript": "5.3.2"
     },
     "hakDependencies": {
         "matrix-seshat": "^3.0.1",
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "16.18.48"
+        "@types/node": "16.18.59"
     },
     "build": {
         "appId": "im.riot.app",

scripts/fetch-package.ts

@@ -12,7 +12,7 @@ import riotDesktopPackageJson from "../package.json";
 import { setPackageVersion } from "./set-version";
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
-const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
+const PACKAGE_URL_PREFIX = "https://github.com/element-hq/element-web/releases/download/";
 const DEVELOP_TGZ_URL = "https://develop.element.io/develop.tar.gz";
 const ASAR_PATH = "webapp.asar";
 

src/i18n/strings/bg.json

@@ -1,61 +0,0 @@
-{
-    "action": {
-        "cancel": "Отказ",
-        "close": "Затвори",
-        "copy": "Копирай",
-        "cut": "Изрежи",
-        "delete": "Изтрий",
-        "edit": "Редактирай",
-        "minimise": "Минимизирай",
-        "paste": "Постави",
-        "paste_match_style": "Постави и Използвай текущия стил",
-        "quit": "Напусни",
-        "redo": "Върни",
-        "select_all": "Избери Всичко",
-        "show_hide": "Покажи/Скрий",
-        "undo": "Отмени",
-        "zoom_in": "Увеличи",
-        "zoom_out": "Намали"
-    },
-    "common": {
-        "about": "Относно",
-        "help": "Помощ",
-        "preferences": "Предпочитания"
-    },
-    "confirm_quit": "Сигурен ли си че искаш да напуснеш?",
-    "edit_menu": {
-        "speech": "Говор",
-        "speech_start_speaking": "Започни да говориш",
-        "speech_stop_speaking": "Спри да говориш"
-    },
-    "file_menu": {
-        "label": "Файл"
-    },
-    "menu": {
-        "hide": "Скрий",
-        "hide_others": "Скрий Останалите",
-        "services": "Услуги",
-        "unhide": "Покажи"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Добави към речника",
-        "copy_email": "Копирай имейл адрес",
-        "copy_image": "Копирай изображение",
-        "copy_image_url": "Копирай адреса на изображението",
-        "copy_link_url": "Копирай линка",
-        "save_image_as": "Запази изображението като...",
-        "save_image_as_error_description": "Изображението не успя да се запази",
-        "save_image_as_error_title": "Неуспешно запазване на изображението"
-    },
-    "view_menu": {
-        "actual_size": "Действителен Размер",
-        "toggle_developer_tools": "Превключи инструментите за разработчици",
-        "toggle_full_screen": "Превключи на Цял екран",
-        "view": "Преглед"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Покажи всички най-отгоре",
-        "label": "Прозорец",
-        "zoom": "Мащабирай"
-    }
-}

src/i18n/strings/cs.json

@@ -1,12 +1,12 @@
 {
     "action": {
-        "cancel": "Zrušit",
+        "cancel": "Storno",
         "close": "Zavřít",
         "close_brand": "Zavřít %(brand)s",
-        "copy": "Kopírovat",
+        "copy": "Zkopírovat",
         "cut": "Vyjmout",
         "delete": "Smazat",
-        "edit": "Úpravy",
+        "edit": "Upravit",
         "minimise": "Minimalizovat",
         "paste": "Vložit",
         "paste_match_style": "Vložit a přizpůsobit styl",
@@ -19,7 +19,7 @@
         "zoom_out": "Oddálit"
     },
     "common": {
-        "about": "O aplikaci",
+        "about": "O",
         "brand_help": "%(brand)s nápověda",
         "help": "Nápověda",
         "preferences": "Předvolby"

src/i18n/strings/de_DE.json

@@ -57,6 +57,7 @@
     },
     "window_menu": {
         "bring_all_to_front": "Alles in den Vordergrund",
-        "label": "Fenster"
+        "label": "Fenster",
+        "zoom": "Zoomen"
     }
 }

src/i18n/strings/eo.json

@@ -3,7 +3,7 @@
         "cancel": "Nuligi",
         "close": "Fermi",
         "close_brand": "Fermu %(brand)s",
-        "copy": "Kopiu",
+        "copy": "Kopii",
         "cut": "Tranĉi",
         "delete": "Forigi",
         "edit": "Redakti",
@@ -15,9 +15,9 @@
         "undo": "Malfari"
     },
     "common": {
-        "about": "Informilo",
+        "about": "Prio",
         "help": "Helpo",
-        "preferences": "Preferoj"
+        "preferences": "Agordoj"
     },
     "confirm_quit": "Ĉu vi certas, ke vi volas ĉesi?",
     "edit_menu": {

src/i18n/strings/es.json

@@ -5,7 +5,7 @@
         "close_brand": "Cerrar %(brand)s",
         "copy": "Copiar",
         "cut": "Cortar",
-        "delete": "Eliminar",
+        "delete": "Borrar",
         "edit": "Editar",
         "minimise": "Minimizar",
         "paste": "Pegar",

src/i18n/strings/et.json

@@ -1,6 +1,6 @@
 {
     "action": {
-        "cancel": "Tühista",
+        "cancel": "Loobu",
         "close": "Sulge",
         "close_brand": "Sulge %(brand)s",
         "copy": "Kopeeri",
@@ -22,7 +22,7 @@
         "about": "Rakenduse teave",
         "brand_help": "%(brand)s abiteave",
         "help": "Abiteave",
-        "preferences": "Seadistused"
+        "preferences": "Eelistused"
     },
     "confirm_quit": "Kas sa kindlasti soovid rakendusest väljuda?",
     "edit_menu": {
@@ -53,7 +53,7 @@
         "actual_size": "Näita tavasuuruses",
         "toggle_developer_tools": "Arendaja töövahendid sisse/välja",
         "toggle_full_screen": "Täisekraanivaade sisse/välja",
-        "view": "Vaata"
+        "view": "Näita"
     },
     "window_menu": {
         "bring_all_to_front": "Too kõik esiplaanile",

src/i18n/strings/fi.json

@@ -19,9 +19,9 @@
         "zoom_out": "Pienennä"
     },
     "common": {
-        "about": "Tietoja",
-        "help": "Apua",
-        "preferences": "Asetukset"
+        "about": "Tietoa",
+        "help": "Ohje",
+        "preferences": "Valinnat"
     },
     "confirm_quit": "Haluatko varmasti poistua?",
     "edit_menu": {

src/i18n/strings/fr.json

@@ -36,6 +36,7 @@
     "menu": {
         "hide": "Masquer",
         "hide_others": "Masquer les autres",
+        "services": "Services",
         "unhide": "Dé-masquer"
     },
     "right_click_menu": {
@@ -56,6 +57,7 @@
     },
     "window_menu": {
         "bring_all_to_front": "Tout amener au premier plan",
-        "label": "Fenêtre"
+        "label": "Fenêtre",
+        "zoom": "Zoom"
     }
 }

src/i18n/strings/gl.json

@@ -50,7 +50,7 @@
         "actual_size": "Tamaño real",
         "toggle_developer_tools": "Activar ferramentas de desenvolvemento",
         "toggle_full_screen": "Activar pantalla completa",
-        "view": "Ver"
+        "view": "Vista"
     },
     "window_menu": {
         "bring_all_to_front": "Traer todo á fronte",

src/i18n/strings/hu.json

@@ -1,26 +1,27 @@
 {
     "action": {
-        "cancel": "Mégsem",
-        "close": "Bezár",
+        "cancel": "Mégse",
+        "close": "Bezárás",
         "close_brand": "%(brand)s bezárása",
-        "copy": "Másol",
-        "cut": "Kivág",
+        "copy": "Másolás",
+        "cut": "Kivágás",
         "delete": "Töröl",
-        "edit": "Szerkeszt",
+        "edit": "Szerkesztés",
         "minimise": "Lecsukás",
         "paste": "Beillesztés",
         "paste_match_style": "Beillesztés formázással",
-        "quit": "Kilép",
+        "quit": "Kilépés",
         "redo": "Újra",
         "select_all": "Összes kijelölése",
-        "show_hide": "Megmutat/Elrejt",
-        "undo": "Visszavon",
-        "zoom_in": "Nagyít",
-        "zoom_out": "Kicsinyít"
+        "show_hide": "Megjelenítés/elrejtés",
+        "undo": "Visszavonás",
+        "zoom_in": "Nagyítás",
+        "zoom_out": "Kicsinyítés"
     },
     "common": {
         "about": "Névjegy",
-        "help": "Segítség",
+        "brand_help": "%(brand)s Súgó",
+        "help": "Súgó",
         "preferences": "Beállítások"
     },
     "confirm_quit": "Biztos, hogy kilép?",

src/i18n/strings/id.json

@@ -1,11 +1,12 @@
 {
     "action": {
-        "cancel": "Batal",
+        "cancel": "Batalkan",
         "close": "Tutup",
         "close_brand": "Tutuo %(brand)s",
         "copy": "Salin",
         "cut": "Potong",
         "delete": "Hapus",
+        "edit": "Sunting",
         "minimise": "Minimalkan",
         "paste": "Tempel",
         "paste_match_style": "Tempel dan Cocokkan Gaya",
@@ -21,7 +22,7 @@
         "about": "Tentang",
         "brand_help": "Bantuan %(brand)s",
         "help": "Bantuan",
-        "preferences": "Pengaturan"
+        "preferences": "Preferensi"
     },
     "confirm_quit": "Apakah Anda yakin ingin keluar?",
     "edit_menu": {
@@ -29,6 +30,9 @@
         "speech_start_speaking": "Mulai Berbicara",
         "speech_stop_speaking": "Berhenti Berbicara"
     },
+    "file_menu": {
+        "label": "Berkas"
+    },
     "menu": {
         "hide": "Sembunyikan",
         "hide_others": "Sembunyikan yang Lain",

src/i18n/strings/it.json

@@ -30,6 +30,9 @@
         "speech_start_speaking": "Inizia a parlare",
         "speech_stop_speaking": "Smetti di parlare"
     },
+    "file_menu": {
+        "label": "File"
+    },
     "menu": {
         "hide": "Nascondi",
         "hide_others": "Nascondi gli altri",

src/i18n/strings/lt.json

@@ -6,7 +6,7 @@
         "copy": "Kopijuoti",
         "cut": "Iškirpti",
         "delete": "Ištrinti",
-        "edit": "Redaguoti",
+        "edit": "Koreguoti",
         "minimise": "Sumažinti",
         "paste": "Įklijuoti",
         "paste_match_style": "Įklijuoti ir suderinti stilių",
@@ -52,7 +52,7 @@
         "actual_size": "Tikrasis dydis",
         "toggle_developer_tools": "Perjungti kūrėjo įrankius",
         "toggle_full_screen": "Perjungti viso ekrano režimą",
-        "view": "Peržiūrėti"
+        "view": "Žiūrėti"
     },
     "window_menu": {
         "bring_all_to_front": "Viską iškelti į priekį",

src/i18n/strings/pl.json

@@ -19,7 +19,7 @@
         "zoom_out": "Pomniejsz"
     },
     "common": {
-        "about": "O nas",
+        "about": "Informacje",
         "brand_help": "Pomoc %(brand)s",
         "help": "Pomoc",
         "preferences": "Preferencje"
@@ -53,7 +53,7 @@
         "actual_size": "Rozmiar rzeczywisty",
         "toggle_developer_tools": "Przełącz na narzędzia deweloperskie",
         "toggle_full_screen": "Przełącz na pełny ekran",
-        "view": "Pokaż"
+        "view": "Wyświetl"
     },
     "window_menu": {
         "bring_all_to_front": "Wyciągnij wszystko do przodu",

src/i18n/strings/pt_BR.json

@@ -5,7 +5,7 @@
         "close_brand": "Fechar %(brand)s",
         "copy": "Copiar",
         "cut": "Cortar",
-        "delete": "Deletar",
+        "delete": "Excluir",
         "edit": "Editar",
         "minimise": "Minimizar",
         "paste": "Colar",
@@ -52,7 +52,7 @@
         "actual_size": "Tamanho de Verdade",
         "toggle_developer_tools": "Ativar/Desativar Ferramentas de Desenvolvimento",
         "toggle_full_screen": "Pôr em/Tirar de Tela Cheia",
-        "view": "Visualizar"
+        "view": "Ver"
     },
     "window_menu": {
         "bring_all_to_front": "Trazer Todas Para Frente",

src/i18n/strings/sk.json

@@ -6,7 +6,7 @@
         "copy": "Kopírovať",
         "cut": "Vystrihnúť",
         "delete": "Odstrániť",
-        "edit": "Úpravy",
+        "edit": "Upraviť",
         "minimise": "Minimalizovať",
         "paste": "Vložiť",
         "paste_match_style": "Vložiť a prispôsobiť štýl",
@@ -19,10 +19,10 @@
         "zoom_out": "Oddialiť"
     },
     "common": {
-        "about": "O aplikácii",
+        "about": "Informácie",
         "brand_help": "%(brand)s Pomoc",
         "help": "Pomocník",
-        "preferences": "Vlastnosti"
+        "preferences": "Predvoľby"
     },
     "confirm_quit": "Naozaj chcete zavrieť aplikáciu?",
     "edit_menu": {

src/i18n/strings/sv.json

@@ -6,7 +6,7 @@
         "copy": "Kopiera",
         "cut": "Klipp ut",
         "delete": "Radera",
-        "edit": "Redigera",
+        "edit": "Ändra",
         "minimise": "Minimera",
         "paste": "Klistra in",
         "paste_match_style": "Klistra in och matcha stilen",

src/i18n/strings/tr.json

@@ -1,61 +0,0 @@
-{
-    "action": {
-        "cancel": "İptal",
-        "close": "Kapat",
-        "copy": "Kopyala",
-        "cut": "Kes",
-        "delete": "Sil",
-        "edit": "Düzenle",
-        "minimise": "Küçült",
-        "paste": "Yapıştır",
-        "paste_match_style": "Biçimiyle bir yapıştır",
-        "quit": "Çık",
-        "redo": "Yinele",
-        "select_all": "Tümünü seç",
-        "show_hide": "Göster/Gizle",
-        "undo": "Geri al",
-        "zoom_in": "Yaklaştır",
-        "zoom_out": "Uzaklaştır"
-    },
-    "common": {
-        "about": "Hakkında",
-        "help": "Yardım",
-        "preferences": "Tercihler"
-    },
-    "confirm_quit": "Çıkmak istediğinize emin misiniz?",
-    "edit_menu": {
-        "speech": "Konuşma",
-        "speech_start_speaking": "Konuşmaya başla",
-        "speech_stop_speaking": "Konuşmayı durdur"
-    },
-    "file_menu": {
-        "label": "Dosya"
-    },
-    "menu": {
-        "hide": "Gizle",
-        "hide_others": "Diğerlerini gizle",
-        "services": "Hizmetler",
-        "unhide": "Gizlemeyi bırak"
-    },
-    "right_click_menu": {
-        "add_to_dictionary": "Sözlüğe ekle",
-        "copy_email": "E-posta adresini kopyala",
-        "copy_image": "Resmi kopyala",
-        "copy_image_url": "Görsel adresini kopyala",
-        "copy_link_url": "Bağlantılı adresi kopyala",
-        "save_image_as": "Resmi ... olarak farklı kaydet",
-        "save_image_as_error_description": "Bu resim kaydedilemedi",
-        "save_image_as_error_title": "Resim kaydedilemedi"
-    },
-    "view_menu": {
-        "actual_size": "Gerçek boyut",
-        "toggle_developer_tools": "Geliştirici araçları",
-        "toggle_full_screen": "Tam ekran",
-        "view": "Görünüm"
-    },
-    "window_menu": {
-        "bring_all_to_front": "Hepsini öne getir",
-        "label": "Pencere",
-        "zoom": "Yaklaştır"
-    }
-}

src/i18n/strings/uk.json

@@ -3,7 +3,7 @@
         "cancel": "Скасувати",
         "close": "Закрити",
         "close_brand": "Закрити %(brand)s",
-        "copy": "Копіювати",
+        "copy": "Скопіювати",
         "cut": "Вирізати",
         "delete": "Видалити",
         "edit": "Змінити",

src/i18n/strings/vi.json

@@ -1,12 +1,12 @@
 {
     "action": {
-        "cancel": "Hủy bỏ",
+        "cancel": "Huỷ bỏ",
         "close": "Đóng",
         "close_brand": "Đóng %(brand)s",
         "copy": "Sao chép",
         "cut": "Cắt",
-        "delete": "Xóa",
-        "edit": "Chỉnh sửa",
+        "delete": "Xoá",
+        "edit": "Sửa",
         "minimise": "Thu nhỏ",
         "paste": "Dán",
         "paste_match_style": "Dán và khớp kiểu",

src/macos-titlebar.ts

@@ -65,15 +65,6 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             .mx_AuthPage .mx_AuthFooter > * {
                 -webkit-app-region: no-drag;
             }
-            
-            /* Mark the header as a drag handle */
-            .mx_LeftPanel .mx_LeftPanel_filterContainer {
-                -webkit-app-region: drag;
-            }
-            /* Exclude header interactive elements from being drag handles */
-            .mx_LeftPanel .mx_LeftPanel_filterContainer .mx_AccessibleButton {
-                -webkit-app-region: no-drag;
-            }
         
             /* Mark the home page background as a drag handle */
             .mx_HomePage {
@@ -86,23 +77,10 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             }
             
             /* Mark the header as a drag handle */
-            .mx_LegacyRoomHeader,
-            .mx_RoomHeader {
-                -webkit-app-region: drag;
-                -webkit-user-select: none;
-            }
             .mx_ImageView_panel {
                 -webkit-app-region: drag;
             }
             /* Exclude header interactive elements from being drag handles */
-            .mx_RoomHeader .mx_BaseAvatar,
-            .mx_RoomHeader_heading,
-            .mx_RoomHeader button,
-            .mx_RoomHeader .mx_FacePile,
-            .mx_LegacyRoomHeader .mx_LegacyRoomHeader_avatar,
-            .mx_LegacyRoomHeader .mx_E2EIcon,
-            .mx_LegacyRoomHeader .mx_RoomTopic,
-            .mx_LegacyRoomHeader .mx_AccessibleButton,
             .mx_ImageView_panel > .mx_ImageView_info_wrapper,
             .mx_ImageView_panel > .mx_ImageView_title,
             .mx_ImageView_panel > .mx_ImageView_toolbar > * {
@@ -110,7 +88,8 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             }
             
             /* Mark the background as a drag handle only if no modal is open */
-            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_RoomView_wrapper {
+            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_RoomView_wrapper,
+            .mx_MatrixChat_wrapper[aria-hidden="false"] .mx_HomePage {
                 -webkit-app-region: drag;
             }
             /* Exclude content elements from being drag handles */
@@ -119,7 +98,11 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             .mx_RoomView_body,
             .mx_AutoHideScrollbar,
             .mx_RightPanel_ResizeWrapper,
-            .mx_RoomPreviewCard {
+            .mx_RoomPreviewCard,
+            .mx_LeftPanel,
+            .mx_RoomView,
+            .mx_SpaceRoomView,
+            .mx_AccessibleButton {
                 -webkit-app-region: no-drag;
             }
             /* Exclude context menus and their backgrounds */
@@ -130,6 +113,38 @@ export function setupMacosTitleBar(window: BrowserWindow): void {
             iframe {
                 -webkit-app-region: no-drag;
             }
+
+            /* Add a bar above room header + left panel */
+            
+            .mx_LeftPanel {
+                flex-direction: column;
+            }
+
+            .mx_LeftPanel::before {
+                content: "";
+                height: 20px;
+                -webkit-app-region: drag;
+            }
+
+            .mx_RoomView::before,
+            .mx_SpaceRoomView::before {
+                content: "";
+                -webkit-app-region: drag;
+            }
+            
+            .mx_SpaceRoomView::before {
+                display: block;
+                height: 24px;            
+            }
+
+            .mx_RoomView[data-room-header="new"]::before {
+                height: 13px;
+            }
+
+            .mx_RoomView[data-room-header="legacy"]::before {
+                height: 27px;
+            }
+
         `);
     }
 

src/webcontents-handler.ts

@@ -85,8 +85,9 @@ function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: We
     if (url.startsWith("vector://vector/webapp")) {
         // Avoid showing a context menu for app icons
         if (params.hasImageContents) return;
-        // Rewrite URL so that it can be used outside of the app
-        url = "https://app.element.io/" + url.substring(23);
+        const baseUrl = vectorConfig.web_base_url ?? "https://app.element.io/";
+        // Rewrite URL so that it can be used outside the app
+        url = baseUrl + url.substring(23);
     }
 
     const popupMenu = new Menu();