Merge tag 'v1.11.39' into upgrade/element-web-v1.11.39 - conflicts so…

…lved, not tested. Patch conflicts unsolved.

* Deprecate camelCase config options ([\#25800](element-hq/element-web#25800)).
* Deprecate customisations in favour of Module API ([\#25736](element-hq/element-web#25736)). Fixes #25733.
* Update labs.md for knock rooms ([\#25923](element-hq/element-web#25923)). Contributed by @charlynguyen.
* Package release builds of element-web in package.element.io debs ([\#25198](element-hq/element-web#25198)).
* Allow knocking rooms ([\#11353](matrix-org/matrix-react-sdk#11353)). Contributed by @charlynguyen.
* Support adding space-restricted joins on rooms not members of those spaces ([\#9017](matrix-org/matrix-react-sdk#9017)). Fixes #19213.
* Clear requiresClient and show pop-out if widget-api fails to ready ([\#11321](matrix-org/matrix-react-sdk#11321)). Fixes vector-im/customer-retainer#73.
* Bump pagination sizes due to hidden events ([\#11342](matrix-org/matrix-react-sdk#11342)).
* Remove display of key backup signatures from backup settings ([\#11333](matrix-org/matrix-react-sdk#11333)).
* Use PassphraseFields in ExportE2eKeysDialog to enforce minimum passphrase complexity ([\#11222](matrix-org/matrix-react-sdk#11222)). Fixes #9478.
* Fix "Export chat" not respecting configured time format in plain text mode ([\#10696](matrix-org/matrix-react-sdk#10696)). Fixes #23838. Contributed by @rashmitpankhania.
* Fix some missing 1-count pluralisations around event list summaries ([\#11371](matrix-org/matrix-react-sdk#11371)). Fixes #25925.
* Fix create subspace dialog not working for public space creation ([\#11367](matrix-org/matrix-react-sdk#11367)). Fixes #25916.
* Search for users on paste ([\#11304](matrix-org/matrix-react-sdk#11304)). Fixes #17523. Contributed by @peterscheu-aceart.
* Fix AppTile context menu not always showing up when it has options ([\#11358](matrix-org/matrix-react-sdk#11358)). Fixes #25914.
* Fix clicking on home all rooms space notification not working ([\#11337](matrix-org/matrix-react-sdk#11337)). Fixes #22844.
* Fix joining a suggested room switching space away ([\#11347](matrix-org/matrix-react-sdk#11347)). Fixes #25838.
* Fix home/all rooms context menu in space panel ([\#11350](matrix-org/matrix-react-sdk#11350)). Fixes #25896.
* Make keyboard handling in and out of autocomplete completions consistent ([\#11344](matrix-org/matrix-react-sdk#11344)). Fixes #25878.
* De-duplicate reactions by sender to account for faulty/malicious servers ([\#11340](matrix-org/matrix-react-sdk#11340)). Fixes #25872.
* Fix disable_3pid_login being ignored for the email field ([\#11335](matrix-org/matrix-react-sdk#11335)). Fixes #25863.
* Upgrade wysiwyg editor for ctrl+backspace windows fix ([\#11324](matrix-org/matrix-react-sdk#11324)). Fixes vector-im/verticals-internal#102.
* Unhide the view source event toggle - it works well enough ([\#11336](matrix-org/matrix-react-sdk#11336)). Fixes #25861.

.eslintrc.js

@@ -96,6 +96,7 @@ module.exports = {
                 // We don't need super strict typing in test utilities
                 "@typescript-eslint/explicit-function-return-type": "off",
                 "@typescript-eslint/explicit-member-accessibility": "off",
+                "@typescript-eslint/ban-ts-comment": "off",
             },
         },
         {

.github/ISSUE_TEMPLATE/config.yml

@@ -1,3 +1,4 @@
+blank_issues_enabled: false
 contact_links:
     - name: Questions & support
       url: https://tchap.beta.gouv.fr/#contact

.github/cfp_headers

@@ -1,6 +1,9 @@
 /*
+  ! Access-Control-Allow-Origin
   X-XSS-Protection: 1; mode=block
   X-Content-Type-Options: nosniff
+  X-Frame-Options: SAMEORIGIN
+  Content-Security-Policy: frame-ancestors 'self'
   Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
 
 /version

.github/workflows/build_debian.yaml

@@ -0,0 +1,56 @@
+name: Build Debian package
+on:
+    release:
+        types: [published]
+concurrency: ${{ github.workflow }}
+jobs:
+    build:
+        name: Build package
+        if: github.event.release.prerelease == false
+        environment: packages.element.io
+        runs-on: ubuntu-latest
+        env:
+            R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
+            R2_URL: ${{ vars.CF_R2_S3_API }}
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Prepare
+              run: |
+                  mkdir -p /tmp/element-web-debian/DEBIAN
+                  cp -R debian/ /tmp/element-web-debian/DEBIAN/
+                  mkdir -p /tmp/element-web-debian/usr/share/element-web/
+
+                  wget https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz
+                  mv element-* /tmp/element-web-debian/usr/share/element-web
+                  mv debian/usr/share/element-web/config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json
+              env:
+                  VERSION: ${{ github.ref_name }}
+
+            - name: Build deb package
+              run: |
+                  VERSION=$(cat package.json | jq -r .version)
+                  chmod -R u=rw,go=r /tmp/element-web-debian/usr/share/element-web/
+                  dpkg-deb -Zxz --root-owner-group -VVersion=$VERSION --build /tmp/element-web-debian element-web.deb
+
+            # For now just upload the artifact to github
+            - uses: actions/upload-artifact@v3
+              with:
+                  name: debs
+                  path: "*.deb"
+                  retention-days: 14
+
+            #- name: Upload incoming deb
+            #  run: aws s3 cp element-io-archive-keyring.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto
+            #  env:
+            #      AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+            #      AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+
+    #reprepro:
+    #    needs: build
+    #    name: Run reprepro
+    #    if: inputs.deploy && github.event.release.prerelease == false
+    #    uses: ./.github/workflows/reprepro.yaml
+    #    secrets: inherit
+    #    with:
+    #        incoming: element-web.deb

.github/workflows/update-topics.yaml

@@ -0,0 +1,95 @@
+name: Update release topics
+on:
+    workflow_dispatch:
+        inputs:
+            expected_status:
+                description: What type of release is the next expected release
+                required: true
+                default: RC
+                type: choice
+                options:
+                    - RC
+                    - Release
+            expected_date:
+                description: Expected release date e.g. July 11th
+                required: true
+                type: string
+concurrency: ${{ github.workflow }}
+jobs:
+    bot:
+        name: Release topic update
+        runs-on: ubuntu-latest
+        environment: Matrix
+        steps:
+            - uses: actions/github-script@v6
+              env:
+                  HS_URL: ${{ secrets.BETABOT_HS_URL }}
+                  LOBBY_ROOM_ID: ${{ secrets.ROOM_ID }}
+                  PUBLIC_ROOM_ID: "!YTvKGNlinIzlkMTVRl:matrix.org"
+                  ANNOUNCEMENT_ROOM_ID: "!bijaLdadorKgNGtHdA:matrix.org"
+                  TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }}
+                  RELEASE_STATUS: "Release status: ${{ inputs.expected_status }} expected ${{ inputs.expected_date }}"
+              with:
+                  script: |
+                      const { HS_URL, TOKEN, RELEASE_STATUS, LOBBY_ROOM_ID, PUBLIC_ROOM_ID, ANNOUNCEMENT_ROOM_ID } = process.env;
+
+                      const repo = context.repo;
+                      const { data } = await github.rest.repos.getLatestRelease({
+                          owner: repo.owner,
+                          repo: repo.repo,
+                      });
+                      console.log("Found latest version: " + data.tag_name);
+
+                      const releaseTopic = `Stable: ${data.tag_name} | ${RELEASE_STATUS}`;
+                      console.log("Release topic: " + releaseTopic);
+
+                      const regex = /Stable: v(.+) \| Release status: (\w+) expected (\w+ \d+\w\w)/gm;
+
+                      async function updateReleaseInTopic(roomId) {
+                          const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${roomId}/state/m.room.topic/`;
+                          const headers = {
+                              "Content-Type": "application/json",
+                              "Authorization": `Bearer ${TOKEN}`,
+                          };
+                          await fetch(`${HS_URL}/_matrix/client/v3/rooms/${roomId}/join`, {
+                              method: "POST",
+                              headers,
+                              body: "{}",
+                          });
+                          
+                          let res = await fetch(apiUrl, {
+                              method: "GET",
+                              headers,
+                          });
+
+                          const data = await res.json();
+                          const topic = data.topic.replace(regex, releaseTopic);
+                          if (topic === data.topic) {
+                              console.log(roomId, "nothing to do");
+                              return;
+                          }
+                          if (data["org.matrix.msc3765.topic"]) {
+                              data["org.matrix.msc3765.topic"].forEach(d => {
+                                  d.body = d.body.replace(regex, releaseTopic);
+                              });
+                          }
+
+                          res = await fetch(apiUrl, {
+                              method: "PUT",
+                              body: JSON.stringify({
+                                  ...data,
+                                  topic,
+                              }),
+                              headers,
+                          });
+                          
+                          if (res.ok) {
+                              console.log(roomId, "topic updated:", topic);
+                          } else {
+                              console.log(roomId, await res.text());
+                          }
+                      }
+
+                      await updateReleaseInTopic(LOBBY_ROOM_ID);
+                      await updateReleaseInTopic(PUBLIC_ROOM_ID);
+                      await updateReleaseInTopic(ANNOUNCEMENT_ROOM_ID);