github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-29 11:32:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update patches to 1.11.73

Browse Source
This commit is contained in:
SpiritCroc 2024-08-07 08:21:27 +02:00
parent b04c8cc063
commit a23614d3de
20 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
element-desktop

@ -1 +1 @@
Subproject commit 3059810f1a9dc21b7545f38fab082def8f5ae893
Subproject commit 52715a8a8988d039ddb95266ff32acf38c98325f

2
element-web

@ -1 +1 @@
Subproject commit 5e02a42ca0863a6d991f989a5b29d07b401766d4
Subproject commit a0c654a2e4676bf48a7b87d0788fd20267f91f44

6
generate_patches.sh
View File

@ -25,7 +25,11 @@ persist_patches() {
mkdir "$patch_dir"
fi
echo "Creating new patches"
git format-patch -k upstream/master.. -o "$patch_dir"
if [ "$1" = matrix-js-sdk ]; then
git format-patch -k v34.2.0.. -o "$patch_dir"
else
git format-patch -k upstream/master.. -o "$patch_dir"
fi
echo "Clearing automated commits from patches"
find "$patch_dir" -name "*-Automatic-package.json-adjustment.patch" -exec rm {} \;
find "$patch_dir" -name "*-Update-version-to-*.patch" -exec rm {} \;

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit a86d4ceb49137f13240674ddb358bb96934ba720
Subproject commit 0300d6343fb26f12ff6a34452d3f7c176aa6c190

2
matrix-react-sdk

@ -1 +1 @@
Subproject commit d84bcbc2155a138bcfafc3efa60c4abf7b4a4d14
Subproject commit 25e67beab6d2525fdc1adf4467b6f0da01415470

8
patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch
View File

@ -1,4 +1,4 @@
From cf79f47a294f3a2c4bc67b7e4c2e2b08a130fb90 Mon Sep 17 00:00:00 2001
From 8393d51337eb16eefad2e9ebed84df4eb629d1dd 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
@ -8,7 +8,7 @@ Subject: Add back schildi fetch-package.ts modifications
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts
index 051e53a..3446eb4 100644
index 54da3f3..354f039 100644
--- a/scripts/fetch-package.ts
+++ b/scripts/fetch-package.ts
@@ -55,6 +55,7 @@ async function main(): Promise<number | undefined> {
@ -39,7 +39,7 @@ index 051e53a..3446eb4 100644
filename = targetVersion.substring(targetVersion.lastIndexOf("/") + 1);
url = targetVersion;
verify = false; // manually verified
@@ -143,12 +146,15 @@ async function main(): Promise<number | undefined> {
@@ -145,12 +148,15 @@ async function main(): Promise<number | undefined> {
}
let haveDeploy = false;
@ -58,5 +58,5 @@ index 051e53a..3446eb4 100644
if (!haveDeploy) {
const outPath = path.join(pkgDir, filename);
--
2.45.2
2.46.0

4
patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch
View File

@ -1,4 +1,4 @@
From e327184f3df484baaaabc71be51438f4ce5d6d46 Mon Sep 17 00:00:00 2001
From 24823898379da994c52e71b9e32a0f9a46a60236 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
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.2
2.46.0

6
patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch
View File

@ -1,4 +1,4 @@
From 0fa8c92135b9b8ed35cde45cb5b264ba3f9ebef2 Mon Sep 17 00:00:00 2001
From b6b0e7c794f277fc146378591cba74d242062adb 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
@ -8,7 +8,7 @@ Subject: Disable sticky rooms
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 267b9bd742..635f7bbcf1 100644
index 6e28eb1a4e..775b68e7d9 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -167,8 +167,10 @@ export class Algorithm extends EventEmitter {
@ -25,5 +25,5 @@ index 267b9bd742..635f7bbcf1 100644
}
--
2.45.2
2.46.0

38
patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch
View File

@ -1,4 +1,4 @@
From 1bcb3ab10c505a3eb781eb12c3c72ecd4f45717f Mon Sep 17 00:00:00 2001
From cfe6cfc8a71b192e78b107282c4ef2e761d67e73 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
@ -16,10 +16,10 @@ Co-authored-by: su-ex <codeworks@supercable.onl>
5 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index c277bd5aca..869fe04381 100644
index d088fbc927..ce54059ce9 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -77,11 +77,13 @@ interface IState {
@@ -80,11 +80,13 @@ interface IState {
sublists: ITagMap;
currentRoomId?: string;
suggestedRooms: ISuggestedRoom[];
@ -33,7 +33,7 @@ index c277bd5aca..869fe04381 100644
DefaultTagID.DM,
DefaultTagID.Untagged,
DefaultTagID.Conference,
@@ -94,6 +96,7 @@ export const TAG_ORDER: TagID[] = [
@@ -97,6 +99,7 @@ export const TAG_ORDER: TagID[] = [
// but we'd have to make sure that rooms you weren't in were hidden.
];
const ALWAYS_VISIBLE_TAGS: TagID[] = [DefaultTagID.DM, DefaultTagID.Untagged];
@ -41,7 +41,7 @@ index c277bd5aca..869fe04381 100644
interface ITagAesthetics {
sectionLabel: TranslationKey;
@@ -371,6 +374,17 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
@@ -374,6 +377,17 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
return null;
};
@ -59,9 +59,9 @@ index c277bd5aca..869fe04381 100644
const TAG_AESTHETICS: TagAestheticsMap = {
[DefaultTagID.Invite]: {
sectionLabel: _td("action|invites_list"),
@@ -382,6 +396,12 @@ const TAG_AESTHETICS: TagAestheticsMap = {
isInvite: false,
@@ -391,6 +405,12 @@ const TAG_AESTHETICS: TagAestheticsMap = {
defaultHidden: false,
AuxButtonComponent: DmAuxButton,
},
+ [DefaultTagID.Unified]: {
+ sectionLabel: _td("Normal priority"),
@ -69,10 +69,10 @@ index c277bd5aca..869fe04381 100644
+ defaultHidden: false,
+ AuxButtonComponent: UnifiedAuxButton,
+ },
[DefaultTagID.DM]: {
sectionLabel: _td("common|people"),
[DefaultTagID.Conference]: {
sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"),
isInvite: false,
@@ -426,6 +446,7 @@ const TAG_AESTHETICS: TagAestheticsMap = {
@@ -429,6 +449,7 @@ const TAG_AESTHETICS: TagAestheticsMap = {
export default class RoomList extends React.PureComponent<IProps, IState> {
private dispatcherRef?: string;
@ -80,7 +80,7 @@ index c277bd5aca..869fe04381 100644
private treeRef = createRef<HTMLDivElement>();
public static contextType = MatrixClientContext;
@@ -437,7 +458,14 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -440,7 +461,14 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
this.state = {
sublists: {},
suggestedRooms: SpaceStore.instance.suggestedRooms,
@ -95,7 +95,7 @@ index c277bd5aca..869fe04381 100644
}
public componentDidMount(): void {
@@ -452,9 +480,16 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -455,9 +483,16 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms);
RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
@ -112,7 +112,7 @@ index c277bd5aca..869fe04381 100644
private onRoomViewStoreUpdate = (): void => {
this.setState({
currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined,
@@ -595,7 +630,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -598,7 +633,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
const aesthetics = TAG_AESTHETICS[orderedTagId];
if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
@ -124,10 +124,10 @@ index c277bd5aca..869fe04381 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 3650e51814..56cab3f408 100644
index 476818a138..35cefb3f28 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -207,6 +207,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
@@ -197,6 +197,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {
export type ISetting = IBaseSetting | IFeature;
export const SETTINGS: { [setting: string]: ISetting } = {
@ -143,7 +143,7 @@ index 3650e51814..56cab3f408 100644
isFeature: true,
labsGroup: LabGroup.VoiceAndVideo,
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 16c4d3be5b..bf2bf2ff8a 100644
index 7dcb28c325..63f43118fa 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -508,6 +508,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> implements
@ -180,7 +180,7 @@ index 16c4d3be5b..bf2bf2ff8a 100644
}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 635f7bbcf1..a837d02d22 100644
index 775b68e7d9..39add54d89 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -83,6 +83,7 @@ export class Algorithm extends EventEmitter {
@ -190,7 +190,7 @@ index 635f7bbcf1..a837d02d22 100644
+ private unifiedRoomList: boolean = true;
public start(): void {
CallStore.instance.on(CallStoreEvent.ActiveCalls, this.onActiveCalls);
CallStore.instance.on(CallStoreEvent.ConnectedCalls, this.onConnectedCalls);
@@ -114,6 +115,10 @@ export class Algorithm extends EventEmitter {
return this._cachedRooms;
}
@ -259,5 +259,5 @@ index d8b0488842..335097ccdb 100644
DefaultTagID.Conference,
DefaultTagID.Untagged,
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
View File

@ -1,4 +1,4 @@
From 67decec7f9c70e997af45dbfea733bfe256e8749 Mon Sep 17 00:00:00 2001
From 75b63406b604c6160c51b41218c1fa907a8d23f9 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.
@ -21,5 +21,5 @@ index 1b6472a018..8eae273a06 100644
/**
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch
View File

@ -1,4 +1,4 @@
From 73191e9412ad54071cec2eb706e5fc4117d8cce8 Mon Sep 17 00:00:00 2001
From d80cf5809c115c8668123a00410f175c6d9e7af0 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 12 Jul 2022 15:34:57 +0300
Subject: Add support for rendering captions in media messages
@ -105,5 +105,5 @@ index 75511756f5..a8e3b9cceb 100644
// file extension.
text = content.body;
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch
View File

@ -1,4 +1,4 @@
From dd20cb95b6ef349a62a029c78edaae71d16494e9 Mon Sep 17 00:00:00 2001
From 35de14dd4f019ac9107d4701afd9bf62700a2b8c 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
@ -25,5 +25,5 @@ index a3c44084d5..f412cf3b89 100644
isState: false,
previewer: new PollStartEventPreview(),
--
2.45.2
2.46.0

6
patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch
View File

@ -1,4 +1,4 @@
From e113e7927eee79c47e3ffcaef2ab2d1c513cd543 Mon Sep 17 00:00:00 2001
From 135235d4a815897c53aea20e707c02fc54e2b3a1 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
@ -11,7 +11,7 @@ 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 aae949858e..8a104c4474 100644
index 71ff1ef296..4ab94e7278 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -312,7 +312,9 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
@ -26,5 +26,5 @@ index aae949858e..8a104c4474 100644
return (
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch
View File

@ -1,4 +1,4 @@
From 7578b7edcf8d805e793b914702441bc6de8855ee Mon Sep 17 00:00:00 2001
From 9feb3f479d2ebe44743b1fc38685aff7543e44a1 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
@ -21,5 +21,5 @@ index 1fb5e5ba4d..f9cb6ed026 100644
}
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch
View File

@ -1,4 +1,4 @@
From 28a1be2dc48f2621941e1230d37a062faaf48943 Mon Sep 17 00:00:00 2001
From 9ac584b6e7f284309d5745ddd1ab2a3b75e599ea 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
@ -21,5 +21,5 @@ index afc93f3b01..6020b2148d 100644
public tilesWithPadding(n: number, paddingPx: number): number {
--
2.45.2
2.46.0

8
patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
View File

@ -1,4 +1,4 @@
From 950161ad3c1a68646eaf99aebf7e80c805c81422 Mon Sep 17 00:00:00 2001
From 369a2e9890410af89bd6b1616df688dacb2d6837 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 56cab3f408..16c62ad104 100644
index 35cefb3f28..e5624b33b3 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -214,6 +214,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -204,6 +204,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {
default: true,
controller: new ReloadOnChangeController(),
},
@ -88,5 +88,5 @@ index 966b564d68..bda81e9d5f 100644
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]);
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
View File

@ -1,4 +1,4 @@
From beb0603424b1a87ccf42763f2b76a8bb4ec77300 Mon Sep 17 00:00:00 2001
From 84035e01f7cae9b04f85a3de1b2d1d3de1721c7f 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
@ -130,5 +130,5 @@ index 075a6e6cee..42cde47e56 100644
isEmojiDisabled={this.isEmojiDisabled}
onFinished={this.props.onFinished}
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch
View File

@ -1,4 +1,4 @@
From 1ab186fe9fd30d9fe830683de797956c66270580 Mon Sep 17 00:00:00 2001
From d7276004230e0c9ac9669943c32b6bb8bd78e662 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
@ -28,5 +28,5 @@ index 26d2d25fae..9920c6c20d 100644
white-space: nowrap;
text-overflow: ellipsis;
--
2.45.2
2.46.0

14
patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch
View File

@ -1,4 +1,4 @@
From 1f0266523abb3b0a3718ad2ea5b7794f5bf5c47d Mon Sep 17 00:00:00 2001
From 278fd8faea2f3ac867355f0963dac02ab3562561 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 4049248111..5fb39984d8 100644
index f9d6db3f53..6ea77af07e 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1429,7 +1429,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1437,7 +1437,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 4049248111..5fb39984d8 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1441,6 +1449,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1449,6 +1457,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -46,10 +46,10 @@ index 4049248111..5fb39984d8 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 16c62ad104..f4b089e813 100644
index e5624b33b3..73bb2938f7 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -219,6 +219,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -209,6 +209,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: true,
},
@ -75,5 +75,5 @@ index bda81e9d5f..6f16e7261f 100644
cliSpace?.getMyMembership() !== KnownMembership.Invite &&
this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
--
2.45.2
2.46.0

4
patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch
View File

@ -1,4 +1,4 @@
From 0a33940ca9552df513a45d8cc3738b1cbfbee61b Mon Sep 17 00:00:00 2001
From 15f1a5fa1432ad89a2fd9fe8e9f0976f53df46e9 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
@ -20,5 +20,5 @@ index 36bb0a78b6..c1edee140f 100644
const rooms = (this.state.rooms || []).slice(); // cheap clone
const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
--
2.45.2
2.46.0