sadorowo/schildichat-desktop
1
0
Fork 0
forked from github/schildichat-desktop
Code Pull Requests Activity

Upstream 1.11.95

Browse Source
This commit is contained in:
SpiritCroc 2025-03-15 16:56:27 +01:00
parent a9f81d8ebe
commit eff14caec3
31 changed files with 124 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compound-web

@ -1 +1 @@
Subproject commit 2614bf94edcd71ed910e71ebcb5f61604221399c
Subproject commit 57ee5bfdf13c58ca3bcbc2d0eb2993d7b4a0b89d

2
element-desktop

@ -1 +1 @@
Subproject commit e4333e09f0040628e50e5606ad35ef27adb0670b
Subproject commit 7d95337b9b4847752b4d7ffac8a894c7bdc7d7ac

2
element-web

@ -1 +1 @@
Subproject commit efecbbe9a2d907cd21656631b9ed00627cf0cf1f
Subproject commit 702182d503b5afdb262634384606797dde103a4d

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit 72ee5504d5ab39dc40c4ba1a5601a90b7a6b3426
Subproject commit 5f3f08071fbab8bc6af08b0d940189a513f572e2

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

@ -1,4 +1,4 @@
From feed71908222cd43aaa7f86dfbca809511b3a310 Mon Sep 17 00:00:00 2001
From 1f589d9bb0c332ccb55d51f824f707385d80fbc0 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

6
patches/element-web/0002-Change-default-login-background.patch
View File

