From fc0edf9dca4fd7486317fa98f158f8810ae394d6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 9 Oct 2024 08:04:03 +0200 Subject: [PATCH] Update to 1.11.80 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...back-schildi-fetch-package.ts-modifications.patch | 2 +- .../0001-Add-fields-for-media-caption-support.patch | 12 ++++++------ .../matrix-react-sdk/0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 6 +++--- ...t-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...rt-for-rendering-captions-in-media-messages.patch | 2 +- .../0005-Don-t-preview-reactions.patch | 2 +- ...mute-notification-state-the-same-way-as-the.patch | 2 +- .../0007-Allow-muted-rooms-to-render-as-unread.patch | 2 +- .../0008-Increase-default-visible-tiles.patch | 2 +- ...k-showSpaceDMBadges-setting-force-enabled-f.patch | 6 +++--- ...Freeform-reactions-from-tadzik-freeform-rea.patch | 2 +- .../0011-Allow-reactions-to-take-more-space.patch | 2 +- ...switch-don-t-automatically-show-last-opened.patch | 12 ++++++------ .../0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- .../0014-Stop-the-search-bar-wobble.patch | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/element-desktop b/element-desktop index 5782a86..47dbe68 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 5782a86e0113784cd97d3cd34472ddc5696d4b9b +Subproject commit 47dbe68b2a715af9dbb26ba366a0207f5cfaa227 diff --git a/element-web b/element-web index 6ff1f21..9219435 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6ff1f21927883ac3302430c9406ffb5f5ace6c65 +Subproject commit 9219435502cab75af63cfc4271fc0b53d096cee8 diff --git a/matrix-js-sdk b/matrix-js-sdk index 646153b..52798a9 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 646153b51b6de55c74beb5666875d283df04cba1 +Subproject commit 52798a9d777321422353ca88b27249a6fb0473b3 diff --git a/matrix-react-sdk b/matrix-react-sdk index 048ba0d..d377796 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 048ba0db6e21468d484303fafed3c3703cba1b89 +Subproject commit d3777969edf2d708afcbe8b66f843f57a8f03e97 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 30145b0..9b45443 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 68654457f34f0821d52d61453a7c3de40bd9a473 Mon Sep 17 00:00:00 2001 +From 6c463bac95962effa26e7f95e0d56dd3ea50dc80 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 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 00e3f90..ab4cfdd 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 646153b51b6de55c74beb5666875d283df04cba1 Mon Sep 17 00:00:00 2001 +From 52798a9d777321422353ca88b27249a6fb0473b3 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 @@ -8,10 +8,10 @@ Subject: Add fields for media caption support 1 file changed, 12 insertions(+) diff --git a/src/@types/media.ts b/src/@types/media.ts -index ef23668b0..9b4ff3b97 100644 +index 1128b40d3..d85526642 100644 --- a/src/@types/media.ts +++ b/src/@types/media.ts -@@ -180,6 +180,9 @@ export interface FileContent extends BaseContent { +@@ -189,6 +189,9 @@ export interface FileContent extends BaseContent { * One of: [m.file]. */ msgtype: MsgType.File; @@ -21,7 +21,7 @@ index ef23668b0..9b4ff3b97 100644 } /** -@@ -202,6 +205,9 @@ export interface ImageContent extends BaseContent { +@@ -205,6 +208,9 @@ export interface ImageContent extends BaseContent { * One of: [m.image]. */ msgtype: MsgType.Image; @@ -31,7 +31,7 @@ index ef23668b0..9b4ff3b97 100644 } /** -@@ -223,6 +229,9 @@ export interface AudioContent extends BaseContent { +@@ -221,6 +227,9 @@ export interface AudioContent extends BaseContent { * One of: [m.audio]. */ msgtype: MsgType.Audio; @@ -41,7 +41,7 @@ index ef23668b0..9b4ff3b97 100644 } /** -@@ -244,6 +253,9 @@ export interface VideoContent extends BaseContent { +@@ -237,6 +246,9 @@ export interface VideoContent extends BaseContent { * One of: [m.video]. */ msgtype: MsgType.Video; diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index eb55bde..5481670 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 88a9117efb7131a593c2cb012d831bebcdd5878d Mon Sep 17 00:00:00 2001 +From b245cc816714627339aaf229657c8a14c73f96e9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms 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 901193c..62e2836 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 108b8d05d2f0c701e75a327094610bf672dcbf75 Mon Sep 17 00:00:00 2001 +From 15906208d9d34cb9115e1ffa5ceb76d0d54c4125 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -124,10 +124,10 @@ index e27b2ca03f..311a54d9d8 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 2fadb53dde..47eb9b284e 100644 +index 76bb109cac..7aea53ceea 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -190,6 +190,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -191,6 +191,14 @@ export interface IFeature extends Omit, "isFeature"> { export type ISetting = IBaseSetting | IFeature; export const SETTINGS: { [setting: string]: ISetting } = { 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 d51648a..759095e 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 7c7a368ac7a3e9ae4c096b70994476832fec812c Mon Sep 17 00:00:00 2001 +From 70614b5c6e4061ec1c9d90cbf11782e683b17be6 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. 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 aaa686f..86ba34d 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 eba8b0f5bacb6762146eda9075e4f4e3e8e54e81 Mon Sep 17 00:00:00 2001 +From 597775e0fb261509b1afecc30c5a5031156c9a66 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 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 462bf09..6f307c3 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 e5e461d0bf3dfb693dc63075b653a2c01df9c6f4 Mon Sep 17 00:00:00 2001 +From 66ac6916f3b57576711c0a3d71c2a7c133f4432b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions 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 3ab319d..2bdaccc 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 e099a50b6339607e7238567829bbaa245d0b1a2a Mon Sep 17 00:00:00 2001 +From 0c4e3c5ee2c74ed1f55f0e1965766e896fe79737 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 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 a6e121d..35d844a 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 61945db01ec4c64a7c89a31a09ba3f7d0fd5da9f Mon Sep 17 00:00:00 2001 +From a4fe784a2fe7847319d0a63498a237be0b12d988 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 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 5e005e9..3320330 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 ad8b2ad718275363b9aba3a40792b761e3532be8 Mon Sep 17 00:00:00 2001 +From a323175c5a6f3b2f625b0c1359ff6ad89b663027 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles 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 b291c04..940a3aa 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 4ec13ff8a65486fac9a905b79b26530d2257d318 Mon Sep 17 00:00:00 2001 +From b2b850561bdd6fb7c2b73e63aae7b49fa3fd9c13 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 47eb9b284e..9d43f8e1e0 100644 +index 7aea53ceea..b668c65dfd 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -197,6 +197,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -198,6 +198,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, 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 f5c0059..7ebbc4a 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 9e0626583e090e72a9b14908cf9781aa0766779b Mon Sep 17 00:00:00 2001 +From b7e9f92671330c3b8ae387b6810a391d4bf49207 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 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 f57e5cf..272c8d6 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 14e4c0e0a63e1fd6af887ccc2ef5fb37b72ed837 Mon Sep 17 00:00:00 2001 +From 378c416883b6870ef453f39199c44de14d162f81 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 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 0ded0b7..0036759 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 efb1f2b9ca610e6282583d8585317803389a87e2 Mon Sep 17 00:00:00 2001 +From 16e186a3cb6d1929e49afe2feb3b486d9bca10a9 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 8e0eaabe4f..ed9f1f30c1 100644 +index 1726c8462d..150f29d0b8 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1446,7 +1446,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1448,7 +1448,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 8e0eaabe4f..ed9f1f30c1 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1458,6 +1466,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1460,6 +1468,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 8e0eaabe4f..ed9f1f30c1 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 9d43f8e1e0..eede03b5b7 100644 +index b668c65dfd..be4433e1bc 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -202,6 +202,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -203,6 +203,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch index 95f28b5..1fd5871 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From 19cacbc689d2cd27f400033c7c73dbe5fe9acf8d Mon Sep 17 00:00:00 2001 +From 6eac7d7c2abaaaa59432bc7ed8c7a7d527fb66ae Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs diff --git a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch index 3910330..744778f 100644 --- a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From 086f83a33c6c3c41cce9fb985d2be4ec4e5dafc4 Mon Sep 17 00:00:00 2001 +From a0f93aab26752267e4ef6512d6eccd64a5c8eeb7 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble