From 977e95526558761438fb32d772985978ef7b3117 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 21 Jun 2024 20:08:21 +0200 Subject: [PATCH] Do not add spaces spaces to breadcrumbs --- FEATURES.md | 1 + ...hildi-fetch-package.ts-modifications.patch | 4 ++-- ...Add-fields-for-media-caption-support.patch | 4 ++-- .../0001-Disable-sticky-rooms.patch | 4 ++-- .../0002-Bring-back-unified-room-list.patch | 8 +++---- ...-rooms-to-bottom-I-still-want-to-see.patch | 4 ++-- ...rendering-captions-in-media-messages.patch | 10 ++++---- .../0005-Don-t-preview-reactions.patch | 4 ++-- ...tification-state-the-same-way-as-the.patch | 8 +++---- ...llow-muted-rooms-to-render-as-unread.patch | 4 ++-- .../0008-Increase-default-visible-tiles.patch | 4 ++-- ...paceDMBadges-setting-force-enabled-f.patch | 6 ++--- ...m-reactions-from-tadzik-freeform-rea.patch | 4 ++-- ...1-Allow-reactions-to-take-more-space.patch | 4 ++-- ...don-t-automatically-show-last-opened.patch | 12 +++++----- ...0013-Exclude-spaces-from-breadcrumbs.patch | 24 +++++++++++++++++++ 16 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch diff --git a/FEATURES.md b/FEATURES.md index 2cd9134..05b8736 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -18,6 +18,7 @@ Note that this list may be incomplete or outdated. - Increase default visible tiles before collapsing each section - Include DMs in space unread counts - Show space overview rather then jumping to last opened room when switching space +- Do not add spaces to recently opened rooms list ("breadcrumbs") ## Conversation screen diff --git a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch index 9cb15f7..c37b54c 100644 --- a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch +++ b/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch @@ -1,4 +1,4 @@ -From 53255efd63c66bee0d19f8f84fcffd9878af88dd Mon Sep 17 00:00:00 2001 +From cf79f47a294f3a2c4bc67b7e4c2e2b08a130fb90 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 051e53a..3446eb4 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.45.1 +2.45.2 diff --git a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch index c26dc0b..e2aff66 100644 --- a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch +++ b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch @@ -1,4 +1,4 @@ -From 2dd7dd408d741ea4a0fc3b2b3fe8e23c3efcbc99 Mon Sep 17 00:00:00 2001 +From e327184f3df484baaaabc71be51438f4ce5d6d46 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:21:21 +0200 Subject: Add fields for media caption support @@ -52,5 +52,5 @@ index 20e5ca6c6..920d77667 100644 /** -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 6764f90..12c31b9 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 3f96a572feed66d34d20d1d416ffce7c14989a9c Mon Sep 17 00:00:00 2001 +From 0fa8c92135b9b8ed35cde45cb5b264ba3f9ebef2 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 267b9bd742..635f7bbcf1 100644 } -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch index dc039dc..86a2cca 100644 --- a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From ac11424ef182d789c3d9bb55feeb6910230d9dbe Mon Sep 17 00:00:00 2001 +From 1bcb3ab10c505a3eb781eb12c3c72ecd4f45717f 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/RoomList.tsx b/src/components/views/rooms/RoomList.tsx -index d573f3bbf0..ced4e7bb47 100644 +index c277bd5aca..869fe04381 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -77,11 +77,13 @@ interface IState { @@ -124,7 +124,7 @@ index d573f3bbf0..ced4e7bb47 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 2137837500..49d96c7840 100644 +index 3650e51814..56cab3f408 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -207,6 +207,14 @@ export interface IFeature extends Omit, "isFeature"> { @@ -259,5 +259,5 @@ index d8b0488842..335097ccdb 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index 9816da4..2b7c071 100644 --- a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From 53cb5e26d3798e3f6f79ea0cc0251b64165783da Mon Sep 17 00:00:00 2001 +From 67decec7f9c70e997af45dbfea733bfe256e8749 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 1b6472a018..8eae273a06 100644 /** -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch index e835bba..fc24cc1 100644 --- a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch +++ b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch @@ -1,4 +1,4 @@ -From 10b9e0d75503a248d4b6d5273c6a454d0a8cc26d Mon Sep 17 00:00:00 2001 +From 73191e9412ad54071cec2eb706e5fc4117d8cce8 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 12 Jul 2022 15:34:57 +0300 Subject: Add support for rendering captions in media messages @@ -56,10 +56,10 @@ index db0016de7b..dd7a864300 100644 + +) diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx -index f0b5c70f17..e28ed3fad7 100644 +index 7246f7db57..4b5bf997ba 100644 --- a/src/components/views/messages/TextualBody.tsx +++ b/src/components/views/messages/TextualBody.tsx -@@ -575,11 +575,14 @@ export default class TextualBody extends React.Component { +@@ -568,11 +568,14 @@ export default class TextualBody extends React.Component { const content = mxEvent.getContent(); let isNotice = false; let isEmote = false; @@ -74,7 +74,7 @@ index f0b5c70f17..e28ed3fad7 100644 let body = HtmlUtils.bodyToHtml(content, this.props.highlights, { disableBigEmoji: isEmote || !SettingsStore.getValue("TextualBody.enableBigEmoji"), // Part of Replies fallback support -@@ -651,6 +654,14 @@ export default class TextualBody extends React.Component { +@@ -644,6 +647,14 @@ export default class TextualBody extends React.Component { ); } @@ -105,5 +105,5 @@ index 75511756f5..a8e3b9cceb 100644 // file extension. text = content.body; -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch index 292ae10..67a2030 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 5d0ef9b963d06d16660ddf8780e4c178d6904418 Mon Sep 17 00:00:00 2001 +From dd20cb95b6ef349a62a029c78edaae71d16494e9 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 a3c44084d5..f412cf3b89 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch index 4c6e6c9..bc6f52d 100644 --- a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From c5072d047ca79fff785a5d8a0c55b217c1294301 Mon Sep 17 00:00:00 2001 +From e113e7927eee79c47e3ffcaef2ab2d1c513cd543 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 @@ -11,10 +11,10 @@ way. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx -index 61f865e9fc..0695075cc8 100644 +index aae949858e..8a104c4474 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx -@@ -313,7 +313,9 @@ export class RoomTile extends React.PureComponent { +@@ -312,7 +312,9 @@ export class RoomTile extends React.PureComponent { // Only show the icon by default if the room is overridden to muted. // TODO: [FTUE Notifications] Probably need to detect global mute state @@ -26,5 +26,5 @@ index 61f865e9fc..0695075cc8 100644 return ( -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch index 19abaac..3b226d5 100644 --- a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From 62797661b2169a90cda8f8bd20505119629c8507 Mon Sep 17 00:00:00 2001 +From 7578b7edcf8d805e793b914702441bc6de8855ee 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 @@ -21,5 +21,5 @@ index 1fb5e5ba4d..f9cb6ed026 100644 } -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch index f5d605b..7a1cb6e 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From 21924d5e5ed429c6a24493a04c675ff6569a09b8 Mon Sep 17 00:00:00 2001 +From 28a1be2dc48f2621941e1230d37a062faaf48943 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 afc93f3b01..6020b2148d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index 3f725fa..feb8374 100644 --- a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From d9f769129c789a2570bb5edc7cf4a639607c58b6 Mon Sep 17 00:00:00 2001 +From 950161ad3c1a68646eaf99aebf7e80c805c81422 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,7 +12,7 @@ Co-authored-by: SpiritCroc 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 49d96c7840..332e6a7b0a 100644 +index 56cab3f408..16c62ad104 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -214,6 +214,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { @@ -88,5 +88,5 @@ index 966b564d68..bda81e9d5f 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index 8f52d21..3bd0686 100644 --- a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From a0312959dc35c68c5a5b1a6e512e942c7f1cfafb Mon Sep 17 00:00:00 2001 +From beb0603424b1a87ccf42763f2b76a8bb4ec77300 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 @@ -130,5 +130,5 @@ index 075a6e6cee..42cde47e56 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch index ed76b38..40ea1a0 100644 --- a/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch +++ b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch @@ -1,4 +1,4 @@ -From e67b314775022cc970e7704bdcaa36cd674091bc Mon Sep 17 00:00:00 2001 +From 1ab186fe9fd30d9fe830683de797956c66270580 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 26d2d25fae..9920c6c20d 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch index 806749c..f6e2ddf 100644 --- a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From 077a509fd1d078ee95102164ae1ddfa5584e4841 Mon Sep 17 00:00:00 2001 +From 1f0266523abb3b0a3718ad2ea5b7794f5bf5c47d 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 2574156279..82a41c55bb 100644 +index 4049248111..5fb39984d8 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1430,7 +1430,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1429,7 +1429,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 2574156279..82a41c55bb 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1442,6 +1450,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1441,6 +1449,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,7 +46,7 @@ index 2574156279..82a41c55bb 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 332e6a7b0a..032000be46 100644 +index 16c62ad104..f4b089e813 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -219,6 +219,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { @@ -75,5 +75,5 @@ index bda81e9d5f..6f16e7261f 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.45.1 +2.45.2 diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch new file mode 100644 index 0000000..09d6730 --- /dev/null +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -0,0 +1,24 @@ +From 0a33940ca9552df513a45d8cc3738b1cbfbee61b Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Tue, 9 Aug 2022 09:32:19 +0200 +Subject: Exclude spaces from breadcrumbs + +--- + src/stores/BreadcrumbsStore.ts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts +index 36bb0a78b6..c1edee140f 100644 +--- a/src/stores/BreadcrumbsStore.ts ++++ b/src/stores/BreadcrumbsStore.ts +@@ -145,6 +145,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { + } + + private async appendRoom(room: Room): Promise { ++ if (room.isSpaceRoom()) return; + let updated = false; + const rooms = (this.state.rooms || []).slice(); // cheap clone + const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); +-- +2.45.2 +