@ -1,4 +1,4 @@
From 52908abcd2599bc1d0d32996b8f3de0a40b33f9b Mon Sep 17 00:00:00 2001
From 474c8a5e8b345fe8206b56b880b1421a5189b797 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 29 Nov 2020 23:30:59 +0100
Subject: Change default login background
@ -22117,10 +22117,10 @@ 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 d28c820d20..06cddc2677 100644
index 5330d74520..1642300bc6 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -119,7 +119,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
@@ -118,7 +118,7 @@ export default class HelpUserSettingsTab extends React.Component<EmptyObject, IS
{
photo: (sub) => (
<ExternalLink

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

@ -1,4 +1,4 @@
From f9addc874260af436513147a9711e7df3e69e1a1 Mon Sep 17 00:00:00 2001
From c3cf43a61f54bb688b32c881564a181485170013 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

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

@ -1,4 +1,4 @@
From 0ec5e88ed052f645796ca8b258bbcb474ac54ae8 Mon Sep 17 00:00:00 2001
From 61fd7f169e275a27d168d1afe436c5dd34dbc09a 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

4
patches/element-web/0005-Schildify-login-footer.patch
View File

@ -1,4 +1,4 @@
From fc68141219ce4367db44ad05aa89c9367c894856 Mon Sep 17 00:00:00 2001
From 460db57d64132c244504f2f046f7473b30359e7d 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
@ -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 472ff53f09..9f694aef42 100644
index f609b4792a..8abcc8fa37 100644
--- a/src/components/views/auth/AuthFooter.tsx
+++ b/src/components/views/auth/AuthFooter.tsx
@@ -15,9 +15,13 @@ import { _t } from "../../../languageHandler";

4
patches/element-web/0006-Disable-sticky-rooms.patch
View File

@ -1,4 +1,4 @@
From 6c8b5594b57b22cb3e195d9e28a6843a0c36611d Mon Sep 17 00:00:00 2001
From 12b585464c5d85df4d210862543018a28b815bd0 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 2ae3a1ff99..e0f5a17130 100644
index 5419a6e47c..25d6b78fde 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter {

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

@ -1,4 +1,4 @@
From 4cad8ad554645e437ba9a486734247257d577f43 Mon Sep 17 00:00:00 2001
From c14f17a15c7a4f22126eba9a92a417732fe3f659 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
@ -8,18 +8,18 @@ Remaining TODO:
Co-authored-by: su-ex <codeworks@supercable.onl>
---
src/components/views/rooms/RoomList.tsx | 39 +++++++++++++++++++-
src/settings/Settings.tsx | 8 ++++
src/stores/room-list/RoomListStore.ts | 19 +++++++++-
src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++--
src/stores/room-list/models.ts | 2 +
src/components/views/rooms/LegacyRoomList.tsx | 39 ++++++++++++++++++-
src/settings/Settings.tsx | 8 ++++
src/stores/room-list/RoomListStore.ts | 19 ++++++++-
src/stores/room-list/algorithms/Algorithm.ts | 20 ++++++++--
src/stores/room-list/models.ts | 2 +
5 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index fed1826bbb..ea4d54d5e8 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -72,11 +72,13 @@ interface IState {
diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx
index a940484b16..663f741fed 100644
--- a/src/components/views/rooms/LegacyRoomList.tsx
+++ b/src/components/views/rooms/LegacyRoomList.tsx
@@ -83,11 +83,13 @@ interface IState {
sublists: ITagMap;
currentRoomId?: string;
suggestedRooms: ISuggestedRoom[];
@ -33,7 +33,7 @@ index fed1826bbb..ea4d54d5e8 100644
DefaultTagID.DM,
DefaultTagID.Untagged,
DefaultTagID.Conference,
@@ -89,6 +91,7 @@ export const TAG_ORDER: TagID[] = [
@@ -100,6 +102,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 fed1826bbb..ea4d54d5e8 100644
interface ITagAesthetics {
sectionLabel: TranslationKey;
@@ -366,6 +369,17 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
@@ -377,6 +380,17 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
return null;
};
@ -59,7 +59,7 @@ index fed1826bbb..ea4d54d5e8 100644
const TAG_AESTHETICS: TagAestheticsMap = {
[DefaultTagID.Invite]: {
sectionLabel: _td("action|invites_list"),
@@ -383,6 +397,12 @@ const TAG_AESTHETICS: TagAestheticsMap = {
@@ -394,6 +408,12 @@ const TAG_AESTHETICS: TagAestheticsMap = {
defaultHidden: false,
AuxButtonComponent: DmAuxButton,
},
@ -72,15 +72,15 @@ index fed1826bbb..ea4d54d5e8 100644
[DefaultTagID.Conference]: {
sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"),
isInvite: false,
@@ -421,6 +441,7 @@ const TAG_AESTHETICS: TagAestheticsMap = {
@@ -432,6 +452,7 @@ const TAG_AESTHETICS: TagAestheticsMap = {
export default class RoomList extends React.PureComponent<IProps, IState> {
export default class LegacyRoomList extends React.PureComponent<IProps, IState> {
private dispatcherRef?: string;
+ private readonly unifiedRoomListWatcherRef: string;
private treeRef = createRef<HTMLDivElement>();
public static contextType = MatrixClientContext;
@@ -432,7 +453,14 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -443,7 +464,14 @@ export default class LegacyRoomList extends React.PureComponent<IProps, IState>
this.state = {
sublists: {},
suggestedRooms: SpaceStore.instance.suggestedRooms,
@ -95,13 +95,17 @@ index fed1826bbb..ea4d54d5e8 100644
}
public componentDidMount(): void {
@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -459,6 +487,7 @@ export default class LegacyRoomList extends React.PureComponent<IProps, IState>
SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms);
RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
defaultDispatcher.unregister(this.dispatcherRef);
+ SettingsStore.unwatchSetting(this.unifiedRoomListWatcherRef);
SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
LegacyCallHandler.instance.off(LegacyCallHandlerEvent.ProtocolSupport, this.updateProtocolSupport);
}
@@ -467,6 +496,12 @@ export default class LegacyRoomList extends React.PureComponent<IProps, IState>
this.updateLists();
};
+ private onUnifiedRoomListChange = (): void => {
+ this.setState({
@ -112,7 +116,7 @@ index fed1826bbb..ea4d54d5e8 100644
private onRoomViewStoreUpdate = (): void => {
this.setState({
currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined,
@@ -590,7 +625,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
@@ -605,7 +640,9 @@ export default class LegacyRoomList extends React.PureComponent<IProps, IState>
const aesthetics = TAG_AESTHETICS[orderedTagId];
if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
@ -124,10 +128,10 @@ index fed1826bbb..ea4d54d5e8 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 9c4bb76f9f..2431a8d528 100644
index 439b0c112f..5d06388535 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -353,6 +353,14 @@ export type FeatureSettingKey = Assignable<Settings, IFeature>;
@@ -351,6 +351,14 @@ export type FeatureSettingKey = Assignable<Settings, IFeature>;
export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | FeatureSettingKey;
export const SETTINGS: Settings = {
@ -143,10 +147,10 @@ index 9c4bb76f9f..2431a8d528 100644
isFeature: true,
labsGroup: LabGroup.VoiceAndVideo,
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 0b179f7db5..6d1def3c87 100644
index e1d2f7b7e8..64c757c377 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> implements
@@ -502,6 +502,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
this.setAndPersistListOrder(tag, listOrder);
}
}
@ -156,7 +160,7 @@ index 0b179f7db5..6d1def3c87 100644
}
private onAlgorithmListUpdated = (forceUpdate: boolean): void => {
@@ -613,7 +616,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> implements
@@ -615,7 +618,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
*/
public getTagsForRoom(room: Room): TagID[] {
const algorithmTags = this.algorithm.getTagsForRoom(room);
@ -180,7 +184,7 @@ index 0b179f7db5..6d1def3c87 100644
}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index e0f5a17130..5411ad49fc 100644
index 25d6b78fde..f3fc3899d0 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter {

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

@ -1,4 +1,4 @@
From 3023a83c05387fd322420f8bea8fa97c1bcef85d Mon Sep 17 00:00:00 2001
From 2180196ba74a9526d0a68ad17328631d9b661cd2 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.
@ -8,7 +8,7 @@ Subject: Don't sort muted rooms to bottom, I still want to see them.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
index 5cf7631cfe..81b335e3d2 100644
index 0f95fe78c2..2de554c357 100644
--- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm {

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

@ -1,4 +1,4 @@
From a80b770c4ba54d653ab9249ce7af18908d0c577e Mon Sep 17 00:00:00 2001
From 27d4baaaf19f3d80ec7d5617e54bd7621090d6a4 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
@ -8,10 +8,10 @@ Subject: Don't preview reactions
1 file changed, 2 insertions(+)
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index 3f1614df70..29c71fcc69 100644
index 51e413940d..7775d1e52a 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -55,10 +55,12 @@ const PREVIEWS: Record<
@@ -63,10 +63,12 @@ const PREVIEWS: Record<
isState: false,
previewer: new StickerEventPreview(),
},

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

@ -1,4 +1,4 @@
From 79080d4521da718362deb31c1d01b0e0a40124c2 Mon Sep 17 00:00:00 2001
From db8b600a3695f35e70cb0c2a9f6b3cba99d2bfae 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 cbeb562077..3d893f5fe0 100644
index 3eafb671cb..c9dcd00fd0 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -300,7 +300,9 @@ class RoomTile extends React.PureComponent<Props, State> {

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

@ -1,4 +1,4 @@
From 76daaebf1462651e4156e8b73bcaa15d7922ffc3 Mon Sep 17 00:00:00 2001
From 773a15b9d4a880d4fa9ddf06bda99c6d15316bb4 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

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

@ -1,4 +1,4 @@
From aa4a0d3e9ce9d4031ebaa38b9568aa434ce9cbe5 Mon Sep 17 00:00:00 2001
From 52ee72a4f5ba98cee0eb6ce60aaac29daa2ce119 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
@ -8,7 +8,7 @@ Subject: Increase default visible tiles
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index e85703fa5f..2792e57f8d 100644
index a4468dfffe..a4ae9bbc1d 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -74,7 +74,7 @@ export class ListLayout {

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

@ -1,4 +1,4 @@
From 713dafdaa9935d3a2cb419f6c9b4621b9ebe92d3 Mon Sep 17 00:00:00 2001
From 75cf379cff65aa966ad3fc1acc5371c96e19c121 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 2431a8d528..45e1145c0f 100644
index 5d06388535..5ca4cbc3e8 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -360,6 +360,11 @@ export const SETTINGS: Settings = {
@@ -358,6 +358,11 @@ export const SETTINGS: Settings = {
default: true,
controller: new ReloadOnChangeController(),
},
@ -28,12 +28,12 @@ index 2431a8d528..45e1145c0f 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 50aa7748a5..f11cc20b0c 100644
index 690beaa0b7..fcd7ff659b 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
/** Whether the feature flag is set for MSC3946 */
@@ -155,9 +155,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors");
private _storeReadyDeferred = defer();
+ // SC start
+ private _showSpaceDMBadges = true;
@ -49,7 +49,7 @@ index 50aa7748a5..f11cc20b0c 100644
SettingsStore.monitorSetting("Spaces.allRoomsInHome", null);
SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null);
SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null);
@@ -192,6 +200,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@@ -215,6 +223,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
return this._allRoomsInHome;
}
@ -60,7 +60,7 @@ index 50aa7748a5..f11cc20b0c 100644
public setActiveRoomInSpace(space: SpaceKey): void {
if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return;
if (space !== this.activeSpace) this.setActiveSpace(space, false);
@@ -701,6 +713,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@@ -724,6 +736,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false;
@ -71,7 +71,7 @@ index 50aa7748a5..f11cc20b0c 100644
if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
return s === dmBadgeSpace;
}
@@ -1277,6 +1293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@@ -1301,6 +1317,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
break;
}
@ -86,7 +86,7 @@ index 50aa7748a5..f11cc20b0c 100644
+
case "Spaces.enabledMetaSpaces": {
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]);
const enabledMetaSpaces = this.metaSpaceOrder.filter((k) => newValue[k]);
--
2.48.1

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

@ -1,4 +1,4 @@
From 34991cb7a32166efbfab4f09f05f2874180751ae Mon Sep 17 00:00:00 2001
From dbd02e7c0b1c63d432adb2d78c4ed5cb701092f7 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
@ -66,23 +66,24 @@ Date: Tue Aug 17 11:29:22 2021 +0200
Signed-off-by: Tadeusz Sośnierz <tadeusz@sosnierz.com>
---
src/components/views/emojipicker/EmojiPicker.tsx | 15 +++++++++++++++
.../views/emojipicker/ReactionPicker.tsx | 1 +
2 files changed, 16 insertions(+)
src/components/views/emojipicker/EmojiPicker.tsx | 16 ++++++++++++++++
.../views/emojipicker/ReactionPicker.tsx | 1 +
2 files changed, 17 insertions(+)
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index 0c10d778a6..250c8e0fec 100644
index 71659d579b..4acbfd1fcb 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -17,6 +17,7 @@ import Header from "./Header";
import Search from "./Search";
import Preview from "./Preview";
import QuickReactions from "./QuickReactions";
@@ -29,6 +29,8 @@ import { Key } from "../../../Keyboard";
import { clamp } from "../../../utils/numbers";
import { type ButtonEvent } from "../elements/AccessibleButton";
+import AccessibleButton from '../elements/AccessibleButton';
import Category, { CategoryKey, ICategory } from "./Category";
import { filterBoolean } from "../../../utils/arrays";
import {
@@ -36,6 +37,7 @@ export const EMOJIS_PER_ROW = 8;
+
export const CATEGORY_HEADER_HEIGHT = 20;
export const EMOJI_HEIGHT = 35;
export const EMOJIS_PER_ROW = 8;
@@ -36,6 +38,7 @@ export const EMOJIS_PER_ROW = 8;
const ZERO_WIDTH_JOINER = "\u200D";
interface IProps {
@ -90,7 +91,7 @@ index 0c10d778a6..250c8e0fec 100644
selectedEmojis?: Set<string>;
onChoose(unicode: string): boolean;
onFinished(): void;
@@ -337,6 +339,10 @@ class EmojiPicker extends React.Component<IProps, IState> {
@@ -337,6 +340,10 @@ class EmojiPicker extends React.Component<IProps, IState> {
}
};
@ -101,7 +102,7 @@ index 0c10d778a6..250c8e0fec 100644
private static categoryHeightForEmojiCount(count: number): number {
if (count === 0) {
return 0;
@@ -392,6 +398,15 @@ class EmojiPicker extends React.Component<IProps, IState> {
@@ -392,6 +399,15 @@ class EmojiPicker extends React.Component<IProps, IState> {
return categoryElement;
})}
</AutoHideScrollbar>
@ -118,7 +119,7 @@ index 0c10d778a6..250c8e0fec 100644
<Preview emoji={this.state.previewEmoji} />
) : (
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index ea1a502942..e49b7e33cd 100644
index 8509b4014a..5e9ea0fd60 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -126,6 +126,7 @@ class ReactionPicker extends React.Component<IProps, IState> {

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

@ -1,4 +1,4 @@
From 3749bf8941ea426d395fd0c15742b235b5798e8e Mon Sep 17 00:00:00 2001
From fcc37848fb0e949888a77325a4990639a3661d8e 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

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

@ -1,4 +1,4 @@
From 51bf3a238471a9c54ae19dd1abe527a60b0d798d Mon Sep 17 00:00:00 2001
From e9975388c5e2071240b8e16b122100f532aee10a 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 f417bd6045..6c6b7e2285 100644
index 3d802d34ad..e90667898b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1453,7 +1453,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1454,7 +1454,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 f417bd6045..6c6b7e2285 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1465,6 +1473,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1466,6 +1474,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -46,10 +46,10 @@ index f417bd6045..6c6b7e2285 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 45e1145c0f..dfa65a4917 100644
index 5ca4cbc3e8..80ada478ba 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -365,6 +365,12 @@ export const SETTINGS: Settings = {
@@ -363,6 +363,12 @@ export const SETTINGS: Settings = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: true,
},
@ -63,10 +63,10 @@ index 45e1145c0f..dfa65a4917 100644
"feature_video_rooms": {
isFeature: true,
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index f11cc20b0c..bce2146d4e 100644
index fcd7ff659b..33407f74e8 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
@@ -288,6 +288,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 (

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

@ -1,4 +1,4 @@
From df60ede5a07c6d13651844cd706ae63671684ffd Mon Sep 17 00:00:00 2001
From bfe58ad4c742484429495dda65fdfd26302270c3 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
@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs
1 file changed, 1 insertion(+)
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index c02d1181fe..1d9410f8e2 100644
index e3b01cae0b..02f6c286f2 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {

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

@ -1,4 +1,4 @@
From 4a15440a64bee09928b844c3a8072ff6291c2117 Mon Sep 17 00:00:00 2001
From b97e37b1f5e4ad33cf044f5371e91955cafc4b55 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 ac7c36daa5..a0fafce7cb 100644
index 75180013f6..e55eadaaf7 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon {

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

@ -1,4 +1,4 @@
From 058584a07a6640f9b30785c3c22937c13fedfcbb Mon Sep 17 00:00:00 2001
From d37ddfc40426f200c9fcaa4298c5cf9921fb9025 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 a0fafce7cb..dd681756c7 100644
index e55eadaaf7..21d0f1d83a 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.

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

@ -1,4 +1,4 @@
From e53d0af43fd013525967fad17b0d393df64b6824 Mon Sep 17 00:00:00 2001
From 51cc5b9086927db3a9c3aa21e59a6f0d7e8fc761 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
@ -8,7 +8,7 @@ Subject: No damn avatar background in room list
1 file changed, 3 insertions(+)
diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx
index 64b2ab0fce..d2045bd836 100644
index f3a44521fa..396601ba6e 100644
--- a/src/components/structures/BackdropPanel.tsx
+++ b/src/components/structures/BackdropPanel.tsx
@@ -13,6 +13,9 @@ interface IProps {

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

@ -1,4 +1,4 @@
From 37c21c10eb8d393e5f9724f14cddb94df749c8e3 Mon Sep 17 00:00:00 2001
From 50e71f22ccf8640b8cef718a3389b878602dd1d4 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,7 +8,7 @@ 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 1d2983dd03..83cafe4528 100644
index 17d09b661d..214514686f 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<EventTileProps, IState>

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

@ -1,4 +1,4 @@
From 08c316edf406d36de71822e0076c82d1e7bfcc84 Mon Sep 17 00:00:00 2001
From df6840270f2b8c6c1c1b5aaf430fa78f016b1a56 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

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

@ -1,4 +1,4 @@
From f57b5221822b11a962c0ac6464497b640893fde9 Mon Sep 17 00:00:00 2001
From 89c6003be2e9510be12640809a316278816f1837 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 dfa65a4917..92585b3f16 100644
index 80ada478ba..e41c19b750 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -779,7 +779,7 @@ export const SETTINGS: Settings = {
@@ -786,7 +786,7 @@ export const SETTINGS: Settings = {
"alwaysShowTimestamps": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("settings|always_show_message_timestamps"),

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

@ -1,4 +1,4 @@
From 2239b6a765a7e0bbeb7373ba06ab444a319a9631 Mon Sep 17 00:00:00 2001
From 2f4546aaca472f4ac2304fc5b5bdcb36c9a380c6 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,18 +8,18 @@ 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 92585b3f16..88d0548dc4 100644
index e41c19b750..276d72cf23 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -643,7 +643,7 @@ export const SETTINGS: Settings = {
@@ -641,7 +641,7 @@ export const SETTINGS: Settings = {
description: _td("labs|render_reaction_images_description"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
supportedLevelsAreOrdered: true,
- default: false,
+ default: true,
},
/**
* With the transition to Compound we are moving to a base font size
"feature_new_room_list": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
--
2.48.1

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

@ -1,4 +1,4 @@
From 906524fb3b12ab3a847379aa3ecd72cec93b0774 Mon Sep 17 00:00:00 2001
From 9b7345671c0910cf9d6ca3710a4cd9f5126fe186 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
@ -8,7 +8,7 @@ Subject: Enable chat previews by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index 2792e57f8d..4f9d436bc8 100644
index a4ae9bbc1d..227c918457 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -18,7 +18,7 @@ interface ISerializedListLayout {

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

@ -1,4 +1,4 @@
From 8f4ca3a428317d5bfa478ab0ee72074dcb111366 Mon Sep 17 00:00:00 2001
From 1d3a914d447e6ccae5ad13ac4438aa979610946e 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 88d0548dc4..8ad5546afb 100644
index 276d72cf23..4de889b562 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -1208,7 +1208,7 @@ export const SETTINGS: Settings = {
@@ -1206,7 +1206,7 @@ export const SETTINGS: Settings = {
},
"Spaces.showPeopleInSpace": {
supportedLevels: [SettingLevel.ROOM_ACCOUNT],
@ -22,7 +22,7 @@ index 88d0548dc4..8ad5546afb 100644
"developerMode": {
displayName: _td("devtools|developer_mode"),
diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts
index 7c4316ff21..4ffc0e67bf 100644
index 02e20e9103..2b49711c8e 100644
--- a/src/stores/room-list/filters/SpaceFilterCondition.ts
+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts
@@ -25,7 +25,7 @@ import SettingsStore from "../../../settings/SettingsStore";

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

@ -1,4 +1,4 @@
From 3331df28b4d40e94e73c051301261ac298074238 Mon Sep 17 00:00:00 2001
From 1784aaa9b523c5f02b089ed08847bb8d07240570 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
@ -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 5b86e3f753..03fbfe1a29 100644
index 54f91bd5f4..952f267902 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -1,5 +1,6 @@
@ -64,7 +64,7 @@ index 5b86e3f753..03fbfe1a29 100644
Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
Copyright 2015, 2016 OpenMarket Ltd
@@ -279,6 +280,10 @@ $left-gutter: 64px;
@@ -273,6 +274,10 @@ $left-gutter: 64px;
align-items: flex-start;
padding-top: 0;
@ -75,7 +75,7 @@ index 5b86e3f753..03fbfe1a29 100644
> a {
text-decoration: none; /* timestamps are links which shouldn't be underlined */
min-width: var(--MessageTimestamp-width); /* ensure space for EventTile without timestamp */
@@ -286,6 +291,7 @@ $left-gutter: 64px;
@@ -280,6 +285,7 @@ $left-gutter: 64px;
> * {
margin-right: var(--right-padding);
@ -83,7 +83,7 @@ index 5b86e3f753..03fbfe1a29 100644
}
.mx_EventTile_avatar,
@@ -321,17 +327,46 @@ $left-gutter: 64px;
@@ -315,17 +321,46 @@ $left-gutter: 64px;
width: var(--name-width);
margin-inline-end: 0; /* override mx_EventTile > * */
@ -131,7 +131,7 @@ index 5b86e3f753..03fbfe1a29 100644
}
&:hover {
@@ -343,17 +378,68 @@ $left-gutter: 64px;
@@ -337,17 +372,68 @@ $left-gutter: 64px;
display: inline;
background-color: $event-selected-color;
border-radius: 8px 0 0 8px;
@ -202,7 +202,7 @@ index 5b86e3f753..03fbfe1a29 100644
.mx_EventTile_e2eIcon {
padding: 0;
flex-grow: 0;
@@ -365,9 +451,8 @@ $left-gutter: 64px;
@@ -359,9 +445,8 @@ $left-gutter: 64px;
.mx_TextualEvent,
.mx_ViewSourceEvent,
.mx_MTextBody {
@ -214,7 +214,7 @@ index 5b86e3f753..03fbfe1a29 100644
}
.mx_EventTile_e2eIcon,
@@ -405,8 +490,36 @@ $left-gutter: 64px;
@@ -399,8 +484,36 @@ $left-gutter: 64px;
}
}
@ -253,7 +253,7 @@ index 5b86e3f753..03fbfe1a29 100644
}
.mx_MessageTimestamp {
@@ -459,8 +572,14 @@ $left-gutter: 64px;
@@ -453,8 +566,14 @@ $left-gutter: 64px;
&.mx_EventTile_emote {
.mx_EventTile_avatar {
@ -270,7 +270,7 @@ index 5b86e3f753..03fbfe1a29 100644
}
}
@@ -642,6 +761,15 @@ $left-gutter: 64px;
@@ -636,6 +755,15 @@ $left-gutter: 64px;
var(--name-width) + var(--icon-width) + var(--MessageTimestamp-width) + 2 * var(--right-padding)
);
}