From 29c176b521d9064304cdbd371a3d1ed4b36da086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E7=85=9C=E6=81=92?= <xyhken@icloud.com>
Date: Tue, 30 May 2023 18:51:11 +0800
Subject: [PATCH 01/12] Remove message audio element (for another pr)

---
 src/vector/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vector/index.html b/src/vector/index.html
index 9f41e6c216..376679768c 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -73,10 +73,6 @@
     <img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
 
-    <audio id="messageAudio">
-        <source src="media/message.ogg" type="audio/ogg" />
-        <source src="media/message.mp3" type="audio/mpeg" />
-    </audio>
     <audio id="ringAudio" loop>
         <source src="media/ring.ogg" type="audio/ogg" />
         <source src="media/ring.mp3" type="audio/mpeg" />

From b98289c66032c1b481981ac2df9e162facd759cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E7=85=9C=E6=81=92?= <xyhken@icloud.com>
Date: Tue, 27 Jun 2023 12:33:04 +0800
Subject: [PATCH 02/12] Remove (almost) all <audio> tags

Not sure what `remoteAudio` does, seems only used in tests,
so I left it there.
---
 src/vector/index.html | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/vector/index.html b/src/vector/index.html
index 376679768c..8ec741426d 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -73,26 +73,6 @@
     <img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
 
-    <audio id="ringAudio" loop>
-        <source src="media/ring.ogg" type="audio/ogg" />
-        <source src="media/ring.mp3" type="audio/mpeg" />
-    </audio>
-    <audio id="ringbackAudio" loop>
-        <source src="media/ringback.ogg" type="audio/ogg" />
-        <source src="media/ringback.mp3" type="audio/mpeg" />
-    </audio>
-    <audio id="callendAudio">
-        <source src="media/callend.ogg" type="audio/ogg" />
-        <source src="media/callend.mp3" type="audio/mpeg" />
-    </audio>
-    <audio id="busyAudio">
-        <source src="media/busy.ogg" type="audio/ogg" />
-        <source src="media/busy.mp3" type="audio/mpeg" />
-    </audio>
-    <audio id="errorAudio">
-        <source src="media/error.ogg" type="audio/ogg" />
-        <source src="media/error.mp3" type="audio/mpeg" />
-    </audio>
     <audio id="remoteAudio"></audio>
     <!-- let CSS themes pass constants to the app -->
     <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>

From 76416ec7b9d9a33aa21ff418ccc3419f177346c2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Jun 2024 14:31:11 +0100
Subject: [PATCH 03/12] Remove redundant reusable workflow input

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a9b38d9a4e..1c7924a2a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,6 @@ jobs:
             GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         with:
             final: ${{ inputs.mode == 'final' }}
