Upstream v1.11.103

.gitmodules

@@ -3,10 +3,10 @@
 	url = https://github.com/SchildiChat/matrix-js-sdk.git
 [submodule "element-web"]
 	path = element-web
-	url = https://github.com/SchildiChat/element-web
+	url = https://github.com/SchildiChat/element-web.git
 [submodule "element-desktop"]
 	path = element-desktop
-	url = https://github.com/SchildiChat/element-desktop
+	url = https://github.com/SchildiChat/element-desktop.git
 [submodule "compound-web"]
 	path = compound-web
 	url = https://github.com/SchildiChat/compound-web.git

Containerfile.fedora

@@ -1,6 +1,6 @@
 FROM docker.io/fedora:40
 
-RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl python3-setuptools
+RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl python3-setuptools git
 
 # node setup
 ARG NODE_VERSION

compound-web

@@ -1 +1 @@
-Subproject commit 21c96607d1304aebf422bc64510ca4fa9fba520a
+Subproject commit 1bdb16230631237b790f54469a5b3f660bd4ad91

element-desktop

@@ -1 +1 @@
-Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f
+Subproject commit 0c751e1a25b3d7ca21830f076161c94887c887a9

element-web

@@ -1 +1 @@
-Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459
+Subproject commit 2c3bfff90d36697892ea7e32404751a896e26cc1

flake.nix

