From 4294ce2478bd6dde7569fdd40399c429d3be3a28 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 16 Apr 2025 20:17:54 +0200 Subject: [PATCH] Upstream .97 --- compound-web | 2 +- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- ...childi-fetch-package.ts-modifications.patch | 4 ++-- .../0002-Change-default-login-background.patch | 6 +++--- .../0003-Don-t-welcome-to-Element.patch | 4 ++-- ...background-to-ensure-contrast-of-our-.patch | 4 ++-- .../0005-Schildify-login-footer.patch | 6 +++--- .../0006-Disable-sticky-rooms.patch | 4 ++-- .../0007-Bring-back-unified-room-list.patch | 18 +++++++++--------- ...d-rooms-to-bottom-I-still-want-to-see.patch | 4 ++-- .../0009-Don-t-preview-reactions.patch | 4 ++-- ...otification-state-the-same-way-as-the.patch | 4 ++-- ...Allow-muted-rooms-to-render-as-unread.patch | 10 +++++----- .../0012-Increase-default-visible-tiles.patch | 4 ++-- ...SpaceDMBadges-setting-force-enabled-f.patch | 8 ++++---- ...rm-reactions-from-tadzik-freeform-rea.patch | 6 +++--- ...15-Allow-reactions-to-take-more-space.patch | 4 ++-- ...-don-t-automatically-show-last-opened.patch | 14 +++++++------- .../0017-Exclude-spaces-from-breadcrumbs.patch | 4 ++-- .../0018-Stop-the-search-bar-wobble.patch | 4 ++-- ...19-Import-SC-compound-theme-overrides.patch | 4 ++-- ...o-damn-avatar-background-in-room-list.patch | 4 ++-- ...-in-1-1-chats-Close-SchildiChat-schil.patch | 8 ++++---- ...rner-radius-to-all-edges-of-the-bubbl.patch | 4 ++-- ...023-Always-show-timestamps-by-default.patch | 8 ++++---- ...ble-custom-emote-rendering-by-default.patch | 8 ++++---- .../0025-Enable-chat-previews-by-default.patch | 4 ++-- ...e-showing-people-in-spaces-by-default.patch | 8 ++++---- ...27-Improve-IRC-layout-for-SchildiChat.patch | 6 +++--- 31 files changed, 87 insertions(+), 87 deletions(-) diff --git a/compound-web b/compound-web index 57ee5bf..21c9660 160000 --- a/compound-web +++ b/compound-web @@ -1 +1 @@ -Subproject commit 57ee5bfdf13c58ca3bcbc2d0eb2993d7b4a0b89d +Subproject commit 21c96607d1304aebf422bc64510ca4fa9fba520a diff --git a/element-desktop b/element-desktop index 7d95337..6ecb5b9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 7d95337b9b4847752b4d7ffac8a894c7bdc7d7ac +Subproject commit 6ecb5b93427770117bafd283c072d9169f68e06d diff --git a/element-web b/element-web index 702182d..27bdedd 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 702182d503b5afdb262634384606797dde103a4d +Subproject commit 27bdedd5447d7070b97ecfbfd224d786a7cc4504 diff --git a/matrix-js-sdk b/matrix-js-sdk index 5f3f080..f7bab54 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5f3f08071fbab8bc6af08b0d940189a513f572e2 +Subproject commit f7bab544a795bd8c0cba919d8b261ea639518f49 diff --git a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch index a509972..dd6638f 100644 --- a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch +++ b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch @@ -1,4 +1,4 @@ -From 1f589d9bb0c332ccb55d51f824f707385d80fbc0 Mon Sep 17 00:00:00 2001 +From 23c8be7b910bc0532850d4fe87dd810e8f556ad9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:57:26 +0100 Subject: Add back schildi fetch-package.ts modifications @@ -58,5 +58,5 @@ index 7282945..4be7ab0 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch index e2f2135..cc56dec 100644 --- a/patches/element-web/0002-Change-default-login-background.patch +++ b/patches/element-web/0002-Change-default-login-background.patch @@ -1,4 +1,4 @@ -From 474c8a5e8b345fe8206b56b880b1421a5189b797 Mon Sep 17 00:00:00 2001 +From e1d54c00c828581c54de7db81a3822fe40f0da0f Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 29 Nov 2020 23:30:59 +0100 Subject: Change default login background @@ -22117,7 +22117,7 @@ index dd3facaa79..3c7fe2503e 100644 const configuredUrl = brandingConfig?.get("welcome_background_url"); if (configuredUrl) { diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx -index 5330d74520..1642300bc6 100644 +index ef0d6e57fc..bfc0c58a68 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -118,7 +118,7 @@ export default class HelpUserSettingsTab extends React.Component -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0003-Don-t-welcome-to-Element.patch b/patches/element-web/0003-Don-t-welcome-to-Element.patch index 6423dbf..559b6f6 100644 --- a/patches/element-web/0003-Don-t-welcome-to-Element.patch +++ b/patches/element-web/0003-Don-t-welcome-to-Element.patch @@ -1,4 +1,4 @@ -From c3cf43a61f54bb688b32c881564a181485170013 Mon Sep 17 00:00:00 2001 +From 0d8678e982413d2a76d3e842e314fe173ed70b3c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:38:47 +0100 Subject: Don't welcome to Element @@ -21,5 +21,5 @@ index ef2d43bd8f..5b71670f4f 100644

_t("powered_by_matrix_with_logo")

-- -2.48.1 +2.49.0 diff --git a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch index 1c37ebe..61dc861 100644 --- a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch +++ b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch @@ -1,4 +1,4 @@ -From 61fd7f169e275a27d168d1afe436c5dd34dbc09a Mon Sep 17 00:00:00 2001 +From 6385be0c76621d18084d54b83089ccb67c096513 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:55:30 +0100 Subject: Stronger login background to ensure contrast of our icon with our bg @@ -21,5 +21,5 @@ index 3c7fe2503e..64163e837c 100644 }; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch index b994c3b..2eb03eb 100644 --- a/patches/element-web/0005-Schildify-login-footer.patch +++ b/patches/element-web/0005-Schildify-login-footer.patch @@ -1,4 +1,4 @@ -From 460db57d64132c244504f2f046f7473b30359e7d Mon Sep 17 00:00:00 2001 +From 4984dc854d97121ba311ae4cc19bbb638f716e9e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 20:07:30 +0100 Subject: Schildify login footer @@ -8,7 +8,7 @@ Subject: Schildify login footer 1 file changed, 4 insertions(+) diff --git a/src/components/views/auth/AuthFooter.tsx b/src/components/views/auth/AuthFooter.tsx -index f609b4792a..8abcc8fa37 100644 +index 1942bf0431..1054d06f89 100644 --- a/src/components/views/auth/AuthFooter.tsx +++ b/src/components/views/auth/AuthFooter.tsx @@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler"; @@ -26,5 +26,5 @@ index f609b4792a..8abcc8fa37 100644 const authFooterLinks: JSX.Element[] = []; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch index f36c9b3..d4ed585 100644 --- a/patches/element-web/0006-Disable-sticky-rooms.patch +++ b/patches/element-web/0006-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 12b585464c5d85df4d210862543018a28b815bd0 Mon Sep 17 00:00:00 2001 +From 70d03387cd78e193b9d37a97f5aacab9e25f926f Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -25,5 +25,5 @@ index 5419a6e47c..25d6b78fde 100644 } -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch index b52cd8f..dd7dc94 100644 --- a/patches/element-web/0007-Bring-back-unified-room-list.patch +++ b/patches/element-web/0007-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From c14f17a15c7a4f22126eba9a92a417732fe3f659 Mon Sep 17 00:00:00 2001 +From b81d62dc80dc7efdab2996c79662c4626302a8d0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -16,7 +16,7 @@ Co-authored-by: su-ex 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx -index a940484b16..663f741fed 100644 +index 6be226a172..dbb69d8f62 100644 --- a/src/components/views/rooms/LegacyRoomList.tsx +++ b/src/components/views/rooms/LegacyRoomList.tsx @@ -83,11 +83,13 @@ interface IState { @@ -128,11 +128,11 @@ index a940484b16..663f741fed 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 439b0c112f..5d06388535 100644 +index aee9141c29..7eda4d794b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -351,6 +351,14 @@ export type FeatureSettingKey = Assignable; - export type BooleanSettingKey = Assignable> | FeatureSettingKey; +@@ -358,6 +358,14 @@ export type BooleanSettingKey = Assignable> | Fe + export type StringSettingKey = Assignable>; export const SETTINGS: Settings = { + // SC settings start @@ -147,10 +147,10 @@ index 439b0c112f..5d06388535 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index e1d2f7b7e8..64c757c377 100644 +index 6985e007bd..206ab20037 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -502,6 +502,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -504,6 +504,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem this.setAndPersistListOrder(tag, listOrder); } } @@ -160,7 +160,7 @@ index e1d2f7b7e8..64c757c377 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -615,7 +618,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem +@@ -617,7 +620,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implem */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -263,5 +263,5 @@ index 78823cbc42..00883e2ad6 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index 8d807ab..5503271 100644 --- a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 2180196ba74a9526d0a68ad17328631d9b661cd2 Mon Sep 17 00:00:00 2001 +From 1755079d1f53e5738ef9841607184d1bae0a05af Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 17 Dec 2023 11:11:58 +0100 Subject: Don't sort muted rooms to bottom, I still want to see them. @@ -21,5 +21,5 @@ index 0f95fe78c2..2de554c357 100644 /** -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch index a5bb171..aa3a05d 100644 --- a/patches/element-web/0009-Don-t-preview-reactions.patch +++ b/patches/element-web/0009-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 27d4baaaf19f3d80ec7d5617e54bd7621090d6a4 Mon Sep 17 00:00:00 2001 +From db11438720e8798855e72dbe2c41223d7d565d50 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -25,5 +25,5 @@ index 51e413940d..7775d1e52a 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch index d897a59..dfe3d46 100644 --- a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From db8b600a3695f35e70cb0c2a9f6b3cba99d2bfae Mon Sep 17 00:00:00 2001 +From 28c8aafc65b222ddb7e663379b9981f005e77ef0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 17 Nov 2021 12:50:25 +0100 Subject: Hide the "mute" notification state the same way as the other states @@ -26,5 +26,5 @@ index 3eafb671cb..c9dcd00fd0 100644 return ( -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch index ec42ede..86e1d45 100644 --- a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From 773a15b9d4a880d4fa9ddf06bda99c6d15316bb4 Mon Sep 17 00:00:00 2001 +From 5042b0693d8f0d5b722ae40169855a28364f95a2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 18:58:32 +0200 Subject: Allow muted rooms to render as unread @@ -8,18 +8,18 @@ Subject: Allow muted rooms to render as unread 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts -index e6064d2691..37838c79b5 100644 +index d5254d523d..9cb1e24d1d 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -255,7 +255,7 @@ export function determineUnreadState( - return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; + return { symbol: "!", count: 1, level: NotificationLevel.Highlight, invited: false }; } - if (getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { + if (false && getRoomNotifsState(room.client, room.roomId) === RoomNotifState.Mute) { - return { symbol: null, count: 0, level: NotificationLevel.None }; + return { symbol: null, count: 0, level: NotificationLevel.None, invited: false }; } -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch index 23ca8ad..ec5ec8f 100644 --- a/patches/element-web/0012-Increase-default-visible-tiles.patch +++ b/patches/element-web/0012-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 52ee72a4f5ba98cee0eb6ce60aaac29daa2ce119 Mon Sep 17 00:00:00 2001 +From f96924008d456dadd8d56a2bb6756a1afbd96431 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -21,5 +21,5 @@ index a4468dfffe..a4ae9bbc1d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 190eb9b..353c845 100644 --- a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From 75cf379cff65aa966ad3fc1acc5371c96e19c121 Mon Sep 17 00:00:00 2001 +From d52e8bb4d370dd0ba42a94e20dfc7f900a33f508 Mon Sep 17 00:00:00 2001 From: su-ex 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 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 5d06388535..5ca4cbc3e8 100644 +index 7eda4d794b..b6cde99d81 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -358,6 +358,11 @@ export const SETTINGS: Settings = { +@@ -365,6 +365,11 @@ export const SETTINGS: Settings = { default: true, controller: new ReloadOnChangeController(), }, @@ -88,5 +88,5 @@ index 690beaa0b7..fcd7ff659b 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]); -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index d155739..603877b 100644 --- a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From dbd02e7c0b1c63d432adb2d78c4ed5cb701092f7 Mon Sep 17 00:00:00 2001 +From 2a5b9f5f25b4b5fdfb60c21b4edcd9dd20dbda5d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:32:42 +0200 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream @@ -119,7 +119,7 @@ index 71659d579b..4acbfd1fcb 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 8509b4014a..5e9ea0fd60 100644 +index 11b3d9468a..7d369945fe 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -126,6 +126,7 @@ class ReactionPicker extends React.Component { @@ -131,5 +131,5 @@ index 8509b4014a..5e9ea0fd60 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch index da3ce4a..36baeb9 100644 --- a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch +++ b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From fcc37848fb0e949888a77325a4990639a3661d8e Mon Sep 17 00:00:00 2001 +From eae491a0a6a3f8bfa47785e21467ca56d50dd437 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space @@ -28,5 +28,5 @@ index 917bcfbb84..75ec572c9e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch index 8274488..f0d7519 100644 --- a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From e9975388c5e2071240b8e16b122100f532aee10a Mon Sep 17 00:00:00 2001 +From 0e919ce4854c5f66870f4465b8e1c4b793960025 Mon Sep 17 00:00:00 2001 From: su-ex 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 3d802d34ad..e90667898b 100644 +index 0f722ae53d..47f09400d7 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1454,7 +1454,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1456,7 +1456,15 @@ export default class MatrixChat extends React.PureComponent { if (this.screenAfterLogin && this.screenAfterLogin.screen) { this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params); this.screenAfterLogin = undefined; @@ -30,7 +30,7 @@ index 3d802d34ad..e90667898b 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1468,6 +1476,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 3d802d34ad..e90667898b 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 5ca4cbc3e8..80ada478ba 100644 +index b6cde99d81..61a17d09ae 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -363,6 +363,12 @@ export const SETTINGS: Settings = { +@@ -370,6 +370,12 @@ export const SETTINGS: Settings = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -75,5 +75,5 @@ index fcd7ff659b..33407f74e8 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch index e5c3abb..e435081 100644 --- a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From bfe58ad4c742484429495dda65fdfd26302270c3 Mon Sep 17 00:00:00 2001 +From 27ba28c7b3840b5b458bd98599183728e681c885 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -20,5 +20,5 @@ index e3b01cae0b..02f6c286f2 100644 const rooms = (this.state.rooms || []).slice(); // cheap clone const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch index bd5f65f..bbe4996 100644 --- a/patches/element-web/0018-Stop-the-search-bar-wobble.patch +++ b/patches/element-web/0018-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From b97e37b1f5e4ad33cf044f5371e91955cafc4b55 Mon Sep 17 00:00:00 2001 +From 2611dc55c8c915f19ad3b06c3d406101bce24b67 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -20,5 +20,5 @@ index 75180013f6..e55eadaaf7 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch index 0904851..cd39903 100644 --- a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch +++ b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From d37ddfc40426f200c9fcaa4298c5cf9921fb9025 Mon Sep 17 00:00:00 2001 +From 453eae3dc1a21fd18c28dca91498efbbadfb4e50 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides @@ -20,5 +20,5 @@ index e55eadaaf7..21d0f1d83a 100644 @import "./_animations.pcss"; @import "./_spacing.pcss"; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch index 7b7a614..05540d9 100644 --- a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch +++ b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From 51cc5b9086927db3a9c3aa21e59a6f0d7e8fc761 Mon Sep 17 00:00:00 2001 +From f1cac8ba3ffcd3cc0b7ab6d014d6e40d8dec4451 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 7 Sep 2021 19:41:52 +0200 Subject: No damn avatar background in room list @@ -22,5 +22,5 @@ index f3a44521fa..396601ba6e 100644 const styles: CSSProperties = {}; -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 0c22dd2..6a28b49 100644 --- a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From 50e71f22ccf8640b8cef718a3389b878602dd1d4 Mon Sep 17 00:00:00 2001 +From c5ae977ed90c680d9055460295f60f4945f0c98a Mon Sep 17 00:00:00 2001 From: su-ex 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 17d09b661d..214514686f 100644 +index 7baa127f16..4da70f5ecb 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx -@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component +@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component return false; } @@ -25,5 +25,5 @@ index 17d09b661d..214514686f 100644 } -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 8fd5766..fad7eab 100644 --- a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From df6840270f2b8c6c1c1b5aaf430fa78f016b1a56 Mon Sep 17 00:00:00 2001 +From efe6a8611871296b277adbf5201fec0826b837fe Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:26:16 +0200 Subject: Always apply corner radius to all edges of the bubble @@ -57,5 +57,5 @@ index c25cbfcec4..682ea64890 100644 } &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch index 38d6928..f78680d 100644 --- a/patches/element-web/0023-Always-show-timestamps-by-default.patch +++ b/patches/element-web/0023-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From 89c6003be2e9510be12640809a316278816f1837 Mon Sep 17 00:00:00 2001 +From 4c1b8a37c564d086ef37049cf5b0c4ac6376e8a9 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 80ada478ba..e41c19b750 100644 +index 61a17d09ae..4ca441dc47 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -786,7 +786,7 @@ export const SETTINGS: Settings = { +@@ -795,7 +795,7 @@ export const SETTINGS: Settings = { "alwaysShowTimestamps": { supportedLevels: LEVELS_ACCOUNT_SETTINGS, displayName: _td("settings|always_show_message_timestamps"), @@ -21,5 +21,5 @@ index 80ada478ba..e41c19b750 100644 "userTimezone": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch index ef742d1..620145e 100644 --- a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch +++ b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch @@ -1,4 +1,4 @@ -From 2f4546aaca472f4ac2304fc5b5bdcb36c9a380c6 Mon Sep 17 00:00:00 2001 +From 9fcbc30485a80dcfa7321fa3599d16ce5e7308e6 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 e41c19b750..276d72cf23 100644 +index 4ca441dc47..aa74245519 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -641,7 +641,7 @@ export const SETTINGS: Settings = { +@@ -650,7 +650,7 @@ export const SETTINGS: Settings = { description: _td("labs|render_reaction_images_description"), supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, supportedLevelsAreOrdered: true, @@ -21,5 +21,5 @@ index e41c19b750..276d72cf23 100644 "feature_new_room_list": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED, -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch index f491447..9d5b0d2 100644 --- a/patches/element-web/0025-Enable-chat-previews-by-default.patch +++ b/patches/element-web/0025-Enable-chat-previews-by-default.patch @@ -1,4 +1,4 @@ -From 9b7345671c0910cf9d6ca3710a4cd9f5126fe186 Mon Sep 17 00:00:00 2001 +From e84deb43f138f16131d67aa46c1d5a47e298e776 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 27 Oct 2024 19:24:26 +0100 Subject: Enable chat previews by default @@ -21,5 +21,5 @@ index a4ae9bbc1d..227c918457 100644 public constructor(public readonly tagId: TagID) { -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch index 18b1f27..59902b1 100644 --- a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch +++ b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch @@ -1,4 +1,4 @@ -From 1d3a914d447e6ccae5ad13ac4438aa979610946e Mon Sep 17 00:00:00 2001 +From 8354faea210da07d2948ca60dd6eaf3e7a668f86 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 276d72cf23..4de889b562 100644 +index aa74245519..07227b02dc 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -1206,7 +1206,7 @@ export const SETTINGS: Settings = { +@@ -1233,7 +1233,7 @@ export const SETTINGS: Settings = { }, "Spaces.showPeopleInSpace": { supportedLevels: [SettingLevel.ROOM_ACCOUNT], @@ -35,5 +35,5 @@ index 02e20e9103..2b49711c8e 100644 public isVisible(room: Room): boolean { -- -2.48.1 +2.49.0 diff --git a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch index becbca1..7be1af5 100644 --- a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch @@ -1,4 +1,4 @@ -From 1784aaa9b523c5f02b089ed08847bb8d07240570 Mon Sep 17 00:00:00 2001 +From 345e3cce61ff9afa68d8b17dde379fce269faa56 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 31 Oct 2024 13:44:20 -0400 Subject: Improve IRC layout for SchildiChat @@ -54,7 +54,7 @@ index f4aa0e6f0f..88bcb88f14 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 54f91bd5f4..952f267902 100644 +index b4172fc003..c8538a6c32 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -306,5 +306,5 @@ index 953a0c941f..3326d0c0ff 100644 line-height: var(--line-height) !important; -- -2.48.1 +2.49.0