-            include-changes: matrix-react-sdk
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             asset-path: dist/*.tar.gz
             expected-asset-count: 3

From 0845c515c40a1206d2fe61408fce0559fd2c8976 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Jun 2024 14:31:30 +0100
Subject: [PATCH 04/12] Use workflow_dispatch over repository_dispatch as it
 lets us specify branch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/release.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1c7924a2a9..3bb1418986 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,11 +30,13 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
+              uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1
               with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  repository: element-hq/element-desktop
-                  event-type: upstream-release-notify
+                  workflow: release-drafter.yml
+                  repo: element-hq/element-desktop
+                  ref: staging
+                  # Required when using the `repo` option. Either a PAT or a token generated from the GitHub app or CLI
+                  token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
 
     check:
         name: Post release checks

From 8776371ed4cacebd2ff75e71b5a85b2658c1a446 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Tue, 2 Jul 2024 11:14:44 +0200
Subject: [PATCH 05/12] ci: remove `mdbook-combiner` version

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e495e87eaa..2aefb39a32 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -60,7 +60,7 @@ jobs:
                   mdbook-version: "0.4.10"
 
             - name: Install mdbook extensions
-              run: cargo install mdbook-combiner@0.1.15 mdbook-mermaid
+              run: cargo install mdbook-combiner mdbook-mermaid
 
             - name: Prepare docs
               run: |

From 83186c040371aa4e6d1db3823a6dae04773cf87d Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Tue, 2 Jul 2024 11:21:17 +0200
Subject: [PATCH 06/12] wip: fake run

---
 .github/workflows/docs.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2aefb39a32..82db41ae76 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -2,7 +2,7 @@ name: Deploy documentation
 
 on:
     push:
-        branches: [develop]
+        branches: [florianduros/ci/mdbooks]
     workflow_dispatch: {}
 
 permissions:
@@ -103,13 +103,13 @@ jobs:
               with:
                   path: ./book
 
-    deploy:
-        environment:
-            name: github-pages
-            url: ${{ steps.deployment.outputs.page_url }}
-        runs-on: ubuntu-latest
-        needs: build
-        steps:
-            - name: Deploy to GitHub Pages
-              id: deployment
-              uses: actions/deploy-pages@v4
+#    deploy:
+#        environment:
+#            name: github-pages
+#            url: ${{ steps.deployment.outputs.page_url }}
+#        runs-on: ubuntu-latest
+#        needs: build
+#        steps:
+#            - name: Deploy to GitHub Pages
+#              id: deployment
+#              uses: actions/deploy-pages@v4

From cdb65233b0c27a08a123d0b7fe8878b8d4aea0dd Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Tue, 2 Jul 2024 11:27:39 +0200
Subject: [PATCH 07/12] Revert "wip: fake run"

This reverts commit 83186c040371aa4e6d1db3823a6dae04773cf87d.
---
 .github/workflows/docs.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 82db41ae76..2aefb39a32 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -2,7 +2,7 @@ name: Deploy documentation
 
 on:
     push:
-        branches: [florianduros/ci/mdbooks]
+        branches: [develop]
     workflow_dispatch: {}
 
 permissions:
@@ -103,13 +103,13 @@ jobs:
               with:
                   path: ./book
 
-#    deploy:
-#        environment:
-#            name: github-pages
-#            url: ${{ steps.deployment.outputs.page_url }}
-#        runs-on: ubuntu-latest
-#        needs: build
-#        steps:
-#            - name: Deploy to GitHub Pages
-#              id: deployment
-#              uses: actions/deploy-pages@v4
+    deploy:
+        environment:
+            name: github-pages
+            url: ${{ steps.deployment.outputs.page_url }}
+        runs-on: ubuntu-latest
+        needs: build
+        steps:
+            - name: Deploy to GitHub Pages
+              id: deployment
+              uses: actions/deploy-pages@v4

From e80ab738ce825be4bff3f14e9cd5f314916f1448 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jul 2024 13:51:02 +0100
Subject: [PATCH 08/12] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/app-tests/server-config-test.ts | 2 ++
 test/app-tests/wrapper-test.tsx      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/test/app-tests/server-config-test.ts b/test/app-tests/server-config-test.ts
index 32e92de781..f16c135c37 100644
--- a/test/app-tests/server-config-test.ts
+++ b/test/app-tests/server-config-test.ts
@@ -21,6 +21,8 @@ import fetchMock from "fetch-mock-jest";
 import { loadApp } from "../../src/vector/app";
 import WebPlatform from "../../src/vector/platform/WebPlatform";
 
+jest.mock("matrix-react-sdk/src/audio/compat");
+
 /** The matrix versions our mock server claims to support */
 const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
 
diff --git a/test/app-tests/wrapper-test.tsx b/test/app-tests/wrapper-test.tsx
index a2dbe6cf73..1c088e0601 100644
--- a/test/app-tests/wrapper-test.tsx
+++ b/test/app-tests/wrapper-test.tsx
@@ -28,6 +28,8 @@ import WebPlatform from "../../src/vector/platform/WebPlatform";
 import { loadApp } from "../../src/vector/app";
 import { waitForLoadingSpinner, waitForWelcomeComponent } from "../test-utils";
 
+jest.mock("matrix-react-sdk/src/audio/compat");
+
 /** The matrix versions our mock server claims to support */
 const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
 

From d1f0cbea27fa99ced76121296ba8da84a98f552b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jul 2024 14:04:48 +0100
Subject: [PATCH 09/12] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/app-tests/server-config-test.ts | 2 --
 test/app-tests/wrapper-test.tsx      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/test/app-tests/server-config-test.ts b/test/app-tests/server-config-test.ts
index f16c135c37..32e92de781 100644
--- a/test/app-tests/server-config-test.ts
+++ b/test/app-tests/server-config-test.ts
@@ -21,8 +21,6 @@ import fetchMock from "fetch-mock-jest";
 import { loadApp } from "../../src/vector/app";
 import WebPlatform from "../../src/vector/platform/WebPlatform";
 
-jest.mock("matrix-react-sdk/src/audio/compat");
-
 /** The matrix versions our mock server claims to support */
 const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
 