@@ -1,30 +1,44 @@
 {
   description = "The SchildiChat Matrix client";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
+  inputs.nixpkgs.url = github:NixOS/nixpkgs;
 
   outputs = { self, nixpkgs }: let
     systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
+
+    overlay = import ./nix/overlay.nix;
+
+    # Memoize nixpkgs for different platforms for efficiency.
+    nixpkgsFor = forAllSystems (system:
+      import nixpkgs {
+        inherit system;
+        overlays = [ overlay ];
+      });
   in {
-		packages = forAllSystems(system: let 
-			pkgs = nixpkgs.legacyPackages.${system};
-			cleanSource = src: with pkgs.lib; cleanSourceWith {
-    		filter = name: type: cleanSourceFilter name type
-     			&& !(hasInfix "/node_modules/" name)
-     			&& !(hasInfix "/nix/" name && hasSuffix ".nix" name);
+    inherit overlay;
 
-    			inherit src;
-			};
-		in {
-			schildichat-web = import ./nix/schildichat-web.nix { inherit pkgs cleanSource; };
-			schildichat-desktop = import ./nix/schildichat-desktop.nix { inherit pkgs cleanSource; };
+    packages = builtins.mapAttrs (system: pkgs: {
+      inherit (pkgs)
+        schildichat-web
+        schildichat-desktop
+        schildichat-desktop-wayland
+      ;
+    }) nixpkgsFor;
 
-			schildichat-desktop-wayland = self.packages.${system}.schildichat-desktop {
-				useWayland = true;
-			};
+    defaultPackage = forAllSystems (system: self.packages.${system}.schildichat-desktop);
 
-			default = self.packages.${system}.schildichat-desktop;
+    apps = forAllSystems(system: {
+      schildichat-desktop = {
+        type = "app";
+        program = "${self.packages.${system}.schildichat-desktop}/bin/schildichat-desktop";
+      };
+      schildichat-desktop-wayland = {
+        type = "app";
+        program = "${self.packages.${system}.schildichat-desktop-wayland}/bin/schildichat-desktop";
+      };
     });
+
+    defaultApp = forAllSystems (system: self.apps.${system}.schildichat-desktop);
   };
 }

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit f7bab544a795bd8c0cba919d8b261ea639518f49
+Subproject commit 40bc833bb79a7cfda376d7a7e94e9d6cab6169a7

nix/schildichat-desktop.nix

@@ -1,69 +0,0 @@
-{ pkgs
-, cleanSource
-, schildichat-desktop-src ? ../.
-, useWayland ? false
-}:
-
-let
-  inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
-
-  schildichat-web = pkgs.callPackage ./schildichat-web.nix { inherit pkgs cleanSource; };
-
-  packageJSON = schildichat-desktop-src + "/element-desktop/package.json";
-  yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock";
-  version = builtins.fromJSON (builtins.readFile packageJSON).version;
-
-  electron_exec = if pkgs.stdenv.isDarwin then 
-		"${pkgs.electron}/Applications/Electron.app/Contents/MacOS/Electron"
-	else 
-		"${pkgs.electron}/bin/electron";
-in pkgs.mkYarnPackage {
-  pname = "schildichat-desktop";
-  src = cleanSource (schildichat-desktop-src + "/element-desktop");
-  
-	nativeBuildInputs = [ pkgs.makeWrapper ];
-  inherit (pkgs.element-desktop) seshat keytar;
-
-  buildPhase = ''
-    export HOME=$(mktemp -d)
-    pushd deps/schildichat-desktop/
-    npx tsc
-    yarn run i18n
-    node ./scripts/copy-res.js
-    popd
-    rm -rf node_modules/matrix-seshat node_modules/keytar
-    ln -s $keytar node_modules/keytar
-    ln -s $seshat node_modules/matrix-seshat
-  '';
-
-  distPhase = "true";
-
-  desktopItem = pkgs.makeDesktopItem {
-    name = "schildichat-desktop";
-    exec = "schildichat-desktop %u";
-    icon = "schildichat";
-    desktopName = "SchildiChat";
-    genericName = "Matrix Client";
-    categories = "Network;InstantMessaging;Chat;";
-    extraEntries = "StartupWMClass=schildichat\nMimeType=x-scheme-handler/element;";
-  };
-
-  installPhase = ''
-    mkdir -p "$out/share/element"
-    ln -s '${schildichat-web}' "$out/share/element/webapp"
-    cp -r './deps/schildichat-desktop' "$out/share/element/electron"
-    cp -r './deps/schildichat-desktop/res/img' "$out/share/element"
-    rm "$out/share/element/electron/node_modules"
-    cp -r './node_modules' "$out/share/element/electron"
-    cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
-    ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
-
-    for icon in $out/share/element/electron/build/icons/*.png; do
-      mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
-      ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
-    done
-
-    makeWrapper '${electron_exec}' "$out/bin/schildichat-desktop" \
-      --add-flags "$out/share/element/electron${pkgs.lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
-  '';
-}

nix/schildichat-web.nix

@@ -1,38 +0,0 @@
-{ pkgs
-, cleanSource
-, schildichat-desktop-src ? ../. }:
-
-let
-  version = pkgs.lib.importJSON "${schildichat-desktop-src}/element-web/package.json".version;
-in pkgs.stdenv.mkDerivation {
-  pname = "schildichat-web";
-  inherit version;
-
-  src = cleanSource schildichat-desktop-src;
-  nativeBuildInputs = with pkgs; [ nodejs yarn ];
-
-  buildPhase = ''
-    export HOME=$PWD/tmp-home
-    mkdir -p $HOME
-
-    cp configs/sc/config.json element-web/
-
-    pushd element-web
-    yarn install --frozen-lockfile
-
-    pushd ../matrix-react-sdk
-    yarn install --frozen-lockfile
-    yarn reskindex -h ../element-web/src/header
-    popd
-
-    yarn reskindex -h src/header
-    node scripts/copy-res.js
-    yarn build
-    popd
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r element-web/webapp $out/
-  '';
-}

patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch

@@ -1,4 +1,4 @@
-From 23c8be7b910bc0532850d4fe87dd810e8f556ad9 Mon Sep 17 00:00:00 2001
+From 73f20d371b005b2ceba60c84e040bf246dfb740d Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 2 Dec 2023 12:57:26 +0100
 Subject: Add back schildi fetch-package.ts modifications

patches/element-web/0003-Don-t-welcome-to-Element.patch

@@ -1,4 +1,4 @@
-From 0d8678e982413d2a76d3e842e314fe173ed70b3c Mon Sep 17 00:00:00 2001
+From 6c056866602edd92ccf8237c1fcce3cbaf1303f4 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:38:47 +0100
 Subject: Don't welcome to Element
@@ -8,7 +8,7 @@ Subject: Don't welcome to Element
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/res/welcome.html b/res/welcome.html
-index ef2d43bd8f..5b71670f4f 100644
+index 9fdd60a7c0..453baab965 100644
 --- a/res/welcome.html
 +++ b/res/welcome.html
 @@ -169,7 +169,7 @@ we don't have an account and should hide them. No account == no guest account ei

patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch

@@ -1,4 +1,4 @@
-From 6385be0c76621d18084d54b83089ccb67c096513 Mon Sep 17 00:00:00 2001
+From 14f922a37ab1879de4834e0e3734f83ec453f679 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:55:30 +0100
 Subject: Stronger login background to ensure contrast of our icon with our bg

patches/element-web/0005-Schildify-login-footer.patch

@@ -1,4 +1,4 @@
-From 4984dc854d97121ba311ae4cc19bbb638f716e9e Mon Sep 17 00:00:00 2001
+From 9474a8c7f96f94c4a19380251121beb3c5a3c925 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 20:07:30 +0100
 Subject: Schildify login footer

patches/element-web/0006-Disable-sticky-rooms.patch

@@ -1,4 +1,4 @@
-From 70d03387cd78e193b9d37a97f5aacab9e25f926f Mon Sep 17 00:00:00 2001
+From c2efb5cd9f33a87ef2a900272d7845883fc62f6a Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 18 Jan 2022 13:28:22 +0100
 Subject: Disable sticky rooms

patches/element-web/0007-Bring-back-unified-room-list.patch

@@ -1,4 +1,4 @@
-From b81d62dc80dc7efdab2996c79662c4626302a8d0 Mon Sep 17 00:00:00 2001
+From a05aa4750cc2c3e44ec9f9a9e17271b3d6d91f36 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 5 May 2024 10:12:17 +0200
 Subject: Bring back unified room list
@@ -128,10 +128,10 @@ index 6be226a172..dbb69d8f62 100644
                  (this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) ||
                  (this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index aee9141c29..7eda4d794b 100644
+index 36030713ec..ac88f717d4 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -358,6 +358,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
+@@ -359,6 +359,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
  export type StringSettingKey = Assignable<Settings, IBaseSetting<string>>;
  
  export const SETTINGS: Settings = {
@@ -147,10 +147,10 @@ index aee9141c29..7eda4d794b 100644
          isFeature: true,
          labsGroup: LabGroup.VoiceAndVideo,
 diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
-index 6985e007bd..206ab20037 100644
+index 2fc396b8b3..0739857b0b 100644
 --- a/src/stores/room-list/RoomListStore.ts
 +++ b/src/stores/room-list/RoomListStore.ts
-@@ -504,6 +504,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -494,6 +494,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
                  this.setAndPersistListOrder(tag, listOrder);
              }
          }
@@ -160,7 +160,7 @@ index 6985e007bd..206ab20037 100644
      }
  
      private onAlgorithmListUpdated = (forceUpdate: boolean): void => {
-@@ -617,7 +620,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -607,7 +610,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
       */
      public getTagsForRoom(room: Room): TagID[] {
          const algorithmTags = this.algorithm.getTagsForRoom(room);

patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch

@@ -1,4 +1,4 @@
-From 1755079d1f53e5738ef9841607184d1bae0a05af Mon Sep 17 00:00:00 2001
+From 20700378880fc7dff567ed68fd04c83daaa3daa9 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 17 Dec 2023 11:11:58 +0100
 Subject: Don't sort muted rooms to bottom, I still want to see them.

patches/element-web/0009-Don-t-preview-reactions.patch

@@ -1,4 +1,4 @@
-From db11438720e8798855e72dbe2c41223d7d565d50 Mon Sep 17 00:00:00 2001
+From 2ced3032f04e97b57b3b21ff0bde91f95e4a3590 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 14 Dec 2023 10:32:10 +0100
 Subject: Don't preview reactions

patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch

@@ -1,4 +1,4 @@
-From 28c8aafc65b222ddb7e663379b9981f005e77ef0 Mon Sep 17 00:00:00 2001
+From 46eb0329f9c66937545a6d55cf025ccb4b3803f5 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 17 Nov 2021 12:50:25 +0100
 Subject: Hide the "mute" notification state the same way as the other states

patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch

@@ -1,4 +1,4 @@
-From 5042b0693d8f0d5b722ae40169855a28364f95a2 Mon Sep 17 00:00:00 2001
+From 71b7b79b37c7caef3d560057c9abc571da7066bb Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Fri, 10 May 2024 18:58:32 +0200
 Subject: Allow muted rooms to render as unread

patches/element-web/0012-Increase-default-visible-tiles.patch

@@ -1,4 +1,4 @@
-From f96924008d456dadd8d56a2bb6756a1afbd96431 Mon Sep 17 00:00:00 2001
+From 53fb54d47a30cb553776efd5c687f1f3dc4f1423 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 30 Aug 2020 15:33:01 +0200
 Subject: Increase default visible tiles

patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch

@@ -1,4 +1,4 @@
-From d52e8bb4d370dd0ba42a94e20dfc7f900a33f508 Mon Sep 17 00:00:00 2001
+From 49f74194e5a5fd8a21411233d88ad3ce94bd1210 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 26 May 2024 10:43:36 +0200
 Subject: Bring back showSpaceDMBadges setting, force-enabled for now
@@ -12,10 +12,10 @@ Co-authored-by: SpiritCroc <dev@spiritcroc.de>
  2 files changed, 30 insertions(+)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 7eda4d794b..b6cde99d81 100644
+index ac88f717d4..7295b716b8 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -365,6 +365,11 @@ export const SETTINGS: Settings = {
+@@ -366,6 +366,11 @@ export const SETTINGS: Settings = {
          default: true,
          controller: new ReloadOnChangeController(),
      },
@@ -28,12 +28,12 @@ index 7eda4d794b..b6cde99d81 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index 690beaa0b7..fcd7ff659b 100644
+index 015c9fa0fd..c5c34c4e14 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
-@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
      private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors");
-     private _storeReadyDeferred = defer();
+     private _storeReadyDeferred = Promise.withResolvers<void>();
  
 +    // SC start
 +    private _showSpaceDMBadges = true;
@@ -49,7 +49,7 @@ index 690beaa0b7..fcd7ff659b 100644
          SettingsStore.monitorSetting("Spaces.allRoomsInHome", null);
          SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null);
          SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null);
-@@ -215,6 +223,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -214,6 +222,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
          return this._allRoomsInHome;
      }
  
@@ -60,7 +60,7 @@ index 690beaa0b7..fcd7ff659b 100644
      public setActiveRoomInSpace(space: SpaceKey): void {
          if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return;
          if (space !== this.activeSpace) this.setActiveSpace(space, false);
-@@ -724,6 +736,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -734,6 +746,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
  
                      if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false;
  
@@ -71,7 +71,7 @@ index 690beaa0b7..fcd7ff659b 100644
                      if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
                          return s === dmBadgeSpace;
                      }
-@@ -1301,6 +1317,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -1311,6 +1327,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                          break;
                      }
  

patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch

@@ -1,4 +1,4 @@
-From 2a5b9f5f25b4b5fdfb60c21b4edcd9dd20dbda5d Mon Sep 17 00:00:00 2001
+From 51006640c610c9e4f02ffbf42a8674ff17783a05 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 29 May 2024 19:32:42 +0200
 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

patches/element-web/0015-Allow-reactions-to-take-more-space.patch

@@ -1,4 +1,4 @@
-From eae491a0a6a3f8bfa47785e21467ca56d50dd437 Mon Sep 17 00:00:00 2001
+From cd61fbeec18a633e7e2ac0595f0d658cf14de3cc Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sat, 22 Apr 2023 12:15:18 +0200
 Subject: Allow reactions to take more space

patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch

@@ -1,4 +1,4 @@
-From 0e919ce4854c5f66870f4465b8e1c4b793960025 Mon Sep 17 00:00:00 2001
+From 7ab1d126c752ffca96fadc55789f368438768a0b Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Thu, 30 May 2024 14:35:16 +0200
 Subject: On space switch don't automatically show last opened room
@@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room
  3 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
-index 0f722ae53d..47f09400d7 100644
+index cc69455a8a..d2208eca84 100644
 --- a/src/components/structures/MatrixChat.tsx
 +++ b/src/components/structures/MatrixChat.tsx
-@@ -1456,7 +1456,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1416,7 +1416,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          if (this.screenAfterLogin && this.screenAfterLogin.screen) {
              this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
              this.screenAfterLogin = undefined;
@@ -30,7 +30,7 @@ index 0f722ae53d..47f09400d7 100644
              // Before defaulting to directory, show the last viewed room
              this.viewLastRoom();
          } else {
-@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1428,6 +1436,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          }
      }
  