diff --git a/test/app-tests/wrapper-test.tsx b/test/app-tests/wrapper-test.tsx
index 1c088e0601..a2dbe6cf73 100644
--- a/test/app-tests/wrapper-test.tsx
+++ b/test/app-tests/wrapper-test.tsx
@@ -28,8 +28,6 @@ import WebPlatform from "../../src/vector/platform/WebPlatform";
 import { loadApp } from "../../src/vector/app";
 import { waitForLoadingSpinner, waitForWelcomeComponent } from "../test-utils";
 
-jest.mock("matrix-react-sdk/src/audio/compat");
-
 /** The matrix versions our mock server claims to support */
 const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
 

From 561868f12ad0ce336e3ece85f4daec972559d34d Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Thu, 4 Jul 2024 15:26:58 +0200
Subject: [PATCH 10/12] fix: use last node lts in workflow

---
 .github/workflows/build.yml            | 1 +
 .github/workflows/build_develop.yml    | 1 +
 .github/workflows/static_analysis.yaml | 5 +++++
 .github/workflows/tests.yaml           | 1 +
 .github/workflows/update-jitsi.yml     | 1 +
 5 files changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b6924528f6..84bb3d263d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             # Workaround for yarn install timeouts, especially on Windows
             - run: yarn config set network-timeout 300000
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index 96b96c8398..2407d2e6f1 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -26,6 +26,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index 2caa342b6b..ed0148f36c 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -21,6 +21,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -43,6 +44,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -60,6 +62,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
             - name: Install Dependencies
@@ -77,6 +80,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -94,6 +98,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             - name: Install Deps
               run: "scripts/layered.sh"
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b654b2a3a2..01965af419 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,6 +23,7 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
index 383ed0b1c8..cf25e602e5 100644
--- a/.github/workflows/update-jitsi.yml
+++ b/.github/workflows/update-jitsi.yml
@@ -13,6 +13,7 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
+                  node-version: "lts/*"
 
             - name: Install Deps
               run: "yarn install --frozen-lockfile"

From e4d138f4d1f957900c87dcb2200c28c6ca5267e5 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Thu, 4 Jul 2024 12:35:48 -0400
Subject: [PATCH 11/12] Add a Modernizr check for v mode regexes

I plan to use v mode regexes to test for emoji sequences, and Michael has advised me that we need to ensure that the "incompatible browser" screen shows if they are not supported.
---
 src/vector/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/vector/index.ts b/src/vector/index.ts
index c5fee22a04..a18657609b 100644
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -56,8 +56,8 @@ function checkBrowserFeatures(): boolean {
         return false;
     }
 
-    // Custom checks atop Modernizr because it doesn't have ES2018/ES2019 checks
-    // in it for some features we depend on.
+    // Custom checks atop Modernizr because it doesn't have checks in it for
+    // some features we depend on.
     // Modernizr requires rules to be lowercase with no punctuation.
     // ES2018: http://262.ecma-international.org/9.0/#sec-promise.prototype.finally
     window.Modernizr.addTest("promiseprototypefinally", () => typeof window.Promise?.prototype?.finally === "function");
@@ -70,6 +70,11 @@ function checkBrowserFeatures(): boolean {
     );
     // ES2019: http://262.ecma-international.org/10.0/#sec-object.fromentries
     window.Modernizr.addTest("objectfromentries", () => typeof window.Object?.fromEntries === "function");
+    // ES2024: https://tc39.es/ecma262/2024/#sec-get-regexp.prototype.unicodesets
+    window.Modernizr.addTest(
+        "regexpunicodesets",
+        () => window.RegExp?.prototype && "unicodeSets" in window.RegExp.prototype,
+    );
 
     const featureList = Object.keys(window.Modernizr) as Array<keyof ModernizrStatic>;
 

From 88d507f4f9f0fa2a36dec85ca7896405e0ed395a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jul 2024 19:23:13 +0100
Subject: [PATCH 12/12] Update index.html

---
 src/vector/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vector/index.html b/src/vector/index.html
index 8fa92b9ac9..37a1d294bd 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -81,7 +81,6 @@
     <img src="<%= require('matrix-react-sdk/res/img/format/quote.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
     <img src="<%= require('matrix-react-sdk/res/img/format/strikethrough.svg').default %>" aria-hidden alt="" width="25" height="22" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
 
-    <audio id="remoteAudio"></audio>
     <!-- let CSS themes pass constants to the app -->
     <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>