@@ -46,10 +46,10 @@ index 0f722ae53d..47f09400d7 100644
          dis.dispatch<ViewRoomPayload>({
              action: Action.ViewRoom,
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index b6cde99d81..61a17d09ae 100644
+index 7295b716b8..cab6622f9a 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -370,6 +370,12 @@ export const SETTINGS: Settings = {
+@@ -371,6 +371,12 @@ export const SETTINGS: Settings = {
          supportedLevels: LEVELS_ACCOUNT_SETTINGS,
          default: true,
      },
@@ -63,10 +63,10 @@ index b6cde99d81..61a17d09ae 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index fcd7ff659b..33407f74e8 100644
+index c5c34c4e14..9c0090d9cc 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
-@@ -288,6 +288,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -287,6 +287,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
              // else if the last viewed room in this space is joined then view that
              // else view space home or home depending on what is being clicked on
              if (

patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch

@@ -1,4 +1,4 @@
-From 27ba28c7b3840b5b458bd98599183728e681c885 Mon Sep 17 00:00:00 2001
+From 563a3f3f70dad3facfe3b7744f8286c5592ea74d Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 9 Aug 2022 09:32:19 +0200
 Subject: Exclude spaces from breadcrumbs

patches/element-web/0018-Stop-the-search-bar-wobble.patch

@@ -1,4 +1,4 @@
-From 2611dc55c8c915f19ad3b06c3d406101bce24b67 Mon Sep 17 00:00:00 2001
+From cdbb2bedc2bb56ca332205ae308314ede303bf2d Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Mon, 19 Aug 2024 20:27:33 +0200
 Subject: Stop the search bar wobble
@@ -8,7 +8,7 @@ Subject: Stop the search bar wobble
  1 file changed, 1 insertion(+)
 
 diff --git a/res/css/_common.pcss b/res/css/_common.pcss
-index 75180013f6..e55eadaaf7 100644
+index 3eed8c93c6..caaa0df3b9 100644
 --- a/res/css/_common.pcss
 +++ b/res/css/_common.pcss
 @@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon {

patches/element-web/0019-Import-SC-compound-theme-overrides.patch

@@ -1,4 +1,4 @@
-From 453eae3dc1a21fd18c28dca91498efbbadfb4e50 Mon Sep 17 00:00:00 2001
+From f72f3e0413572dfe15cbb1d4e103794f83195a10 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 11:23:54 +0200
 Subject: Import SC compound theme overrides
@@ -8,7 +8,7 @@ Subject: Import SC compound theme overrides
  1 file changed, 1 insertion(+)
 
 diff --git a/res/css/_common.pcss b/res/css/_common.pcss
-index e55eadaaf7..21d0f1d83a 100644
+index caaa0df3b9..44c83ecd83 100644
 --- a/res/css/_common.pcss
 +++ b/res/css/_common.pcss
 @@ -11,6 +11,7 @@ Please see LICENSE files in the repository root for full details.

patches/element-web/0020-No-damn-avatar-background-in-room-list.patch

@@ -1,4 +1,4 @@
-From f1cac8ba3ffcd3cc0b7ab6d014d6e40d8dec4451 Mon Sep 17 00:00:00 2001
+From e0838fc65638230113af6039f99de5e897e74825 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 7 Sep 2021 19:41:52 +0200
 Subject: No damn avatar background in room list

patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch

@@ -1,4 +1,4 @@
-From c5ae977ed90c680d9055460295f60f4945f0c98a Mon Sep 17 00:00:00 2001
+From 551beff1e447a56948a874a336940fc48354d897 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 22 Dec 2020 19:16:28 +0100
 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
@@ -8,10 +8,10 @@ Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
  1 file changed, 6 insertions(+)
 
 diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
-index 7baa127f16..4da70f5ecb 100644
+index 2c10d0afd9..d46320e8c3 100644
 --- a/src/components/views/rooms/EventTile.tsx
 +++ b/src/components/views/rooms/EventTile.tsx
-@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
+@@ -681,6 +681,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
              return false;
          }
  

patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch

@@ -1,4 +1,4 @@
-From efe6a8611871296b277adbf5201fec0826b837fe Mon Sep 17 00:00:00 2001
+From 66b83eef7b1c212cc808b41fc7f257931c9c9c6a Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:26:16 +0200
 Subject: Always apply corner radius to all edges of the bubble
@@ -8,7 +8,7 @@ Subject: Always apply corner radius to all edges of the bubble
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss
-index c25cbfcec4..682ea64890 100644
+index 1607c45924..aa69fbf07f 100644
 --- a/res/css/views/rooms/_EventBubbleTile.pcss
 +++ b/res/css/views/rooms/_EventBubbleTile.pcss
 @@ -283,6 +283,8 @@ Please see LICENSE files in the repository root for full details.

patches/element-web/0023-Always-show-timestamps-by-default.patch

@@ -1,4 +1,4 @@
-From 4c1b8a37c564d086ef37049cf5b0c4ac6376e8a9 Mon Sep 17 00:00:00 2001
+From b755c4d712f402dd27e0c8631cf30a173c1d4605 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:53:07 +0200
 Subject: Always show timestamps by default
@@ -8,10 +8,10 @@ Subject: Always show timestamps by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 61a17d09ae..4ca441dc47 100644
+index cab6622f9a..01cb113acb 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -795,7 +795,7 @@ export const SETTINGS: Settings = {
+@@ -801,7 +801,7 @@ export const SETTINGS: Settings = {
      "alwaysShowTimestamps": {
          supportedLevels: LEVELS_ACCOUNT_SETTINGS,
          displayName: _td("settings|always_show_message_timestamps"),

patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch

@@ -1,4 +1,4 @@
-From 9fcbc30485a80dcfa7321fa3599d16ce5e7308e6 Mon Sep 17 00:00:00 2001
+From 7c46305309b087c0d1d26cc77266532541307cb0 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 17 Oct 2024 19:40:51 +0200
 Subject: Enable custom emote rendering by default
@@ -8,10 +8,10 @@ Subject: Enable custom emote rendering by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 4ca441dc47..aa74245519 100644
+index 01cb113acb..cd946a7eb5 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -650,7 +650,7 @@ export const SETTINGS: Settings = {
+@@ -656,7 +656,7 @@ export const SETTINGS: Settings = {
          description: _td("labs|render_reaction_images_description"),
          supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
          supportedLevelsAreOrdered: true,

patches/element-web/0025-Enable-chat-previews-by-default.patch

@@ -1,4 +1,4 @@
-From e84deb43f138f16131d67aa46c1d5a47e298e776 Mon Sep 17 00:00:00 2001
+From 6ae02f585f3334c368b3fac082ffcb25d59ee9bb Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:24:26 +0100
 Subject: Enable chat previews by default

patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch

@@ -1,4 +1,4 @@
-From 8354faea210da07d2948ca60dd6eaf3e7a668f86 Mon Sep 17 00:00:00 2001
+From 22a03cfd810b59c11ce61d9774e9929afd271789 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 30 Nov 2024 19:42:44 +0100
 Subject: Disable showing people in spaces by default
@@ -9,10 +9,10 @@ Subject: Disable showing people in spaces by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index aa74245519..07227b02dc 100644
+index cd946a7eb5..fa840e88ca 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
-@@ -1233,7 +1233,7 @@ export const SETTINGS: Settings = {
+@@ -1229,7 +1229,7 @@ export const SETTINGS: Settings = {
      },
      "Spaces.showPeopleInSpace": {
          supportedLevels: [SettingLevel.ROOM_ACCOUNT],

patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch

@@ -1,4 +1,4 @@
-From 345e3cce61ff9afa68d8b17dde379fce269faa56 Mon Sep 17 00:00:00 2001
+From 55c47b4ce8cf3423bfe6a7db2fb7a0120d410f2b Mon Sep 17 00:00:00 2001
 From: Suguru Hirahara <luixxiul@users.noreply.github.com>
 Date: Thu, 31 Oct 2024 13:44:20 -0400
 Subject: Improve IRC layout for SchildiChat