From a2c363911237c53e1122631a12117f1d1bb2bbdb Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:18:14 +0100 Subject: [PATCH 01/61] Bootstrap schildi-lite --- README.md | 41 ++++++---------- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- merge_helpers.sh | 40 ++++++---------- merge_upstream.sh | 27 +++++++---- overlay/element-desktop/package.json | 71 ++++++++++++++++++++++++++++ overlay/element-web/package.json | 8 ++++ 9 files changed, 129 insertions(+), 66 deletions(-) create mode 100644 overlay/element-desktop/package.json create mode 100644 overlay/element-web/package.json diff --git a/README.md b/README.md index 9b1ea85..5743c03 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,9 @@ -# SchildiChat Web/Desktop +# SchildiChat Web/Desktop Lite SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). -The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are: -- Customizable room list style (compact single line, intermediate and roomy with two line preview) -- Option to show direct and group chats in a combined list -- Improved theming options -- Message bubbles -- … and more! - -Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop) -Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/) - -Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org). - - - -
-Public key used to sign the Debian packages - -``` -pub rsa4096 2020-12-08 [SC] - 560BB70DA86A6633A39CEC6023358905FE294D01 -uid Super apt repo key -sub rsa4096 2020-12-08 [E] -``` - -
+This branch builds the "lite" variant, which rebases a reduced feature set of the original fork on top of the latest Element, +in order to keep maintenance effort more manageable while staying up-to-date. ## Building SchildiChat Web/Desktop @@ -95,7 +72,7 @@ To notarize a build with Apple set `NOTARIZE_APPLE_ID` to your AppleID and set t As already noted above, **`master` contains the latest release** and **`sc` is the development branch**! ``` -git clone -b master --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git +git clone -b lite --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git cd schildichat-desktop make setup # optional step if using the other make targets ``` @@ -135,3 +112,13 @@ your-deploy-%: CFGDIR := $(YOUR_CFGDIR) your-deploy-web: web rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/ ``` + + +# Merge helpers + +## Add upstream repo remotes + +``` +source merge_helpers.sh +forall_repos add_upstream +``` diff --git a/element-desktop b/element-desktop index 2f54ef6..6c5a11e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3 +Subproject commit 6c5a11e9011511aece7c7fac8e6acdc335752118 diff --git a/element-web b/element-web index f3e6edb..cf448cf 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd +Subproject commit cf448cf08cbd8caa6a6e983f79af3cb66f3792e9 diff --git a/matrix-js-sdk b/matrix-js-sdk index c0ab637..4ab226e 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27 +Subproject commit 4ab226e58045f8f072bf3c14374d591c96a7a78b diff --git a/matrix-react-sdk b/matrix-react-sdk index 9e45813..a869ff1 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96 +Subproject commit a869ff1750b3e160477df4c5262fef9cc0b98baf diff --git a/merge_helpers.sh b/merge_helpers.sh index 3808eab..f457d36 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -2,7 +2,7 @@ SCHILDI_ROOT="$(dirname "$(realpath "$0")")" -branch=${BRANCH:-"sc"} +branch=${BRANCH:-"lite"} i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js" i18n_path="src/i18n/strings" @@ -32,36 +32,24 @@ add_upstream() { } forall_repos() { - pushd "$SCHILDI_ROOT/matrix-js-sdk" > /dev/null - "$@" - popd > /dev/null - - pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null - "$@" - popd > /dev/null - - pushd "$SCHILDI_ROOT/element-web" > /dev/null - "$@" - popd > /dev/null - - pushd "$SCHILDI_ROOT/element-desktop" > /dev/null - "$@" - popd > /dev/null + for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop"; do + pushd "$SCHILDI_ROOT/$repo" > /dev/null + "$@" + popd > /dev/null + done } forelement_repos() { - pushd "$SCHILDI_ROOT/element-web" > /dev/null - "$@" - popd > /dev/null - - pushd "$SCHILDI_ROOT/element-desktop" > /dev/null - "$@" - popd > /dev/null + for repo in "element-web" "element-desktop"; do + pushd "$SCHILDI_ROOT/$repo" > /dev/null + "$@" + popd > /dev/null + done } ensure_yes() { read -e -p "$1 [y/N] " choice - + if [[ "$choice" != [Yy]* ]]; then exit 1 fi @@ -217,7 +205,7 @@ revert_packagejson_changes() { apply_packagejson_overlay() { local orig_path="$1" - local overlay_path="$2" + local overlay_path="../overlay/$(basename "$PWD")/package.json" # see: https://stackoverflow.com/a/24904276 new_content=`jq -s '.[0] * .[1]' "$orig_path" "$overlay_path"` @@ -240,7 +228,7 @@ automatic_packagejson_adjustment() { local versions get_current_versions - forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json" + forelement_repos apply_packagejson_overlay "package.json" forelement_repos write_version "package.json" } diff --git a/merge_upstream.sh b/merge_upstream.sh index e772262..bd90235 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -4,6 +4,13 @@ set -e mydir="$(dirname "$(realpath "$0")")" +if [ "$1" = "--checkout" ]; then + git_action=checkout + shift +else + git_action=merge +fi + pushd "$mydir" > /dev/null source ./merge_helpers.sh @@ -19,8 +26,10 @@ forall_repos check_clean_git forall_repos git fetch upstream # Automatic reversions -automatic_i18n_reversion -automatic_packagejson_reversion +if [ "$git_action" != "checkout" ]; then + automatic_i18n_reversion + automatic_packagejson_reversion +fi # Merge upstream @@ -30,16 +39,16 @@ if [ -z "$1" ]; then else latest_upstream_tag="$1" fi -forelement_repos git merge "$latest_upstream_tag" +forelement_repos git "$git_action" "$latest_upstream_tag" get_current_mxsdk_tags pushd "matrix-js-sdk" > /dev/null -git merge "$current_mxjssdk_tag" +git "$git_action" "$current_mxjssdk_tag" popd > /dev/null pushd "matrix-react-sdk" > /dev/null -git merge "$current_mxreactsdk_tag" +git "$git_action" "$current_mxreactsdk_tag" popd > /dev/null # Refresh environment @@ -47,12 +56,12 @@ make clean make setup # Automatic adjustments -automatic_i18n_adjustment +#automatic_i18n_adjustment automatic_packagejson_adjustment # Automatic theme update -pushd "matrix-react-sdk" > /dev/null -./theme.sh y -popd > /dev/null +#pushd "matrix-react-sdk" > /dev/null +#./theme.sh y +#popd > /dev/null popd > /dev/null diff --git a/overlay/element-desktop/package.json b/overlay/element-desktop/package.json new file mode 100644 index 0000000..44e0c8c --- /dev/null +++ b/overlay/element-desktop/package.json @@ -0,0 +1,71 @@ +{ + "name": "schildichat-desktop-lite", + "productName": "SchildiChatLite", + "description": "A Matrix Client based on Element with a more traditional instant messaging experience", + "author": "SchildiChat", + "repository": { + "url": "https://github.com/SchildiChat/element-desktop" + }, + "homepage": "https://schildi.chat/", + "dependencies": { + "electron-osx-sign": "^0.5.0" + }, + "build": { + "appId": "chat.schildi.desktop.lite", + "linux": { + "target": "deb", + "category": "Network;InstantMessaging;Chat;VideoConference", + "maintainer": "codeworks@supercable.onl", + "desktop": { + "StartupWMClass": "schildichatlite" + } + }, + "deb": { + "depends": ["libgtk-3-0", "libnotify4", "libnss3", "libxss1", "libxtst6", "xdg-utils", "libatspi2.0-0", "libuuid1", "libsecret-1-0"], + "packageCategory": "net", + "priority": "extra" + }, + "mac": { + "category": "public.app-category.social-networking", + "extendInfo": { + "NSUserActivityTypes": [ + "org.matrix.room" + ], + "ITSAppUsesNonExemptEncryption": true + }, + "darkModeSupport": true, + "hardenedRuntime": true, + "entitlements": "build/entitlements.mac.plist", + "entitlementsInherit": "build/entitlements.mac.inherit.plist", + "asarUnpack": [ + ".hak/hakModules/keytar/build/Release/keytar.node", + ".hak/hakModules/matrix-seshat/native/index.node" + ] + }, + "dmg": { + "icon": "build/dmg.icns" + }, + "mas": { + "extendInfo": { + "LSMultipleInstancesProhibited": true + }, + "entitlements": "build/entitlements.mas.plist", + "provisioningProfile": "build/schildi_dev.provisionprofile", + "hardenedRuntime": false + }, + "protocols": [ + { + "name": "element", + "schemes": [ + "element" + ] + }, + { + "name": "schildichat", + "schemes": [ + "schildichat" + ] + } + ] + } +} diff --git a/overlay/element-web/package.json b/overlay/element-web/package.json new file mode 100644 index 0000000..6b0127b --- /dev/null +++ b/overlay/element-web/package.json @@ -0,0 +1,8 @@ +{ + "name": "schildichat-web-lite", + "description": "A Matrix client based on Element with a more traditional instant messaging experience", + "author": "SchildiChat", + "repository": { + "url": "https://github.com/SchildiChat/element-web" + } +} From 4b0435ef3b82d3c5a08ddc9526bfe8a872991d49 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:45:34 +0100 Subject: [PATCH 02/61] Fix fedora container build See: https://stackoverflow.com/a/74330717/4515820 --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 2ac846d..a886a89 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM docker.io/fedora:38 -RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl # node setup ARG NODE_VERSION From a1458b136bc6577561787481ea0cedc824d8c607 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:57:25 +0100 Subject: [PATCH 03/61] New release v1.11.36-sc.3 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index 7252cf8..fb2931e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 7252cf854ba614f7df7cbd20f8fa163316a6eb33 +Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f diff --git a/element-web b/element-web index e625706..904c637 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e6257065c1164f7e786d412050945626d834faac +Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7aca4ab..5a1c347 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7aca4ab6c0a0ab96382eeb4fe3470698f31b4d44 +Subproject commit 5a1c34750acf0c8da2a8ba25b6f79e9ac115230e From a95402e0a7d5105c25e455bd275018a150187076 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 27 Apr 2024 18:01:16 +0200 Subject: [PATCH 04/61] Import theme.sh from matrix-react-sdk Original history: commit 3ac1d305c420a23cab13c4f1756742663dddfe5a Author: su-ex Make linter happier commit 1cea13f3c55f353fd3bac1110214de54ba3d6ade Author: su-ex Make linter happier commit a29fbec8465ed803e44c386395bf81945b417175 Author: su-ex Fix codeblock background and border commit 0f9478f023f050a46788a4cb8a988d7a80afe57b Merge: a1e6fe4d42 1f3ad86106 Author: su-ex Merge tag 'v3.65.0' into sc commit ae33cfe40daa995ff4944b5a6d53a3fbfcd824e2 Merge: be6ad48996 8219e44596 Author: su-ex Merge tag 'v3.64.1' into sc commit 8126c80e45eefac0a2e42381c45461552ac7521f Merge: 4e56372068 cf36acaa41 Author: su-ex Merge tag 'v3.63.0' into sc commit 98e270faeb43e823bb04d9ee75883fd41adfc1c4 Author: su-ex theme.sh: scss --> pcss commit 8513eaa1390922f05d498c8490737be95c6b5ce8 Author: su-ex Change red the second commit 002d1365346f53261cf67427f383aea85655b3b3 Author: su-ex Better pill and alert colors commit 1ad4250029b8c3a06d588d80b1e06a9a051e48e0 Merge: 158486173b b5fdf11a03 Author: su-ex Merge tag 'v3.45.0' into sc commit c1a277047410e74ae24d3737fe514c7579f98878 Author: su-ex Fix themes - Rebase on Element - Better pills commit 6e73e67e7e98b3b35804aafa1349b38ad66eac08 Author: su-ex Fix $presence-offline not visible with light theme if room tile selected commit 9092353573307888b64fa1d0b841b43520b26e20 Author: su-ex theme.sh: Move clean git state check inside correct folder commit 6dd1575cadda61502eb509757182377c06adfd27 Merge: d30537548c cc296ef3da Author: su-ex Merge tag 'v3.42.1' into sc commit f3da66ac6aec0e726f37dc114466642e907b9cf5 Author: su-ex Allow theme.sh being run without commit commit 44fce0c9120bd29ac4d2673589c56d05f2dc5aeb Author: su-ex More pill stuff: - Consider custom themes - Same colors for other users and rooms - Less lighter dark bg commit 0b012f748750db67f1618c4aeb1b16c87403fb41 Author: su-ex Make pill background actually lighter tham the background with the dark theme commit c1cde5ad305610245af6c155dbddfb17e2962e24 Author: su-ex Fix other user pills not visible with dark theme commit 973ddf8edc3fd4583961c65909bbc279dc36f847 Merge: 56b7e84a4c b856083716 Author: su-ex Merge tag 'v3.36.0' into sc commit 515ee58343ac057ccaea75476377078f5ff99bc0 Merge: ae37a2dc79 bb55c76d81 Author: su-ex Merge tag 'v3.35.1' into sc commit c6f67a0bce737e2d3f19bda4e07dab91e6b8fd33 Merge: 9e709b6699 27e2faaf64 Author: su-ex Merge tag 'v3.34.0' into sc commit 3c6579e953662e46454b5e3140ad37262d34709c Author: su-ex theme.sh update commit 7bf38e0802b549184158c049a3c2efc162cb4b8e Author: su-ex Some after merge fixes commit e2d95dab547d944c4b4c04aac8c52cedcafddd4e Merge: 8ee39e7f15 e4f27f04b9 Author: su-ex Merge remote-tracking branch 'upstream/master' into sc commit 508e1653131481bde34b70c7737e5c1f09d5cb2a Merge: 351fd94451 e77f7319f2 Author: su-ex Merge remote-tracking branch 'upstream/master' into sc commit 525337fd829e5f778fcab8de68a5fcb078ab8c38 Author: su-ex Add some colors to theme.sh commit e918256a19bc195fd7bf3afa44144804390d6ff3 Author: su-ex Don't let automatic theme update fail if there was nothing to commit commit 09ce713cecd749c195264f8051572bb0db05b496 Author: SpiritCroc Fix some theme inconsistencies commit 196bed3bf5ce9b006005f32092e6dbc898ac30ce Author: SpiritCroc Update theme.sh commit 53ad57e118b2c14b8dcc6bf6821dde80df980626 Author: SpiritCroc Update theme.sh commit be4d6751620d73a256337803ad5f9d9b47463c56 Author: SpiritCroc theme.sh: Improve unread badge bg color commit d91294f6ee0b92c37d7770f77f043f82fd1f2b58 Author: SpiritCroc Add theme.sh --- theme.sh | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100755 theme.sh diff --git a/theme.sh b/theme.sh new file mode 100755 index 0000000..4b825bf --- /dev/null +++ b/theme.sh @@ -0,0 +1,174 @@ +#!/bin/bash + +shopt -s globstar + +mydir="$(dirname "$(realpath "$0")")" +automatic_commit="$1" + +pushd "$mydir/matrix-react-sdk" > /dev/null + +if [[ "$automatic_commit" == [Yy]* ]]; then + # Require clean git state + uncommitted=`git status --porcelain` + if [ ! -z "$uncommitted" ]; then + echo "Uncommitted changes are present, please commit first!" + exit 1 + fi +fi + +M_ACCENT="#8bc34a" +M_ACCENT_DEC="139, 195, 74" +M_ACCENT_DARK="#33691e" +M_ACCENT_LIGHT="#dcedc8" +M_ALERT="#e53935" +M_LINK="#368bd6" + +replace_colors() { + local f="$1" + if [[ "$f" =~ "dark" ]]; then + BG_ACCENT="$M_ACCENT_DARK" + CODEBLOCK_BORDER_COLOR="#121212" + CODEBLOCK_BACKGROUND_COLOR="#121212" + PILL_COLOR="rgba(255, 255, 255, 0.15)" + PILL_HOVER_COLOR="rgba(255, 255, 255, 0.18)" + PRESENCE_OFFLINE="#e0e0e0" # not applied because not existing specifically for dark + MESSAGE_BUBBLE_BACKGROUND="#424242" + MESSAGE_BUBBLE_BACKGROUND_SELF="#303030" + MESSAGE_BUBBLE_BACKGROUND_SELECTED="#3f4931" + else + BG_ACCENT="$M_ACCENT_LIGHT" + CODEBLOCK_BORDER_COLOR="#00000010" + CODEBLOCK_BACKGROUND_COLOR="#00000010" + PILL_COLOR="rgba(0, 0, 0, 0.13)" + PILL_HOVER_COLOR="rgba(0, 0, 0, 0.1)" + PRESENCE_OFFLINE="#bdbdbd" # for light this should actually be darker + MESSAGE_BUBBLE_BACKGROUND="#eeeeee" + MESSAGE_BUBBLE_BACKGROUND_SELF="#f1f8e9" + MESSAGE_BUBBLE_BACKGROUND_SELECTED="#dbedc6" + fi + # Neutral colors + sed -i 's|#15171b|#212121|gi' "$f" + sed -i 's|#15191E|#212121|gi' "$f" + sed -i 's|#2e2f32|#212121|gi' "$f" + sed -i 's|#232f32|#212121|gi' "$f" + sed -i 's|#27303a|#212121|gi' "$f" + sed -i 's|#17191C|#212121|gi' "$f" + sed -i 's|#181b21|#303030|gi' "$f" + sed -i 's|#1A1D23|#303030|gi' "$f" + sed -i 's|#20252B|#303030|gi' "$f" + sed -i 's|#20252c|#303030|gi' "$f" + sed -i 's|#21262c|#383838|gi' "$f" # selection/hover color + sed -i 's|#238cf5|#303030|gi' "$f" + sed -i 's|#25271F|#303030|gi' "$f" + sed -i 's|#272c35|#303030|gi' "$f" + sed -i 's|#2a3039|#303030|gi' "$f" + sed -i 's|#343a46|#424242|gi' "$f" + sed -i 's|#3c4556|#424242|gi' "$f" + sed -i 's|#3d3b39|#424242|gi' "$f" + sed -i 's|#45474a|#424242|gi' "$f" + sed -i 's|#454545|#424242|gi' "$f" + sed -i 's|#2e3649|#424242|gi' "$f" + sed -i 's|#4e5054|#424242|gi' "$f" + sed -i 's|#394049|#424242|gi' "$f" + sed -i 's|#3e444c|#424242|gi' "$f" + sed -i 's|#61708b|#616161|gi' "$f" + sed -i 's|#616b7f|#616161|gi' "$f" + sed -i 's|#5c6470|#616161|gi' "$f" + sed -i 's|#545a66|#616161|gi' "$f" # pill hover bg color + sed -i 's|#737D8C|#757575|gi' "$f" + sed -i 's|#6F7882|#757575|gi' "$f" + sed -i 's|#91A1C0|#757575|gi' "$f" # icon in button color + sed -i 's|#8D99A5|#808080|gi' "$f" + sed -i 's|#8E99A4|#808080|gi' "$f" # maybe use #9e9e9e instead + sed -i 's|#8D97A5|#808080|gi' "$f" + sed -i 's|#a2a2a2|#9e9e9e|gi' "$f" + sed -i 's|#9fa9ba|#aaaaaa|gi' "$f" # maybe use #9e9e9e instead + sed -i 's|#acacac|#aaaaaa|gi' "$f" # maybe use #9e9e9e instead + sed -i 's|#B9BEC6|#b3b3b3|gi' "$f" # maybe use #bdbdbd instead + sed -i 's|#a1b2d1|#b3b3b3|gi' "$f" + sed -i 's|#A9B2BC|#b3b3b3|gi' "$f" + sed -i 's|#C1C6CD|#bdbdbd|gi' "$f" + sed -i 's|#c1c9d6|#bdbdbd|gi' "$f" + sed -i 's|#c8c8cd|#cccccc|gi' "$f" # maybe use #bdbdbd instead + # sed -i 's|#dddddd|#e0e0e0|gi' "$f" # really? + sed -i 's|#e7e7e7|#e0e0e0|gi' "$f" + sed -i 's|#e3e8f0|#e0e0e0|gi' "$f" + sed -i 's|#e9e9e9|#e0e0e0|gi' "$f" + sed -i 's|#e9edf1|#e0e0e0|gi' "$f" + sed -i 's|#e8eef5|#e0e0e0|gi' "$f" + sed -i 's|#deddfd|#e0e0e0|gi' "$f" # $location-live-secondary-color, what to use really? + sed -i 's|#edf3ff|#eeeeee|gi' "$f" + sed -i 's|#f4f6fa|#f5f5f5|gi' "$f" + sed -i 's|#f6f7f8|#f5f5f5|gi' "$f" + sed -i 's|#f2f5f8|#f5f5f5|gi' "$f" + sed -i 's|#f5f8fa|#f5f5f5|gi' "$f" + sed -i 's|#f3f8fd|#fafafa|gi' "$f" + sed -i 's|rgba(33, 38, 34,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(33, 38, 44,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(34, 38, 46,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(38, 39, 43,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(46, 48, 51,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(92, 100, 112,|rgba(97, 97, 97,|gi' "$f" + sed -i 's|rgba(141, 151, 165,|rgba(144, 144, 144,|gi' "$f" + sed -i 's|rgba(242, 245, 248,|rgba(248, 248, 248,|gi' "$f" + + sed -i "s|\\(\$event-highlight-bg-color: \\).*;|\\1transparent;|gi" "$f" + sed -i "s|\\(\$preview-widget-bar-color: \\).*;|\\1#bdbdbd;|gi" "$f" + sed -i "s|\\(\$blockquote-bar-color: \\).*;|\\1#bdbdbd;|gi" "$f" + sed -i "s|\\(\$pill-bg-color: \\).*;|\\1$PILL_COLOR;|gi" "$f" + sed -i "s|\\(\$pill-hover-bg-color: \\).*;|\\1$PILL_HOVER_COLOR;|gi" "$f" + + sed -i "s|\\(\$inlinecode-border-color: \\).*;|\\1$CODEBLOCK_BORDER_COLOR;|gi" "$f" + sed -i "s|\\(\$inlinecode-background-color: \\).*;|\\1$CODEBLOCK_BACKGROUND_COLOR;|gi" "$f" + sed -i "s|\\(\$codeblock-background-color: \\).*;|\\1$CODEBLOCK_BACKGROUND_COLOR;|gi" "$f" + + sed -i "s|\\(\$presence-offline: \\).*;|\\1$PRESENCE_OFFLINE;|gi" "$f" + + # Accent colors + sed -i "s|#368bd6|$M_ACCENT|gi" "$f" + sed -i "s|#ac3ba8|$M_ACCENT|gi" "$f" + sed -i "s|#0DBD8B|$M_ACCENT|gi" "$f" + sed -i "s|#e64f7a|$M_ACCENT|gi" "$f" + sed -i "s|#ff812d|$M_ACCENT|gi" "$f" + sed -i "s|#2dc2c5|$M_ACCENT|gi" "$f" + sed -i "s|#5c56f5|$M_ACCENT|gi" "$f" + sed -i "s|#74d12c|$M_ACCENT|gi" "$f" + sed -i "s|#76CFA6|$M_ACCENT|gi" "$f" + sed -i "s|#03b381|$M_ACCENT|gi" "$f" + sed -i "s|rgba(3, 179, 129,|rgba($M_ACCENT_DEC,|gi" "$f" + sed -i "s|#03b381|$M_ACCENT|gi" "$f" + sed -i "s|#FF5B55|$M_ALERT|gi" "$f" + sed -i "s|\\(\$accent-alt: \\).*;|\\1$M_LINK;|gi" "$f" + #sed -i "s|\\(\$accent-darker: \\).*;|\\1$M_ACCENT_DARK;|gi" "$f" + sed -i "s|\\(\$roomtile-default-badge-bg-color: \\).*;|\\1$M_ACCENT;|gi" "$f" + #sed -i "s|\\(\$input-focused-border-color: \\).*;|\\1\$accent;|gi" "$f" # not existing anymore, need replacement? + sed -i "s|\\(\$reaction-row-button-selected-bg-color: \\).*;|\\1$BG_ACCENT;|gi" "$f" + + # e2e colors + sed -i "s|\\(\$e2e-verified-color: \\).*;|\\1$M_ACCENT;|gi" "$f" + sed -i "s|\\(\$e2e-unknown-color: \\).*;|\\1#ffc107;|gi" "$f" + sed -i "s|\\(\$e2e-unverified-color: \\).*;|\\1#ffc107;|gi" "$f" + sed -i "s|\\(\$e2e-warning-color: \\).*;|\\1$M_ALERT;|gi" "$f" + + # Message bubbles + sed -i "s|\\(\$eventbubble-self-bg: \\).*;|\$message-bubble-background-self: $MESSAGE_BUBBLE_BACKGROUND_SELF;|gi" "$f" + sed -i "s|\\(\$eventbubble-others-bg: \\).*;|\$message-bubble-background: $MESSAGE_BUBBLE_BACKGROUND;|gi" "$f" + sed -i "s|\\(\$eventbubble-bg-hover: \\).*;|\$message-bubble-background-selected: $MESSAGE_BUBBLE_BACKGROUND_SELECTED;|gi" "$f" + sed -i "s|\\(\$eventbubble-reply-color: \\).*;$||gi" "$f" +} + +replace_colors res/themes/dark/css/_dark.pcss +replace_colors res/themes/light/css/_light.pcss +replace_colors res/themes/legacy-light/css/_legacy-light.pcss +replace_colors res/themes/legacy-dark/css/_legacy-dark.pcss +for f in res/**/*.svg; do + replace_colors "$f" +done + +popd > /dev/null + +if [[ "$automatic_commit" == [Yy]* ]]; then + # see: https://devops.stackexchange.com/a/5443 + git add -A + git diff-index --quiet HEAD || git commit -m "Automatic theme update" +fi From b3530409475b0e0584f610d0c636a8054da91ebe Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 09:07:23 +0200 Subject: [PATCH 05/61] Collect MVP patches for rebase --- ...hildi-fetch-package.ts-modifications.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch 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 new file mode 100644 index 0000000..6dd2227 --- /dev/null +++ b/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch @@ -0,0 +1,62 @@ +From 74eb328104004566b2fe99035e67e46e531135e4 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sat, 2 Dec 2023 12:57:26 +0100 +Subject: [PATCH] Add back schildi fetch-package.ts modifications + +--- + scripts/fetch-package.ts | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts +index fc671c8..aa9c7ef 100644 +--- a/scripts/fetch-package.ts ++++ b/scripts/fetch-package.ts +@@ -55,6 +55,7 @@ async function main(): Promise { + let filename: string | undefined; + let url: string | undefined; + let setVersion = false; ++ const sc = true; + + while (process.argv.length > 2) { + switch (process.argv[2]) { +@@ -83,7 +84,9 @@ async function main(): Promise { + process.argv.shift(); + } + +- if (targetVersion === undefined) { ++ if (sc) { ++ // nothing ++ } else if (targetVersion === undefined) { + targetVersion = "v" + riotDesktopPackageJson.version; + } else if (targetVersion !== "develop") { + setVersion = true; // version was specified +@@ -93,7 +96,7 @@ async function main(): Promise { + filename = "develop.tar.gz"; + url = DEVELOP_TGZ_URL; + verify = false; // develop builds aren't signed +- } else if (targetVersion.includes("://")) { ++ } else if (targetVersion?.includes("://")) { + filename = targetVersion.substring(targetVersion.lastIndexOf("/") + 1); + url = targetVersion; + verify = false; // manually verified +@@ -143,12 +146,15 @@ async function main(): Promise { + } + + let haveDeploy = false; +- let expectedDeployDir = path.join(deployDir, path.basename(filename).replace(/\.tar\.gz/, "")); ++ let expectedDeployDir = sc ? "../element-web/webapp" : path.join(deployDir, path.basename(filename).replace(/\.tar\.gz/, "")); + try { + await fs.opendir(expectedDeployDir); + console.log(expectedDeployDir + "already exists"); + haveDeploy = true; +- } catch (e) {} ++ } catch (e) { ++ console.log("Not a valid webapp dir: " + expectedDeployDir, e); ++ return 1; ++ } + + if (!haveDeploy) { + const outPath = path.join(pkgDir, filename); +-- +2.45.0 + From f67822feabfb69119becd7dd5fd5203628d8c8f2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 09:19:54 +0200 Subject: [PATCH 06/61] merge_upstream.sh --checkout: re-apply our patches --- merge_helpers.sh | 19 +++++++++++++++++++ merge_upstream.sh | 23 ++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index f457d36..0e7881e 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -249,3 +249,22 @@ get_current_mxsdk_tags() { current_mxreactsdk_tag="v$(cat "$SCHILDI_ROOT/element-web/package.json" | jq '.dependencies["matrix-react-sdk"]' -r)" current_mxjssdk_tag="v$(cat "$SCHILDI_ROOT/element-web/package.json" | jq '.dependencies["matrix-js-sdk"]' -r)" } + +apply_patches() { + local repo="$(realpath "$1")" + local patch_dir="$SCHILDI_ROOT/patches/$(basename "$1")" + if [ ! -d "$repo" ]; then + echo "Unknown repo: $repo" + return 1 + fi + if [ ! -d "$patch_dir" ]; then + echo "No patches found at $patch_dir" + return 1 + fi + pushd "$repo" + for patch in "$patch_dir"/*; do + echo "Applying $patch to $repo..." + git am "$patch" || read -p "Applying $patch failed, please commit manually, then press enter: " + done + popd +} diff --git a/merge_upstream.sh b/merge_upstream.sh index bd90235..b912513 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -15,12 +15,18 @@ pushd "$mydir" > /dev/null source ./merge_helpers.sh -# Check branch -check_branch $branch -forall_repos check_branch $branch +if [ "$git_action" = "checkout" ]; then + # Abandon all local submodule state + forall_repos git reset --hard + git submodule update -f --recursive +else + # Check branch + check_branch $branch + forall_repos check_branch $branch -# Ensure clean git state -forall_repos check_clean_git + # Ensure clean git state + forall_repos check_clean_git +fi # Fetch upstream forall_repos git fetch upstream @@ -55,6 +61,13 @@ popd > /dev/null make clean make setup +# Apply our patches +if [ "$git_action" = "checkout" ]; then + #apply_patches matrix-react-sdk + #apply_patches element-web + apply_patches element-desktop +fi + # Automatic adjustments #automatic_i18n_adjustment automatic_packagejson_adjustment From eb706739a9f2b464506901efc8c114ddf1bce169 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 11:26:25 +0200 Subject: [PATCH 07/61] Update patches: disable sticky rooms, bring back unified room list --- ...hildi-fetch-package.ts-modifications.patch | 6 +- .../0001-Disable-sticky-rooms.patch | 29 ++ .../0002-Bring-back-unified-room-list.patch | 263 ++++++++++++++++++ 3 files changed, 295 insertions(+), 3 deletions(-) create mode 100644 patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch create mode 100644 patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch 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 6dd2227..bcdce40 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,14 +1,14 @@ -From 74eb328104004566b2fe99035e67e46e531135e4 Mon Sep 17 00:00:00 2001 +From 1173e36ec0b5ae32efc3125da704693eba6d6ca9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:57:26 +0100 -Subject: [PATCH] Add back schildi fetch-package.ts modifications +Subject: Add back schildi fetch-package.ts modifications --- scripts/fetch-package.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts -index fc671c8..aa9c7ef 100644 +index 051e53a..3446eb4 100644 --- a/scripts/fetch-package.ts +++ b/scripts/fetch-package.ts @@ -55,6 +55,7 @@ async function main(): Promise { diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch new file mode 100644 index 0000000..f586445 --- /dev/null +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -0,0 +1,29 @@ +From a5fa3affdee6f104a6529d252f49b5f311bfc100 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Tue, 18 Jan 2022 13:28:22 +0100 +Subject: Disable sticky rooms + +--- + src/stores/room-list/algorithms/Algorithm.ts | 6 ++++-- + 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 +--- 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 { + this.recalculateActiveCallRooms(tagId); + } + +- private updateStickyRoom(val: Room | null): void { +- this.doUpdateStickyRoom(val); ++ private updateStickyRoom(val: Room) { ++ // Schildi: we don't want it sticky ++ this.doUpdateStickyRoom(null); ++ //this.doUpdateStickyRoom(val); + this._lastStickyRoom = null; // clear to indicate we're done changing + } + +-- +2.45.0 + 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 new file mode 100644 index 0000000..9c80179 --- /dev/null +++ b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch @@ -0,0 +1,263 @@ +From 0cdeef0334e79d41f02141f01f6391f3444ae920 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sun, 5 May 2024 10:12:17 +0200 +Subject: Bring back unified room list + +Remaining TODO: +- Hook up setting to UI again (better with own SC-specific screen?) + +Co-authored-by: su-ex +--- + 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 + + 5 files changed, 83 insertions(+), 5 deletions(-) + +diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx +index 073950e30f..7488ffd2c6 100644 +--- a/src/components/views/rooms/RoomList.tsx ++++ b/src/components/views/rooms/RoomList.tsx +@@ -77,11 +77,13 @@ interface IState { + sublists: ITagMap; + currentRoomId?: string; + suggestedRooms: ISuggestedRoom[]; ++ unifiedRoomList: boolean; + } + + export const TAG_ORDER: TagID[] = [ + DefaultTagID.Invite, + DefaultTagID.Favourite, ++ DefaultTagID.Unified, + DefaultTagID.DM, + DefaultTagID.Untagged, + DefaultTagID.Conference, +@@ -94,6 +96,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]; ++const ALWAYS_VISIBLE_UNIFIED_TAGS: TagID[] = [DefaultTagID.Unified]; + + interface ITagAesthetics { + sectionLabel: TranslationKey; +@@ -371,6 +374,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { + return null; + }; + ++const UnifiedAuxButton: React.FC = (iAuxButtonProps: IAuxButtonProps) => { ++ return ( ++ <> ++ {/* eslint-disable-next-line new-cap */} ++ {DmAuxButton(iAuxButtonProps)} ++ {/* eslint-disable-next-line new-cap */} ++ {UntaggedAuxButton(iAuxButtonProps)} ++ ++ ); ++}; ++ + const TAG_AESTHETICS: TagAestheticsMap = { + [DefaultTagID.Invite]: { + sectionLabel: _td("action|invites_list"), +@@ -382,6 +396,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { + isInvite: false, + defaultHidden: false, + }, ++ [DefaultTagID.Unified]: { ++ sectionLabel: _td("Normal priority"), ++ isInvite: false, ++ defaultHidden: false, ++ AuxButtonComponent: UnifiedAuxButton, ++ }, + [DefaultTagID.DM]: { + sectionLabel: _td("common|people"), + isInvite: false, +@@ -426,6 +446,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { + + export default class RoomList extends React.PureComponent { + private dispatcherRef?: string; ++ private readonly unifiedRoomListWatcherRef: string; + private treeRef = createRef(); + + public static contextType = MatrixClientContext; +@@ -437,7 +458,14 @@ export default class RoomList extends React.PureComponent { + this.state = { + sublists: {}, + suggestedRooms: SpaceStore.instance.suggestedRooms, ++ unifiedRoomList: SettingsStore.getValue("unifiedRoomList"), + }; ++ ++ this.unifiedRoomListWatcherRef = SettingsStore.watchSetting( ++ "unifiedRoomList", ++ null, ++ this.onUnifiedRoomListChange, ++ ); + } + + public componentDidMount(): void { +@@ -452,9 +480,16 @@ export default class RoomList extends React.PureComponent { + SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms); + RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); + if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef); ++ SettingsStore.unwatchSetting(this.unifiedRoomListWatcherRef); + SdkContextClass.instance.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate); + } + ++ private onUnifiedRoomListChange = (): void => { ++ this.setState({ ++ unifiedRoomList: SettingsStore.getValue("unifiedRoomList"), ++ }); ++ }; ++ + private onRoomViewStoreUpdate = (): void => { + this.setState({ + currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined, +@@ -595,7 +630,9 @@ export default class RoomList extends React.PureComponent { + const aesthetics = TAG_AESTHETICS[orderedTagId]; + if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`); + +- let alwaysVisible = ALWAYS_VISIBLE_TAGS.includes(orderedTagId); ++ let alwaysVisible = ( ++ this.state.unifiedRoomList ? ALWAYS_VISIBLE_UNIFIED_TAGS : ALWAYS_VISIBLE_TAGS ++ ).includes(orderedTagId); + if ( + (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 6be0a6b46f..e96e29944a 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -206,6 +206,14 @@ export interface IFeature extends Omit, "isFeature"> { + export type ISetting = IBaseSetting | IFeature; + + export const SETTINGS: { [setting: string]: ISetting } = { ++ // SC settings start ++ "unifiedRoomList": { ++ supportedLevels: LEVELS_ACCOUNT_SETTINGS, ++ displayName: _td("Show people and rooms in a combined list"), ++ default: true, ++ controller: new ReloadOnChangeController(), ++ }, ++ // SC settings end + "feature_video_rooms": { + 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 +--- a/src/stores/room-list/RoomListStore.ts ++++ b/src/stores/room-list/RoomListStore.ts +@@ -508,6 +508,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements + this.setAndPersistListOrder(tag, listOrder); + } + } ++ ++ // SC: Unified list for DMs and groups ++ this.algorithm.setUnifiedRoomList(SettingsStore.getValue("unifiedRoomList")); + } + + private onAlgorithmListUpdated = (forceUpdate: boolean): void => { +@@ -621,7 +624,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements + */ + public getTagsForRoom(room: Room): TagID[] { + const algorithmTags = this.algorithm.getTagsForRoom(room); +- if (!algorithmTags) return [DefaultTagID.Untagged]; ++ if (!algorithmTags) { ++ if (SettingsStore.getValue("unifiedRoomList")) { ++ return [DefaultTagID.Unified]; ++ } else { ++ return [DefaultTagID.Untagged]; ++ } ++ } ++ const dmTagIndex = algorithmTags.indexOf(DefaultTagID.DM); ++ if (dmTagIndex !== -1) { ++ algorithmTags[dmTagIndex] = DefaultTagID.Unified; ++ } ++ const untaggedTagIndex = algorithmTags.indexOf(DefaultTagID.Untagged); ++ if (untaggedTagIndex !== -1) { ++ algorithmTags[untaggedTagIndex] = DefaultTagID.Unified; ++ } + return algorithmTags; + } + +diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts +index 635f7bbcf1..a837d02d22 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 { + * Set to true to suspend emissions of algorithm updates. + */ + public updatesInhibited = false; ++ private unifiedRoomList: boolean = true; + + public start(): void { + CallStore.instance.on(CallStoreEvent.ActiveCalls, this.onActiveCalls); +@@ -114,6 +115,10 @@ export class Algorithm extends EventEmitter { + return this._cachedRooms; + } + ++ public setUnifiedRoomList(unifiedRoomList: boolean): void { ++ this.unifiedRoomList = unifiedRoomList; ++ } ++ + /** + * Awaitable version of the sticky room setter. + * @param val The new room to sticky. +@@ -521,7 +526,10 @@ export class Algorithm extends EventEmitter { + } + + if (!inTag) { +- if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { ++ if (this.unifiedRoomList) { ++ // SC: Unified room list for DMs and groups ++ newTags[DefaultTagID.Unified].push(room); ++ } else if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { + newTags[DefaultTagID.DM].push(room); + } else { + newTags[DefaultTagID.Untagged].push(room); +@@ -565,7 +573,13 @@ export class Algorithm extends EventEmitter { + tags.push(...this.getTagsOfJoinedRoom(room)); + } + +- if (!tags.length) tags.push(DefaultTagID.Untagged); ++ if (!tags.length) { ++ if (this.unifiedRoomList) { ++ tags.push(DefaultTagID.Unified); ++ } else { ++ tags.push(DefaultTagID.Untagged); ++ } ++ } + + return tags; + } +@@ -575,7 +589,7 @@ export class Algorithm extends EventEmitter { + + if (tags.length === 0) { + // Check to see if it's a DM if it isn't anything else +- if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { ++ if (DMRoomMap.shared().getUserIdForRoomId(room.roomId) && !this.unifiedRoomList) { + tags = [DefaultTagID.DM]; + } + } +diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts +index d8b0488842..335097ccdb 100644 +--- a/src/stores/room-list/models.ts ++++ b/src/stores/room-list/models.ts +@@ -21,6 +21,7 @@ export enum DefaultTagID { + LowPriority = "m.lowpriority", + Favourite = "m.favourite", + DM = "im.vector.fake.direct", ++ Unified = "chat.schildi.fake.unified", + Conference = "im.vector.fake.conferences", + ServerNotice = "m.server_notice", + Suggested = "im.vector.fake.suggested", +@@ -29,6 +30,7 @@ export enum DefaultTagID { + export const OrderedDefaultTagIDs = [ + DefaultTagID.Invite, + DefaultTagID.Favourite, ++ DefaultTagID.Unified, + DefaultTagID.DM, + DefaultTagID.Conference, + DefaultTagID.Untagged, +-- +2.45.0 + From 8f70dea230b17f064be17ad49f2e09aeecbebdb0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 11:18:04 +0200 Subject: [PATCH 08/61] Automate rebase with patches --- generate_patches.sh | 39 +++++++++++++++++++++++++++++++++++++++ merge_upstream.sh | 45 +++++++++++---------------------------------- 2 files changed, 50 insertions(+), 34 deletions(-) create mode 100755 generate_patches.sh diff --git a/generate_patches.sh b/generate_patches.sh new file mode 100755 index 0000000..c7bdcef --- /dev/null +++ b/generate_patches.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +persist_patches() { + local repo="$(realpath "$1")" + local patch_dir="$SCHILDI_ROOT/patches/$(basename "$1")" + if [ ! -d "$repo" ]; then + echo "Unknown repo: $repo" + return 1 + fi + + pushd "$repo" + + if [ -d "$patch_dir" ]; then + echo "Clearing old patches..." + rm "$patch_dir"/* + else + echo "Creating new patch dir $patch_dir..." + mkdir "$patch_dir" + fi + echo "Creating new patches" + git format-patch -k upstream/master.. -o "$patch_dir" + 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 {} \; + popd +} + +persist_patches element-desktop +#persist_patches element-web +persist_patches matrix-react-sdk + +popd > /dev/null diff --git a/merge_upstream.sh b/merge_upstream.sh index b912513..a9c3352 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -4,57 +4,36 @@ set -e mydir="$(dirname "$(realpath "$0")")" -if [ "$1" = "--checkout" ]; then - git_action=checkout - shift -else - git_action=merge -fi - pushd "$mydir" > /dev/null source ./merge_helpers.sh -if [ "$git_action" = "checkout" ]; then - # Abandon all local submodule state - forall_repos git reset --hard - git submodule update -f --recursive -else - # Check branch - check_branch $branch - forall_repos check_branch $branch +# Persist current state +./generate_patches.sh - # Ensure clean git state - forall_repos check_clean_git -fi +# Abandon all local submodule state +forall_repos git reset --hard +git submodule update -f --recursive # Fetch upstream forall_repos git fetch upstream -# Automatic reversions -if [ "$git_action" != "checkout" ]; then - automatic_i18n_reversion - automatic_packagejson_reversion -fi - -# Merge upstream - # Check if specific version to merge passed if [ -z "$1" ]; then get_latest_upstream_tag else latest_upstream_tag="$1" fi -forelement_repos git "$git_action" "$latest_upstream_tag" +forelement_repos git checkout "$latest_upstream_tag" get_current_mxsdk_tags pushd "matrix-js-sdk" > /dev/null -git "$git_action" "$current_mxjssdk_tag" +git checkout "$current_mxjssdk_tag" popd > /dev/null pushd "matrix-react-sdk" > /dev/null -git "$git_action" "$current_mxreactsdk_tag" +git checkout "$current_mxreactsdk_tag" popd > /dev/null # Refresh environment @@ -62,11 +41,9 @@ make clean make setup # Apply our patches -if [ "$git_action" = "checkout" ]; then - #apply_patches matrix-react-sdk - #apply_patches element-web - apply_patches element-desktop -fi +apply_patches matrix-react-sdk +#apply_patches element-web +apply_patches element-desktop # Automatic adjustments #automatic_i18n_adjustment From b059c2f83d0139306813ae05850cdf8b26d198c0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 13:30:23 +0200 Subject: [PATCH 09/61] Update setup.sh for seshat --- setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.sh b/setup.sh index 98aabe1..a919ade 100755 --- a/setup.sh +++ b/setup.sh @@ -26,6 +26,10 @@ popd pushd element-desktop $yarn install ln -s ../element-web/webapp ./ || true +# Seshat: compare https://github.com/element-hq/element-desktop/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms +$yarn add matrix-seshat +#$yarn add electron-build-env +#$yarn run electron-build-env -- --electron "$electron_version" -- neon build matrix-seshat --release popd pushd i18n-helper From b0d22fba6b8956d005d41d4448262cd2b34b08e0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 6 May 2024 20:18:53 +0200 Subject: [PATCH 10/61] Update config overlays --- merge_helpers.sh | 2 +- overlay/element-desktop/package.json | 63 +--------------------------- 2 files changed, 2 insertions(+), 63 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 0e7881e..4e6703c 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -208,7 +208,7 @@ apply_packagejson_overlay() { local overlay_path="../overlay/$(basename "$PWD")/package.json" # see: https://stackoverflow.com/a/24904276 - new_content=`jq -s '.[0] * .[1]' "$orig_path" "$overlay_path"` + new_content=`jq -s '.[0] * .[1]' "$orig_path" "$overlay_path" | sed 's| | |g'` echo "$new_content" > "$orig_path" git add "$orig_path" diff --git a/overlay/element-desktop/package.json b/overlay/element-desktop/package.json index 44e0c8c..88634fa 100644 --- a/overlay/element-desktop/package.json +++ b/overlay/element-desktop/package.json @@ -6,66 +6,5 @@ "repository": { "url": "https://github.com/SchildiChat/element-desktop" }, - "homepage": "https://schildi.chat/", - "dependencies": { - "electron-osx-sign": "^0.5.0" - }, - "build": { - "appId": "chat.schildi.desktop.lite", - "linux": { - "target": "deb", - "category": "Network;InstantMessaging;Chat;VideoConference", - "maintainer": "codeworks@supercable.onl", - "desktop": { - "StartupWMClass": "schildichatlite" - } - }, - "deb": { - "depends": ["libgtk-3-0", "libnotify4", "libnss3", "libxss1", "libxtst6", "xdg-utils", "libatspi2.0-0", "libuuid1", "libsecret-1-0"], - "packageCategory": "net", - "priority": "extra" - }, - "mac": { - "category": "public.app-category.social-networking", - "extendInfo": { - "NSUserActivityTypes": [ - "org.matrix.room" - ], - "ITSAppUsesNonExemptEncryption": true - }, - "darkModeSupport": true, - "hardenedRuntime": true, - "entitlements": "build/entitlements.mac.plist", - "entitlementsInherit": "build/entitlements.mac.inherit.plist", - "asarUnpack": [ - ".hak/hakModules/keytar/build/Release/keytar.node", - ".hak/hakModules/matrix-seshat/native/index.node" - ] - }, - "dmg": { - "icon": "build/dmg.icns" - }, - "mas": { - "extendInfo": { - "LSMultipleInstancesProhibited": true - }, - "entitlements": "build/entitlements.mas.plist", - "provisioningProfile": "build/schildi_dev.provisionprofile", - "hardenedRuntime": false - }, - "protocols": [ - { - "name": "element", - "schemes": [ - "element" - ] - }, - { - "name": "schildichat", - "schemes": [ - "schildichat" - ] - } - ] - } + "homepage": "https://schildi.chat/" } From 9242672525a3ee7301d998e43d1d04f6b70faa91 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 7 May 2024 08:33:48 +0200 Subject: [PATCH 11/61] merge_upstream.sh: Add flag to skip patch generation Also checkout upstream/master for all repos until we push our own again. --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- merge_upstream.sh | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 1885b7a..78992f4 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1885b7a6c13733b440e0a30690a879b184ecbf73 +Subproject commit 78992f458b7f08696fca099c58e8c777d2ad5792 diff --git a/element-web b/element-web index e74ce0a..4a895f6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e74ce0adbfe037334a848d475155e92d4fe73eea +Subproject commit 4a895f6dafea7cbf2994469501426bf8e2d79e50 diff --git a/matrix-react-sdk b/matrix-react-sdk index ab0b524..0c40f6d 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit ab0b52468ff27bbeef7fcbe166c44e68fc89471d +Subproject commit 0c40f6d26f1662914521ed56507987149b462733 diff --git a/merge_upstream.sh b/merge_upstream.sh index a9c3352..2e58aaf 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -4,12 +4,21 @@ set -e mydir="$(dirname "$(realpath "$0")")" +if [ "$1" = "-k" ]; then + keep_patches=1 + shift +else + keep_patches=0 +fi + pushd "$mydir" > /dev/null source ./merge_helpers.sh # Persist current state -./generate_patches.sh +if [ "$keep_patches" = 0 ]; then + ./generate_patches.sh +fi # Abandon all local submodule state forall_repos git reset --hard From 11adc8123054a57f37a5e59a1246cb1bb98d6cc4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 8 May 2024 15:36:09 +0200 Subject: [PATCH 12/61] Do not sort muted chats at the bottom --- ...hildi-fetch-package.ts-modifications.patch | 2 +- .../0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 2 +- ...-rooms-to-bottom-I-still-want-to-see.patch | 25 +++++++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch 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 bcdce40..0eb8055 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 1173e36ec0b5ae32efc3125da704693eba6d6ca9 Mon Sep 17 00:00:00 2001 +From 7f932f56b483fa784260a9581e1a410fccd9a1ef 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-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index f586445..c9c4e68 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 a5fa3affdee6f104a6529d252f49b5f311bfc100 Mon Sep 17 00:00:00 2001 +From 26074d71cfc060952e9a63efd462b8450eb4d445 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 9c80179..1627722 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 0cdeef0334e79d41f02141f01f6391f3444ae920 Mon Sep 17 00:00:00 2001 +From 4447153bc30c98caed3b6896e1814daadd5fc101 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list 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 new file mode 100644 index 0000000..f264bcf --- /dev/null +++ b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -0,0 +1,25 @@ +From 6e32e2d55772a95bc660b27605981e46b805f821 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. + +--- + .../room-list/algorithms/list-ordering/OrderingAlgorithm.ts | 2 +- + 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 1b6472a018..8eae273a06 100644 +--- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts ++++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +@@ -46,7 +46,7 @@ export abstract class OrderingAlgorithm { + } + + public get isMutedToBottom(): boolean { +- return this.sortingAlgorithm === SortAlgorithm.Recent; ++ return this.sortingAlgorithm === SortAlgorithm.Recent && false; + } + + /** +-- +2.45.0 + From 8b9c72584bf45f95cab2a71795853adccbaa7906 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:31:24 +0200 Subject: [PATCH 13/61] merge_upstream.sh: Do not recreate patches by default --- merge_upstream.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/merge_upstream.sh b/merge_upstream.sh index 2e58aaf..d293e31 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -4,11 +4,12 @@ set -e mydir="$(dirname "$(realpath "$0")")" -if [ "$1" = "-k" ]; then - keep_patches=1 +# Update patches? +if [ "$1" = "-u" ]; then + keep_patches=0 shift else - keep_patches=0 + keep_patches=1 fi pushd "$mydir" > /dev/null From 511c1c8da8cac03682574f850c535c30962c9dd6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:33:20 +0200 Subject: [PATCH 14/61] Render captions --- generate_patches.sh | 1 + merge_upstream.sh | 1 + ...hildi-fetch-package.ts-modifications.patch | 2 +- ...Add-fields-for-media-caption-support.patch | 56 +++++++++ .../0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 8 +- ...-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...rendering-captions-in-media-messages.patch | 109 ++++++++++++++++++ 8 files changed, 174 insertions(+), 7 deletions(-) create mode 100644 patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch create mode 100644 patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch diff --git a/generate_patches.sh b/generate_patches.sh index c7bdcef..b456c34 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -35,5 +35,6 @@ persist_patches() { persist_patches element-desktop #persist_patches element-web persist_patches matrix-react-sdk +persist_patches matrix-js-sdk popd > /dev/null diff --git a/merge_upstream.sh b/merge_upstream.sh index d293e31..805fe8c 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -51,6 +51,7 @@ make clean make setup # Apply our patches +apply_patches matrix-js-sdk apply_patches matrix-react-sdk #apply_patches element-web apply_patches element-desktop 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 0eb8055..879fc73 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 7f932f56b483fa784260a9581e1a410fccd9a1ef Mon Sep 17 00:00:00 2001 +From bf8d7700c8680a0324ddf3b0d32c8a16af2176ae 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 new file mode 100644 index 0000000..a94bfa1 --- /dev/null +++ b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch @@ -0,0 +1,56 @@ +From b3e2e01c33bacd014287ab5dc7477fc70d91f9ab 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 + +--- + src/@types/media.ts | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/@types/media.ts b/src/@types/media.ts +index 20e5ca6c6..920d77667 100644 +--- a/src/@types/media.ts ++++ b/src/@types/media.ts +@@ -180,6 +180,9 @@ export interface FileContent extends BaseContent { + * One of: [m.file]. + */ + msgtype: MsgType.File; ++ ++ format?: string; ++ formatted_body?: string; + } + + /** +@@ -202,6 +205,9 @@ export interface ImageContent extends BaseContent { + * One of: [m.image]. + */ + msgtype: MsgType.Image; ++ ++ format?: string; ++ formatted_body?: string; + } + + /** +@@ -223,6 +229,9 @@ export interface AudioContent extends BaseContent { + * One of: [m.audio]. + */ + msgtype: MsgType.Audio; ++ ++ format?: string; ++ formatted_body?: string; + } + + /** +@@ -244,6 +253,9 @@ export interface VideoContent extends BaseContent { + * One of: [m.video]. + */ + msgtype: MsgType.Video; ++ ++ format?: string; ++ formatted_body?: string; + } + + /** +-- +2.45.0 + diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index c9c4e68..3036c1f 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 26074d71cfc060952e9a63efd462b8450eb4d445 Mon Sep 17 00:00:00 2001 +From 88515b6ab68264a4773dd07efbf0a9e01ab05d8b 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 1627722..b717146 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 4447153bc30c98caed3b6896e1814daadd5fc101 Mon Sep 17 00:00:00 2001 +From 4acd52e0e85d0217b7203fa81bfa709ccaf6d2aa 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 073950e30f..7488ffd2c6 100644 +index d573f3bbf0..ced4e7bb47 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -77,11 +77,13 @@ interface IState { @@ -124,10 +124,10 @@ index 073950e30f..7488ffd2c6 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 6be0a6b46f..e96e29944a 100644 +index 2137837500..49d96c7840 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -206,6 +206,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -207,6 +207,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 f264bcf..f3db324 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 6e32e2d55772a95bc660b27605981e46b805f821 Mon Sep 17 00:00:00 2001 +From 5c361faad5325629b5db9bdd6c0e69218bc53132 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 new file mode 100644 index 0000000..745fb5f --- /dev/null +++ b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch @@ -0,0 +1,109 @@ +From f9fdcd1fa38c883a07ef1b519217a1927f40547d 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 + +--- + src/components/views/messages/IBodyProps.ts | 2 ++ + src/components/views/messages/MessageEvent.tsx | 15 +++++++++++++++ + src/components/views/messages/TextualBody.tsx | 11 +++++++++++ + src/utils/FileUtils.ts | 4 +++- + 4 files changed, 31 insertions(+), 1 deletion(-) + +diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts +index fcc204dae3..95cb2eb37d 100644 +--- a/src/components/views/messages/IBodyProps.ts ++++ b/src/components/views/messages/IBodyProps.ts +@@ -59,4 +59,6 @@ export interface IBodyProps { + // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order. + // This may be useful when displaying a preview of the event. + inhibitInteraction?: boolean; ++ ++ OrigBodyType?: React.ComponentType>; + } +diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx +index db0016de7b..dd7a864300 100644 +--- a/src/components/views/messages/MessageEvent.tsx ++++ b/src/components/views/messages/MessageEvent.tsx +@@ -183,6 +183,15 @@ export default class MessageEvent extends React.Component implements IMe + } + } + ++ // @ts-ignore ++ const hasCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(msgtype) ++ && content.filename && content.filename !== content.body; ++ let OrigBodyType; ++ if (hasCaption) { ++ OrigBodyType = BodyType ++ BodyType = CaptionBody ++ } ++ + if (SettingsStore.getValue("feature_mjolnir")) { + const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`; + const allowRender = localStorage.getItem(key) === "true"; +@@ -216,7 +225,13 @@ export default class MessageEvent extends React.Component implements IMe + getRelationsForEvent={this.props.getRelationsForEvent} + isSeeingThroughMessageHiddenForModeration={this.props.isSeeingThroughMessageHiddenForModeration} + inhibitInteraction={this.props.inhibitInteraction} ++ OrigBodyType={OrigBodyType} + /> + ) : null; + } + } ++ ++const CaptionBody: React.FunctionComponent>}> = ({OrigBodyType, ...props}) => (
++ ++ ++
) +diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx +index f0b5c70f17..e28ed3fad7 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 { + const content = mxEvent.getContent(); + let isNotice = false; + let isEmote = false; ++ let isCaption = false; + + // only strip reply if this is the original replying event, edits thereafter do not have the fallback + const stripReply = !mxEvent.replacingEvent() && !!getParentEventId(mxEvent); + isEmote = content.msgtype === MsgType.Emote; + isNotice = content.msgtype === MsgType.Notice; ++ // @ts-ignore ++ isCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(content.msgtype); + 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 { + + ); + } ++ if (isCaption) { ++ return ( ++
++ { body } ++ { widgets } ++
++ ); ++ } + return ( +
+ {body} +diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts +index 75511756f5..a8e3b9cceb 100644 +--- a/src/utils/FileUtils.ts ++++ b/src/utils/FileUtils.ts +@@ -46,7 +46,9 @@ export function presentableTextForFile( + shortened = false, + ): string { + let text = fallbackText; +- if (content.body?.length) { ++ if (content.filename?.length) { ++ text = content.filename ++ } else if (content.body?.length) { + // The content body should be the name of the file including a + // file extension. + text = content.body; +-- +2.45.0 + From 649a7f00bfef198bd7576fad4a82df6fe78c79c6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:36:23 +0200 Subject: [PATCH 15/61] Add FEATURES.md --- FEATURES.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 FEATURES.md diff --git a/FEATURES.md b/FEATURES.md new file mode 100644 index 0000000..e4a928b --- /dev/null +++ b/FEATURES.md @@ -0,0 +1,20 @@ +# Features and changes compared to upstream + +Note that this list may be incomplete or outdated. + + +## General UI + +... TODO Schildi theme? + + +## Chat overview ("room list") + +- Unified room list instead of separating DMs and groups (TODO: setting) +- Do not exclude currently selected room when updating room sort order +- Do not force muted rooms to be sorted at the bottom + + +## Conversation screen + +- Render captions From 634049ce7a3fc46c079f2ee1c321a11527de29d3 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:39:30 +0200 Subject: [PATCH 16/61] Exclude reactions from room previews --- FEATURES.md | 1 + .../0005-Don-t-preview-reactions.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch diff --git a/FEATURES.md b/FEATURES.md index e4a928b..2a3e7e3 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -13,6 +13,7 @@ Note that this list may be incomplete or outdated. - Unified room list instead of separating DMs and groups (TODO: setting) - Do not exclude currently selected room when updating room sort order - Do not force muted rooms to be sorted at the bottom +- Hide reactions from room previews ## Conversation screen diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch new file mode 100644 index 0000000..6859c3e --- /dev/null +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -0,0 +1,29 @@ +From a4cded706d0e451517e66b300324ad085eb86105 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Thu, 14 Dec 2023 10:32:10 +0100 +Subject: Don't preview reactions + +--- + src/stores/room-list/MessagePreviewStore.ts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts +index a3c44084d5..f412cf3b89 100644 +--- a/src/stores/room-list/MessagePreviewStore.ts ++++ b/src/stores/room-list/MessagePreviewStore.ts +@@ -65,10 +65,12 @@ const PREVIEWS: Record< + isState: false, + previewer: new StickerEventPreview(), + }, ++ /* + "m.reaction": { + isState: false, + previewer: new ReactionEventPreview(), + }, ++ */ + [M_POLL_START.name]: { + isState: false, + previewer: new PollStartEventPreview(), +-- +2.45.0 + From 0fb8fa0931b0dacf52a1077707ca92588cb73462 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 19:03:54 +0200 Subject: [PATCH 17/61] Update patches --- ...tification-state-the-same-way-as-the.patch | 30 +++++++++++++++++++ ...llow-muted-rooms-to-render-as-unread.patch | 25 ++++++++++++++++ .../0008-Increase-default-visible-tiles.patch | 25 ++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch create mode 100644 patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch create mode 100644 patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch 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 new file mode 100644 index 0000000..8949e5f --- /dev/null +++ b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -0,0 +1,30 @@ +From f71efc87d1e8fa87ea7e8bd4cb31bb938fe4e0fc 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 + +This can get in the way of the "marked as unread" icon otherwise. +Furthermore, I didn't really like it showing there persistently either +way. +--- + src/components/views/rooms/RoomTile.tsx | 4 +++- + 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 +--- a/src/components/views/rooms/RoomTile.tsx ++++ b/src/components/views/rooms/RoomTile.tsx +@@ -313,7 +313,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 +- mx_RoomTile_notificationsButton_show: state === RoomNotifState.Mute, ++ //mx_RoomTile_notificationsButton_show: state === RoomNotifState.Mute, ++ // SchildiChat: never show the icon by default. This gets in the way of the "marked as unread" icon. ++ mx_RoomTile_notificationsButton_show: false, + }); + + return ( +-- +2.45.0 + 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 new file mode 100644 index 0000000..896e4ec --- /dev/null +++ b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch @@ -0,0 +1,25 @@ +From 2ffbb3cea351764ac33c347ba645262747bb962e 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 + +--- + src/RoomNotifs.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts +index 1fb5e5ba4d..f9cb6ed026 100644 +--- a/src/RoomNotifs.ts ++++ b/src/RoomNotifs.ts +@@ -263,7 +263,7 @@ export function determineUnreadState( + return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; + } + +- 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 }; + } + +-- +2.45.0 + diff --git a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch new file mode 100644 index 0000000..bb086d7 --- /dev/null +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -0,0 +1,25 @@ +From 36270f5aed00f5da899486a59c4bf172f02e7a6c Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sun, 30 Aug 2020 15:33:01 +0200 +Subject: Increase default visible tiles + +--- + src/stores/room-list/ListLayout.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts +index afc93f3b01..6020b2148d 100644 +--- a/src/stores/room-list/ListLayout.ts ++++ b/src/stores/room-list/ListLayout.ts +@@ -82,7 +82,7 @@ export class ListLayout { + + public get defaultVisibleTiles(): number { + // This number is what "feels right", and mostly subject to design's opinion. +- return 8; ++ return 50; + } + + public tilesWithPadding(n: number, paddingPx: number): number { +-- +2.45.0 + From 108a76376cfd4ef00f27708bdaa5eff43c6c6367 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 26 May 2024 10:46:02 +0200 Subject: [PATCH 18/61] Include DMs in space unread counts --- FEATURES.md | 3 + element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...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 | 4 +- ...-rooms-to-bottom-I-still-want-to-see.patch | 4 +- ...rendering-captions-in-media-messages.patch | 4 +- .../0005-Don-t-preview-reactions.patch | 4 +- ...tification-state-the-same-way-as-the.patch | 4 +- ...llow-muted-rooms-to-render-as-unread.patch | 4 +- .../0008-Increase-default-visible-tiles.patch | 4 +- ...paceDMBadges-setting-force-enabled-f.patch | 92 +++++++++++++++++++ 16 files changed, 119 insertions(+), 24 deletions(-) create mode 100644 patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch diff --git a/FEATURES.md b/FEATURES.md index 2a3e7e3..c3d0c46 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -14,6 +14,9 @@ Note that this list may be incomplete or outdated. - Do not exclude currently selected room when updating room sort order - Do not force muted rooms to be sorted at the bottom - Hide reactions from room previews +- Show unread state of muted rooms +- Increase default visible tiles before collapsing each section +- Include DMs in space unread counts ## Conversation screen diff --git a/element-desktop b/element-desktop index 78992f4..3059810 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 78992f458b7f08696fca099c58e8c777d2ad5792 +Subproject commit 3059810f1a9dc21b7545f38fab082def8f5ae893 diff --git a/element-web b/element-web index 4a895f6..5e02a42 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 4a895f6dafea7cbf2994469501426bf8e2d79e50 +Subproject commit 5e02a42ca0863a6d991f989a5b29d07b401766d4 diff --git a/matrix-js-sdk b/matrix-js-sdk index bc03950..a86d4ce 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit bc03950f8a1bbc2900c5c4198430c040474bd144 +Subproject commit a86d4ceb49137f13240674ddb358bb96934ba720 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0c40f6d..d84bcbc 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0c40f6d26f1662914521ed56507987149b462733 +Subproject commit d84bcbc2155a138bcfafc3efa60c4abf7b4a4d14 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 879fc73..9cb15f7 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 bf8d7700c8680a0324ddf3b0d32c8a16af2176ae Mon Sep 17 00:00:00 2001 +From 53255efd63c66bee0d19f8f84fcffd9878af88dd 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.0 +2.45.1 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 a94bfa1..c26dc0b 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 b3e2e01c33bacd014287ab5dc7477fc70d91f9ab Mon Sep 17 00:00:00 2001 +From 2dd7dd408d741ea4a0fc3b2b3fe8e23c3efcbc99 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.0 +2.45.1 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 3036c1f..6764f90 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 88515b6ab68264a4773dd07efbf0a9e01ab05d8b Mon Sep 17 00:00:00 2001 +From 3f96a572feed66d34d20d1d416ffce7c14989a9c 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.0 +2.45.1 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 b717146..dc039dc 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 4acd52e0e85d0217b7203fa81bfa709ccaf6d2aa Mon Sep 17 00:00:00 2001 +From ac11424ef182d789c3d9bb55feeb6910230d9dbe Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -259,5 +259,5 @@ index d8b0488842..335097ccdb 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.45.0 +2.45.1 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 f3db324..9816da4 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 5c361faad5325629b5db9bdd6c0e69218bc53132 Mon Sep 17 00:00:00 2001 +From 53cb5e26d3798e3f6f79ea0cc0251b64165783da 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.0 +2.45.1 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 745fb5f..e835bba 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 f9fdcd1fa38c883a07ef1b519217a1927f40547d Mon Sep 17 00:00:00 2001 +From 10b9e0d75503a248d4b6d5273c6a454d0a8cc26d 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 @@ -105,5 +105,5 @@ index 75511756f5..a8e3b9cceb 100644 // file extension. text = content.body; -- -2.45.0 +2.45.1 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 6859c3e..292ae10 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 a4cded706d0e451517e66b300324ad085eb86105 Mon Sep 17 00:00:00 2001 +From 5d0ef9b963d06d16660ddf8780e4c178d6904418 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.0 +2.45.1 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 8949e5f..4c6e6c9 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 f71efc87d1e8fa87ea7e8bd4cb31bb938fe4e0fc Mon Sep 17 00:00:00 2001 +From c5072d047ca79fff785a5d8a0c55b217c1294301 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 61f865e9fc..0695075cc8 100644 return ( -- -2.45.0 +2.45.1 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 896e4ec..19abaac 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 2ffbb3cea351764ac33c347ba645262747bb962e Mon Sep 17 00:00:00 2001 +From 62797661b2169a90cda8f8bd20505119629c8507 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.0 +2.45.1 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 bb086d7..f5d605b 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 36270f5aed00f5da899486a59c4bf172f02e7a6c Mon Sep 17 00:00:00 2001 +From 21924d5e5ed429c6a24493a04c675ff6569a09b8 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.0 +2.45.1 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 new file mode 100644 index 0000000..3f725fa --- /dev/null +++ b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -0,0 +1,92 @@ +From d9f769129c789a2570bb5edc7cf4a639607c58b6 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 + +TODO settings UI + +Co-authored-by: SpiritCroc +--- + src/settings/Settings.tsx | 5 +++++ + src/stores/spaces/SpaceStore.ts | 25 +++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) + +diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx +index 49d96c7840..332e6a7b0a 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -214,6 +214,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { + default: true, + controller: new ReloadOnChangeController(), + }, ++ "Spaces.showSpaceDMBadges": { ++ displayName: _td("Show notification badges for People in Spaces"), ++ supportedLevels: LEVELS_ACCOUNT_SETTINGS, ++ default: true, ++ }, + // SC settings end + "feature_video_rooms": { + isFeature: true, +diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts +index 966b564d68..bda81e9d5f 100644 +--- a/src/stores/spaces/SpaceStore.ts ++++ b/src/stores/spaces/SpaceStore.ts +@@ -162,9 +162,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + /** Whether the feature flag is set for MSC3946 */ + private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors"); + ++ // SC start ++ private _showSpaceDMBadges = true; ++ // SC end ++ + public constructor() { + super(defaultDispatcher, {}); + ++ // SC start ++ SettingsStore.monitorSetting("Spaces.showSpaceDMBadges", null); ++ // SC end ++ + SettingsStore.monitorSetting("Spaces.allRoomsInHome", null); + SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null); + SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null); +@@ -200,6 +208,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + return this._allRoomsInHome; + } + ++ public get showSpaceDMBadges(): boolean { // SC ++ return this._showSpaceDMBadges; ++ } ++ + public setActiveRoomInSpace(space: SpaceKey): void { + if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return; + if (space !== this.activeSpace) this.setActiveSpace(space, false); +@@ -709,6 +721,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + + if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false; + ++ if (this.showSpaceDMBadges) { // SC ++ return true; ++ } ++ + if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { + return s === dmBadgeSpace; + } +@@ -1285,6 +1301,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + break; + } + ++ case "Spaces.showSpaceDMBadges": { // SC ++ const newValue = SettingsStore.getValue("Spaces.showSpaceDMBadges"); ++ if (this.showSpaceDMBadges !== newValue) { ++ this._showSpaceDMBadges = newValue; ++ this.rebuildSpaceHierarchy(); // rebuild everything ++ } ++ break; ++ } ++ + case "Spaces.enabledMetaSpaces": { + const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); + const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); +-- +2.45.1 + From a670bf6beabefb9e7b7b87e0ba797b2d863a5242 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:35:18 +0200 Subject: [PATCH 19/61] Add back freeform reactions --- FEATURES.md | 1 + ...m-reactions-from-tadzik-freeform-rea.patch | 134 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch diff --git a/FEATURES.md b/FEATURES.md index c3d0c46..41f1123 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -22,3 +22,4 @@ Note that this list may be incomplete or outdated. ## Conversation screen - Render captions +- Allow sending freeform reactions 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 new file mode 100644 index 0000000..8f52d21 --- /dev/null +++ b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -0,0 +1,134 @@ +From a0312959dc35c68c5a5b1a6e512e942c7f1cfafb 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +commit 9eea56b0080db3720efa49b457707bcde3be6474 +Merge: 06f81c9662 8570f16e31 +Author: Tadeusz Sośnierz +Date: Tue Jun 20 09:57:19 2023 +0200 + + Merge branch 'develop' into tadzik/freeform-reactions-upstream + +commit 06f81c9662fbe033b4eac859d7e14e0ab24a6e91 +Merge: ad4fef85b1 0d6a550c33 +Author: Michael Telatynski <7t3chguy@gmail.com> +Date: Wed Aug 31 09:06:49 2022 +0100 + + Merge branch 'develop' into tadzik/freeform-reactions + +commit ad4fef85b160087b8017b9ae9cf9aebfd5348f41 +Merge: 689b57c0b9 5aae974e93 +Author: Tadeusz Sośnierz +Date: Sun Aug 28 10:11:48 2022 +0200 + + Merge branch 'develop' into tadzik/freeform-reactions + +commit 689b57c0b91e12907a8dbc3fac3ed10302a11e4a +Author: Tadeusz Sośnierz +Date: Fri May 20 10:35:06 2022 +0200 + + Fix conflict resolution fail in EmojiPicker + +commit 70a8e212b748584949b37bc99b72acffce2fd148 +Merge: 215df55f13 a0cdc93642 +Author: Tadeusz Sośnierz +Date: Fri May 20 10:25:17 2022 +0200 + + Merge branch 'develop' into tadzik/freeform-reactions-upstream + +commit 215df55f13162bdc8eb13da5219763c56f560dd0 +Author: Tadeusz Sośnierz +Date: Tue Aug 17 16:30:06 2021 +0200 + + Disable freeform emoji reactions in the message composer + +commit 6bb8263007e077d22929fcc1fb439d94a4f15c6f +Author: Tadeusz Sośnierz +Date: Tue Aug 17 12:12:28 2021 +0200 + + Add more typing to EmojiPicker + +commit b2a1728318a8a5496345797995c1ec09ae3f88e6 +Author: Tadeusz Sośnierz +Date: Tue Aug 17 11:52:35 2021 +0200 + + Make free-form reaction button translatable + +commit f4adaf00b805baba454fbceb41cc5c081ec886a7 +Author: Tadeusz Sośnierz +Date: Tue Aug 17 11:29:22 2021 +0200 + + Allow sending free-form reactions + + Signed-off-by: Tadeusz Sośnierz +--- + src/components/views/emojipicker/EmojiPicker.tsx | 15 +++++++++++++++ + .../views/emojipicker/ReactionPicker.tsx | 1 + + 2 files changed, 16 insertions(+) + +diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx +index 16258bb3d7..847170dc92 100644 +--- a/src/components/views/emojipicker/EmojiPicker.tsx ++++ b/src/components/views/emojipicker/EmojiPicker.tsx +@@ -25,6 +25,7 @@ import Header from "./Header"; + import Search from "./Search"; + import Preview from "./Preview"; + import QuickReactions from "./QuickReactions"; ++import AccessibleButton from '../elements/AccessibleButton'; + import Category, { CategoryKey, ICategory } from "./Category"; + import { filterBoolean } from "../../../utils/arrays"; + import { +@@ -45,6 +46,7 @@ export const EMOJIS_PER_ROW = 8; + const ZERO_WIDTH_JOINER = "\u200D"; + + interface IProps { ++ allowUnlisted?: boolean; + selectedEmojis?: Set; + onChoose(unicode: string): boolean; + onFinished(): void; +@@ -349,6 +351,10 @@ class EmojiPicker extends React.Component { + } + }; + ++ private reactWith = (reaction: string): void => { ++ this.props.onChoose(reaction); ++ }; ++ + private static categoryHeightForEmojiCount(count: number): number { + if (count === 0) { + return 0; +@@ -404,6 +410,15 @@ class EmojiPicker extends React.Component { + return categoryElement; + })} + ++ { ++ (this.props.allowUnlisted && this.state.filter) && ++ this.reactWith(this.state.filter)} ++ > ++ { _t('React with "%(reaction)s"', { reaction: this.state.filter }) } ++ ++ } + {this.state.previewEmoji ? ( + + ) : ( +diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx +index 075a6e6cee..42cde47e56 100644 +--- a/src/components/views/emojipicker/ReactionPicker.tsx ++++ b/src/components/views/emojipicker/ReactionPicker.tsx +@@ -131,6 +131,7 @@ class ReactionPicker extends React.Component { + public render(): React.ReactNode { + return ( + Date: Wed, 29 May 2024 20:05:42 +0200 Subject: [PATCH 20/61] Add back wider width limit for text reactions --- FEATURES.md | 1 + ...1-Allow-reactions-to-take-more-space.patch | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch diff --git a/FEATURES.md b/FEATURES.md index 41f1123..8c43950 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -23,3 +23,4 @@ Note that this list may be incomplete or outdated. - Render captions - Allow sending freeform reactions +- Less restrictive width limit for rendering text reactions 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 new file mode 100644 index 0000000..ed76b38 --- /dev/null +++ b/patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch @@ -0,0 +1,32 @@ +From e67b314775022cc970e7704bdcaa36cd674091bc 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 + +--- + res/css/views/messages/_ReactionsRowButton.pcss | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss +index 26d2d25fae..9920c6c20d 100644 +--- a/res/css/views/messages/_ReactionsRowButton.pcss ++++ b/res/css/views/messages/_ReactionsRowButton.pcss +@@ -23,6 +23,7 @@ limitations under the License. + background-color: $secondary-hairline-color; + user-select: none; + align-items: center; ++ max-width: calc(100% - 40px);; + + &:hover { + border-color: $quinary-content; +@@ -38,7 +39,6 @@ limitations under the License. + } + + .mx_ReactionsRowButton_content { +- max-width: 100px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +-- +2.45.1 + From 1489beb3224e169c4c20e81f1e81c117a582e9e5 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 30 May 2024 15:07:55 +0200 Subject: [PATCH 21/61] Show space overview on space switch --- FEATURES.md | 1 + ...don-t-automatically-show-last-opened.patch | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch diff --git a/FEATURES.md b/FEATURES.md index 8c43950..2cd9134 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -17,6 +17,7 @@ Note that this list may be incomplete or outdated. - Show unread state of muted rooms - 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 ## Conversation screen 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 new file mode 100644 index 0000000..806749c --- /dev/null +++ b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch @@ -0,0 +1,79 @@ +From 077a509fd1d078ee95102164ae1ddfa5584e4841 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 + +--- + src/components/structures/MatrixChat.tsx | 18 +++++++++++++++++- + src/settings/Settings.tsx | 6 ++++++ + src/stores/spaces/SpaceStore.ts | 1 + + 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 +--- a/src/components/structures/MatrixChat.tsx ++++ b/src/components/structures/MatrixChat.tsx +@@ -1430,7 +1430,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; +- } else if (localStorage && localStorage.getItem("mx_last_room_id")) { ++ } else if ( ++ !SettingsStore.getValue("Spaces.returnToPreviouslyOpenedRoom") && ++ localStorage && ++ localStorage.getItem("mx_active_space") && ++ localStorage.getItem("mx_active_space")[0] === "!" ++ ) { ++ // SC: Show the last viewed space ++ this.viewLastSpace(); ++ } else if (SettingsStore.getValue("Spaces.returnToPreviouslyOpenedRoom") && localStorage && localStorage.getItem("mx_last_room_id")) { + // Before defaulting to directory, show the last viewed room + this.viewLastRoom(); + } else { +@@ -1442,6 +1450,14 @@ export default class MatrixChat extends React.PureComponent { + } + } + ++ private viewLastSpace(): void { // SC ++ // SC-ToDo: Make this work for meta spaces ++ dis.dispatch({ ++ action: Action.ViewRoom, ++ room_id: localStorage.getItem("mx_active_space"), ++ }); ++ } ++ + private viewLastRoom(): void { + dis.dispatch({ + action: Action.ViewRoom, +diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx +index 332e6a7b0a..032000be46 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -219,6 +219,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { + supportedLevels: LEVELS_ACCOUNT_SETTINGS, + default: true, + }, ++ "Spaces.returnToPreviouslyOpenedRoom": { ++ displayName: _td("Return to the room previously opened in a space"), ++ description: _td("If disabled, the space overview will be shown when switching to another space."), ++ supportedLevels: LEVELS_ACCOUNT_SETTINGS, ++ default: false, ++ }, + // SC settings end + "feature_video_rooms": { + isFeature: true, +diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts +index bda81e9d5f..6f16e7261f 100644 +--- a/src/stores/spaces/SpaceStore.ts ++++ b/src/stores/spaces/SpaceStore.ts +@@ -273,6 +273,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { + // 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 ( ++ SettingsStore.getValue("Spaces.returnToPreviouslyOpenedRoom") && + roomId && + cliSpace?.getMyMembership() !== KnownMembership.Invite && + this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && +-- +2.45.1 + From 2c65d8e5676cb587cb9ed56d690aec1d6cd36fa8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 1 Jun 2024 10:35:59 +0200 Subject: [PATCH 22/61] Update README.md for the curious --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/README.md b/README.md index 5743c03..78b0399 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,42 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/ This branch builds the "lite" variant, which rebases a reduced feature set of the original fork on top of the latest Element, in order to keep maintenance effort more manageable while staying up-to-date. +For bringup I'm currently trying out a new approach which relies less on merges but rather on cherry-picking our changes back. +So while the old build instructions mostly still apply, you need to do some new steps: + +After cloning, add usptream remotes: + +``` +source merge_helpers.sh +forall_repos add_upstream +``` + +Then, to checkout the latest upstream release and pick our changes on top of it (I know the script name isn't accurate right now) + +``` +./merge_upstream.sh +``` + +Note that `./merge_upstream.sh` may pick up a wrong tag right now, e.g. a release candidate instead of the latest build, which may cause problems if you plan to develop on top of it. +If you want to build against a specific Element version rather than the latest (e.g. v1.11.66): + +``` +./merge_upstream.sh v1.11.66 +``` + +If there are conflicts picking some changes running this script, solve them manually. +If you want to persist a new set of patches in `schildichat-desktop`, run + +``` +./generate_patches.sh +``` + +Note this script may be broken right now when not run against actual element releases (it was causing issues for a release candidate for sure). + + + +## Old build instructions, to be revised in the future + ## Building SchildiChat Web/Desktop From 977e95526558761438fb32d772985978ef7b3117 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 21 Jun 2024 20:08:21 +0200 Subject: [PATCH 23/61] 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 + From b04c8cc063085e90e250ecbf5c4cc26a47622a8e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 7 Aug 2024 08:06:21 +0200 Subject: [PATCH 24/61] Move apply_patches to its own script --- apply_patches.sh | 26 ++++++++++++++++++++++++++ merge_upstream.sh | 15 +-------------- 2 files changed, 27 insertions(+), 14 deletions(-) create mode 100755 apply_patches.sh diff --git a/apply_patches.sh b/apply_patches.sh new file mode 100755 index 0000000..7b14e85 --- /dev/null +++ b/apply_patches.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Apply our patches +apply_patches matrix-js-sdk +apply_patches matrix-react-sdk +#apply_patches element-web +apply_patches element-desktop + +# Automatic adjustments +#automatic_i18n_adjustment +automatic_packagejson_adjustment + +# Automatic theme update +#pushd "matrix-react-sdk" > /dev/null +#./theme.sh y +#popd > /dev/null + +popd > /dev/null diff --git a/merge_upstream.sh b/merge_upstream.sh index 805fe8c..e1fd1f2 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -50,19 +50,6 @@ popd > /dev/null make clean make setup -# Apply our patches -apply_patches matrix-js-sdk -apply_patches matrix-react-sdk -#apply_patches element-web -apply_patches element-desktop - -# Automatic adjustments -#automatic_i18n_adjustment -automatic_packagejson_adjustment - -# Automatic theme update -#pushd "matrix-react-sdk" > /dev/null -#./theme.sh y -#popd > /dev/null +./apply_patches.sh popd > /dev/null From a23614d3de2f80d55414f6c3724f6a8d95b19ec8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 7 Aug 2024 08:21:27 +0200 Subject: [PATCH 25/61] Update patches to 1.11.73 --- element-desktop | 2 +- element-web | 2 +- generate_patches.sh | 6 ++- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...hildi-fetch-package.ts-modifications.patch | 8 ++-- ...Add-fields-for-media-caption-support.patch | 4 +- .../0001-Disable-sticky-rooms.patch | 6 +-- .../0002-Bring-back-unified-room-list.patch | 38 +++++++++---------- ...-rooms-to-bottom-I-still-want-to-see.patch | 4 +- ...rendering-captions-in-media-messages.patch | 4 +- .../0005-Don-t-preview-reactions.patch | 4 +- ...tification-state-the-same-way-as-the.patch | 6 +-- ...llow-muted-rooms-to-render-as-unread.patch | 4 +- .../0008-Increase-default-visible-tiles.patch | 4 +- ...paceDMBadges-setting-force-enabled-f.patch | 8 ++-- ...m-reactions-from-tadzik-freeform-rea.patch | 4 +- ...1-Allow-reactions-to-take-more-space.patch | 4 +- ...don-t-automatically-show-last-opened.patch | 14 +++---- ...0013-Exclude-spaces-from-breadcrumbs.patch | 4 +- 20 files changed, 67 insertions(+), 63 deletions(-) diff --git a/element-desktop b/element-desktop index 3059810..52715a8 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 3059810f1a9dc21b7545f38fab082def8f5ae893 +Subproject commit 52715a8a8988d039ddb95266ff32acf38c98325f diff --git a/element-web b/element-web index 5e02a42..a0c654a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 5e02a42ca0863a6d991f989a5b29d07b401766d4 +Subproject commit a0c654a2e4676bf48a7b87d0788fd20267f91f44 diff --git a/generate_patches.sh b/generate_patches.sh index b456c34..c881c00 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -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 {} \; diff --git a/matrix-js-sdk b/matrix-js-sdk index a86d4ce..0300d63 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a86d4ceb49137f13240674ddb358bb96934ba720 +Subproject commit 0300d6343fb26f12ff6a34452d3f7c176aa6c190 diff --git a/matrix-react-sdk b/matrix-react-sdk index d84bcbc..25e67be 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d84bcbc2155a138bcfafc3efa60c4abf7b4a4d14 +Subproject commit 25e67beab6d2525fdc1adf4467b6f0da01415470 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 c37b54c..5572e20 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 cf79f47a294f3a2c4bc67b7e4c2e2b08a130fb90 Mon Sep 17 00:00:00 2001 +From 8393d51337eb16eefad2e9ebed84df4eb629d1dd 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 @@ -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 { @@ -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 { +@@ -145,12 +148,15 @@ async function main(): Promise { } 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 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 e2aff66..9601195 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 e327184f3df484baaaabc71be51438f4ce5d6d46 Mon Sep 17 00:00:00 2001 +From 24823898379da994c52e71b9e32a0f9a46a60236 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.2 +2.46.0 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 12c31b9..c3e0cb5 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 0fa8c92135b9b8ed35cde45cb5b264ba3f9ebef2 Mon Sep 17 00:00:00 2001 +From b6b0e7c794f277fc146378591cba74d242062adb Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 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 86a2cca..b08a545 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 1bcb3ab10c505a3eb781eb12c3c72ecd4f45717f Mon Sep 17 00:00:00 2001 +From cfe6cfc8a71b192e78b107282c4ef2e761d67e73 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,10 +16,10 @@ 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 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 = ({ tabIndex }) => { +@@ -374,6 +377,17 @@ const UntaggedAuxButton: React.FC = ({ 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 { private dispatcherRef?: string; @@ -80,7 +80,7 @@ index c277bd5aca..869fe04381 100644 private treeRef = createRef(); public static contextType = MatrixClientContext; -@@ -437,7 +458,14 @@ export default class RoomList extends React.PureComponent { +@@ -440,7 +461,14 @@ export default class RoomList extends React.PureComponent { 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 { +@@ -455,9 +483,16 @@ export default class RoomList extends React.PureComponent { 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 { +@@ -598,7 +633,9 @@ export default class RoomList extends React.PureComponent { 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, "isFeature"> { +@@ -197,6 +197,14 @@ export interface IFeature extends Omit, "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 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 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 2b7c071..3b28a9e 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 67decec7f9c70e997af45dbfea733bfe256e8749 Mon Sep 17 00:00:00 2001 +From 75b63406b604c6160c51b41218c1fa907a8d23f9 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.2 +2.46.0 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 fc24cc1..8f9f6ed 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 73191e9412ad54071cec2eb706e5fc4117d8cce8 Mon Sep 17 00:00:00 2001 +From d80cf5809c115c8668123a00410f175c6d9e7af0 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 @@ -105,5 +105,5 @@ index 75511756f5..a8e3b9cceb 100644 // file extension. text = content.body; -- -2.45.2 +2.46.0 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 67a2030..9b6ec3c 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 dd20cb95b6ef349a62a029c78edaae71d16494e9 Mon Sep 17 00:00:00 2001 +From 35de14dd4f019ac9107d4701afd9bf62700a2b8c 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.2 +2.46.0 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 bc6f52d..3e62fa9 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 e113e7927eee79c47e3ffcaef2ab2d1c513cd543 Mon Sep 17 00:00:00 2001 +From 135235d4a815897c53aea20e707c02fc54e2b3a1 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,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 { @@ -26,5 +26,5 @@ index aae949858e..8a104c4474 100644 return ( -- -2.45.2 +2.46.0 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 3b226d5..a028ee4 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 7578b7edcf8d805e793b914702441bc6de8855ee Mon Sep 17 00:00:00 2001 +From 9feb3f479d2ebe44743b1fc38685aff7543e44a1 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.2 +2.46.0 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 7a1cb6e..916ceeb 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 28a1be2dc48f2621941e1230d37a062faaf48943 Mon Sep 17 00:00:00 2001 +From 9ac584b6e7f284309d5745ddd1ab2a3b75e599ea 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.2 +2.46.0 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 feb8374..78a7c7b 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 950161ad3c1a68646eaf99aebf7e80c805c81422 Mon Sep 17 00:00:00 2001 +From 369a2e9890410af89bd6b1616df688dacb2d6837 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 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 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 3bd0686..be03f39 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 beb0603424b1a87ccf42763f2b76a8bb4ec77300 Mon Sep 17 00:00:00 2001 +From 84035e01f7cae9b04f85a3de1b2d1d3de1721c7f 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.2 +2.46.0 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 40ea1a0..c39b151 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 1ab186fe9fd30d9fe830683de797956c66270580 Mon Sep 17 00:00:00 2001 +From d7276004230e0c9ac9669943c32b6bb8bd78e662 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.2 +2.46.0 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 f6e2ddf..51d3ef4 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 1f0266523abb3b0a3718ad2ea5b7794f5bf5c47d Mon Sep 17 00:00:00 2001 +From 278fd8faea2f3ac867355f0963dac02ab3562561 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 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 { +@@ -1437,7 +1437,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 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 { +@@ -1449,6 +1457,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 4049248111..5fb39984d8 100644 dis.dispatch({ 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 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 09d6730..1151f3a 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 0a33940ca9552df513a45d8cc3738b1cbfbee61b Mon Sep 17 00:00:00 2001 +From 15f1a5fa1432ad89a2fd9fe8e9f0976f53df46e9 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 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 From a49c66538c02a0fcaaf87e1c774bfdd11b76c07b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 18 Aug 2024 11:45:47 +0200 Subject: [PATCH 26/61] Make merge_helpers.sh smarter if you have the commit around --- merge_helpers.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 4e6703c..a1e03f3 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -264,7 +264,29 @@ apply_patches() { pushd "$repo" for patch in "$patch_dir"/*; do echo "Applying $patch to $repo..." - git am "$patch" || read -p "Applying $patch failed, please commit manually, then press enter: " + git am "$patch" || on_apply_patch_fail_try_original_commit "$patch" "$repo" done popd } + +on_apply_patch_fail_try_original_commit() { + local patch="$1" + local repo="$2" + local orig_commit="$(head -n 1 "$patch"|sed 's|From ||;s| .*||')" + echo "Applying $patch failed, trying with original commit $orig_commit..." + git am --abort + git cherry-pick "$orig_commit" || on_apply_patch_fail "$patch" "$repo" "$orig_commit" +} + +on_apply_patch_fail() { + local patch="$1" + local repo="$2" + local orig_commit="$3" + echo "----------------------------------" + echo "Applying patch failed, please commit manually!" + echo "Patch: $patch" + echo "Repo: $repo" + echo "Original commit: $(head -n 1 "$patch"|sed 's|From ||;s| .*||')" + echo "----------------------------------" + read -p "Press enter after committing resolved conflicts: " +} From 94c72f7f45db78fdfcf5b6e3179b79775c1e2348 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 18 Aug 2024 11:50:42 +0200 Subject: [PATCH 27/61] generate_patches.sh: Remove accidentally commited hardcoded value --- generate_patches.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/generate_patches.sh b/generate_patches.sh index c881c00..b456c34 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -25,11 +25,7 @@ persist_patches() { mkdir "$patch_dir" fi echo "Creating new patches" - 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 + git format-patch -k upstream/master.. -o "$patch_dir" 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 {} \; From 642da408107b4152909ba17003d09074ab239da3 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 18 Aug 2024 11:51:12 +0200 Subject: [PATCH 28/61] Update patches to v1.11.74 --- ...hildi-fetch-package.ts-modifications.patch | 2 +- ...Add-fields-for-media-caption-support.patch | 2 +- .../0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 4 +-- ...-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...rendering-captions-in-media-messages.patch | 29 ++++++++----------- .../0005-Don-t-preview-reactions.patch | 2 +- ...tification-state-the-same-way-as-the.patch | 2 +- ...llow-muted-rooms-to-render-as-unread.patch | 2 +- .../0008-Increase-default-visible-tiles.patch | 2 +- ...paceDMBadges-setting-force-enabled-f.patch | 2 +- ...m-reactions-from-tadzik-freeform-rea.patch | 4 +-- ...1-Allow-reactions-to-take-more-space.patch | 2 +- ...don-t-automatically-show-last-opened.patch | 4 +-- ...0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- 15 files changed, 29 insertions(+), 34 deletions(-) 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 5572e20..36e3ab7 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 8393d51337eb16eefad2e9ebed84df4eb629d1dd Mon Sep 17 00:00:00 2001 +From 9afc676a319a686dfb58490c5fa4e28124d72149 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 9601195..aef97d2 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 24823898379da994c52e71b9e32a0f9a46a60236 Mon Sep 17 00:00:00 2001 +From 0fe8387af0500390a3f17df263d95a22a2d8c9e0 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 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index c3e0cb5..7f0ac96 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 b6b0e7c794f277fc146378591cba74d242062adb Mon Sep 17 00:00:00 2001 +From 3e53e887c82ee5664ab447a3cd69df59fceaefde 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 b08a545..a767a2a 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 cfe6cfc8a71b192e78b107282c4ef2e761d67e73 Mon Sep 17 00:00:00 2001 +From 8ce90622ede79277b901e147b3943cc5fee6a5cc 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 d088fbc927..ce54059ce9 100644 +index 7d47748de8..cec95bcf6d 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx @@ -80,11 +80,13 @@ interface IState { 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 3b28a9e..d56f17b 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 75b63406b604c6160c51b41218c1fa907a8d23f9 Mon Sep 17 00:00:00 2001 +From 1b346c3db9355aa2da0beb543a430e469fd17ec5 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 8f9f6ed..ede7221 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 d80cf5809c115c8668123a00410f175c6d9e7af0 Mon Sep 17 00:00:00 2001 +From b5b2d8d9bca50d4ad43cd01a2c8f0ea8c3de9bcc 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 @@ -22,7 +22,7 @@ index fcc204dae3..95cb2eb37d 100644 + OrigBodyType?: React.ComponentType>; } diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx -index db0016de7b..dd7a864300 100644 +index fb700579be..76f60bad76 100644 --- a/src/components/views/messages/MessageEvent.tsx +++ b/src/components/views/messages/MessageEvent.tsx @@ -183,6 +183,15 @@ export default class MessageEvent extends React.Component implements IMe @@ -56,25 +56,20 @@ index db0016de7b..dd7a864300 100644 + +) diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx -index 7246f7db57..4b5bf997ba 100644 +index 5dba3e42b7..f665e6dc67 100644 --- a/src/components/views/messages/TextualBody.tsx +++ b/src/components/views/messages/TextualBody.tsx -@@ -568,11 +568,14 @@ export default class TextualBody extends React.Component { - const content = mxEvent.getContent(); - let isNotice = false; - let isEmote = false; -+ let isCaption = false; +@@ -565,6 +565,9 @@ export default class TextualBody extends React.Component { + const isNotice = content.msgtype === MsgType.Notice; + const isEmote = content.msgtype === MsgType.Emote; - // only strip reply if this is the original replying event, edits thereafter do not have the fallback - const stripReply = !mxEvent.replacingEvent() && !!getParentEventId(mxEvent); - isEmote = content.msgtype === MsgType.Emote; - isNotice = content.msgtype === MsgType.Notice; + // @ts-ignore -+ isCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(content.msgtype); - let body = HtmlUtils.bodyToHtml(content, this.props.highlights, { - disableBigEmoji: isEmote || !SettingsStore.getValue("TextualBody.enableBigEmoji"), - // Part of Replies fallback support -@@ -644,6 +647,14 @@ export default class TextualBody extends React.Component { ++ const isCaption = [MsgType.Image, MsgType.File, MsgType.Audio, MsgType.Video].includes(content.msgtype); ++ + const willHaveWrapper = + this.props.replacingEventId || this.props.isSeeingThroughMessageHiddenForModeration || isEmote; + +@@ -643,6 +646,14 @@ export default class TextualBody extends React.Component { ); } 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 9b6ec3c..9f08b8a 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 35de14dd4f019ac9107d4701afd9bf62700a2b8c Mon Sep 17 00:00:00 2001 +From c53dd25c7ddd402ccb774a99fb0436c5c3694e98 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 3e62fa9..5f06f07 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 135235d4a815897c53aea20e707c02fc54e2b3a1 Mon Sep 17 00:00:00 2001 +From d4c665355efa4c385cac9777476882d1fccdfad1 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 a028ee4..4cbf369 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 9feb3f479d2ebe44743b1fc38685aff7543e44a1 Mon Sep 17 00:00:00 2001 +From 48250ea097e6034d25c6b55666e33496062ad197 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 916ceeb..b885fe4 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 9ac584b6e7f284309d5745ddd1ab2a3b75e599ea Mon Sep 17 00:00:00 2001 +From 9c91bdbdf95bb8969bf31d9b38b15ad4cfe5b736 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 78a7c7b..12c32e0 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 369a2e9890410af89bd6b1616df688dacb2d6837 Mon Sep 17 00:00:00 2001 +From 8f46bb8a3a76a3fc43be9ad1646a535507c8675a 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 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 be03f39..d25b087 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 84035e01f7cae9b04f85a3de1b2d1d3de1721c7f Mon Sep 17 00:00:00 2001 +From 486cc7ef0c6cc0e6e1e5df593a4bb2cecd2bb9f0 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 @@ -118,7 +118,7 @@ index 16258bb3d7..847170dc92 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 075a6e6cee..42cde47e56 100644 +index 8265331a3c..c29fc698aa 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx @@ -131,6 +131,7 @@ class ReactionPicker extends React.Component { 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 c39b151..652bc50 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 d7276004230e0c9ac9669943c32b6bb8bd78e662 Mon Sep 17 00:00:00 2001 +From d72f4c25cc5fb819298adeb0874ad1e825ba2731 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 51d3ef4..e115542 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 278fd8faea2f3ac867355f0963dac02ab3562561 Mon Sep 17 00:00:00 2001 +From 4dc009cab3b625ec5509cf774ea98dc44ba04c77 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,7 +10,7 @@ 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 f9d6db3f53..6ea77af07e 100644 +index 8335b0e3f6..fdaec88357 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -1437,7 +1437,15 @@ export default class MatrixChat extends React.PureComponent { 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 1151f3a..4e67635 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 15f1a5fa1432ad89a2fd9fe8e9f0976f53df46e9 Mon Sep 17 00:00:00 2001 +From f60cd86c579382085e9ad5d2a29f107b155d335a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs From f3b47d4f38baf4ded2eab9158037c2878d5e2d3a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:33:08 +0200 Subject: [PATCH 29/61] Stop the search bar wobble to restore my sanity --- .../0014-Stop-the-search-bar-wobble.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch 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 new file mode 100644 index 0000000..5984651 --- /dev/null +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -0,0 +1,24 @@ +From 98916e3cfbca37369c5a11eb4a6cd3fb0dcd8dda Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Mon, 19 Aug 2024 20:27:33 +0200 +Subject: Stop the search bar wobble + +--- + res/css/_common.pcss | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/res/css/_common.pcss b/res/css/_common.pcss +index de698e2324..18e28dbb2d 100644 +--- a/res/css/_common.pcss ++++ b/res/css/_common.pcss +@@ -189,6 +189,7 @@ input[type="search"].mx_textinput_icon { + padding-left: 36px; + background-repeat: no-repeat; + background-position: 10px center; ++ min-height: 33px; + } + + /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ +-- +2.46.0 + From 4696cee8c4505c9ed08b2663680abc195f5cbc7b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 30 Aug 2024 19:27:46 +0200 Subject: [PATCH 30/61] Add back icon generation --- apply_patches.sh | 1 + graphics/feature_image.svg | 815 +++++++++ graphics/feature_image_transparent.svg | 784 +++++++++ graphics/ic_launcher_sc.svg | 2243 ++++++++++++++++++++++++ graphics/icon_gen.sh | 79 + graphics/store_icon.svg | 1 + 6 files changed, 3923 insertions(+) create mode 100644 graphics/feature_image.svg create mode 100644 graphics/feature_image_transparent.svg create mode 100644 graphics/ic_launcher_sc.svg create mode 100755 graphics/icon_gen.sh create mode 120000 graphics/store_icon.svg diff --git a/apply_patches.sh b/apply_patches.sh index 7b14e85..5ec802f 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -22,5 +22,6 @@ automatic_packagejson_adjustment #pushd "matrix-react-sdk" > /dev/null #./theme.sh y #popd > /dev/null +./graphics/icon_gen.sh popd > /dev/null diff --git a/graphics/feature_image.svg b/graphics/feature_image.svg new file mode 100644 index 0000000..acb9ffc --- /dev/null +++ b/graphics/feature_image.svg @@ -0,0 +1,815 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/feature_image_transparent.svg b/graphics/feature_image_transparent.svg new file mode 100644 index 0000000..c241206 --- /dev/null +++ b/graphics/feature_image_transparent.svg @@ -0,0 +1,784 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/ic_launcher_sc.svg b/graphics/ic_launcher_sc.svg new file mode 100644 index 0000000..6dee8d6 --- /dev/null +++ b/graphics/ic_launcher_sc.svg @@ -0,0 +1,2243 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh new file mode 100755 index 0000000..6bd1236 --- /dev/null +++ b/graphics/icon_gen.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +mydir="$(dirname "$(realpath "$0")")" + + +export_rect() { + w="$1" + h="$2" + in="$3" + out="$4" + inkscape -w "$w" -h "$h" --export-filename="$out" -C "$in" +} +export_square() { + size="$1" + in="$2" + out="$3" + export_rect "$1" "$size" "$in" "$out" +} + +repo_dir="$mydir/../element-web" +base_out="$repo_dir/res/vector-icons" + +for i in 1024 120 150 152 180 24 300 44 48 50 76 88; do + export_square "$i" "$mydir/ic_launcher_sc.svg" "$base_out/$i.png" +done + +for i in 114 120 144 152 180 57 60 72 76; do + export_square "$i" "$mydir/store_icon.svg" "$base_out/apple-touch-icon-$i.png" +done + +for i in 150 310 70; do + export_square "$i" "$mydir/store_icon.svg" "$base_out/mstile-$i.png" +done + +# TODO fix measures of input to have correct measures for export here again +export_rect 1024 500 "$mydir/feature_image_transparent.svg" "$base_out/1240x600.png" +export_rect 512 250 "$mydir/feature_image_transparent.svg" "$base_out/620x300.png" +export_rect 256 125 "$mydir/feature_image.svg" "$base_out/mstile-310x150.png" + +magick "$base_out/48.png" "$base_out/favicon.ico" +rm "$base_out/48.png" # this was only created for favicon.ico + +for f in "$base_out"/*.png; do + pngcrush -ow "$f" +done + + +repo_dir="$mydir/../element-desktop" +base_out="$repo_dir/res/img" + +export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/element.png" + +magick "$base_out/element.png" "$base_out/element.ico" + +for f in "$base_out"/*.png; do + pngcrush -ow "$f" +done + + + + +base_out="$repo_dir/build" + +for i in 16 24 48 64 96 128 256 512 1024; do + export_square "$i" "$mydir/ic_launcher_sc.svg" "$base_out/icons/$i"x"$i.png" +done + +export_square "320" "$mydir/ic_launcher_sc.svg" "$base_out/install-spinner.png" +pngcrush "$base_out/install-spinner.png" +magick "$base_out/install-spinner.png" "$base_out/install-spinner.gif" +rm "$base_out/install-spinner.png" + +magick "$base_out/icons/256x256.png" "$base_out/icon.ico" +magick "$base_out/icons/1024x1024.png" "$base_out/icon.icns" +rm "$base_out/icons/1024x1024.png" + +for f in "$base_out/icons"/*.png; do + pngcrush -ow "$f" +done diff --git a/graphics/store_icon.svg b/graphics/store_icon.svg new file mode 120000 index 0000000..30278a9 --- /dev/null +++ b/graphics/store_icon.svg @@ -0,0 +1 @@ +ic_launcher_sc.svg \ No newline at end of file From 983cba224fade036f7b5e8222532cdfb97a9c3e0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 1 Sep 2024 20:43:27 +0200 Subject: [PATCH 31/61] [WIP] Add back theming --- apply_patches.sh | 6 ++---- theme.sh | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/apply_patches.sh b/apply_patches.sh index 5ec802f..53b35b6 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -18,10 +18,8 @@ apply_patches element-desktop #automatic_i18n_adjustment automatic_packagejson_adjustment -# Automatic theme update -#pushd "matrix-react-sdk" > /dev/null -#./theme.sh y -#popd > /dev/null +# Automatic theme and icon update +./theme.sh y ./graphics/icon_gen.sh popd > /dev/null diff --git a/theme.sh b/theme.sh index 4b825bf..ee55a49 100755 --- a/theme.sh +++ b/theme.sh @@ -1,5 +1,6 @@ #!/bin/bash +set -e shopt -s globstar mydir="$(dirname "$(realpath "$0")")" @@ -26,6 +27,7 @@ M_LINK="#368bd6" replace_colors() { local f="$1" if [[ "$f" =~ "dark" ]]; then + echo "Replacing colors (dark) for $f..." BG_ACCENT="$M_ACCENT_DARK" CODEBLOCK_BORDER_COLOR="#121212" CODEBLOCK_BACKGROUND_COLOR="#121212" @@ -36,6 +38,7 @@ replace_colors() { MESSAGE_BUBBLE_BACKGROUND_SELF="#303030" MESSAGE_BUBBLE_BACKGROUND_SELECTED="#3f4931" else + echo "Replacing colors (light) for $f..." BG_ACCENT="$M_ACCENT_LIGHT" CODEBLOCK_BORDER_COLOR="#00000010" CODEBLOCK_BACKGROUND_COLOR="#00000010" @@ -151,15 +154,19 @@ replace_colors() { sed -i "s|\\(\$e2e-warning-color: \\).*;|\\1$M_ALERT;|gi" "$f" # Message bubbles - sed -i "s|\\(\$eventbubble-self-bg: \\).*;|\$message-bubble-background-self: $MESSAGE_BUBBLE_BACKGROUND_SELF;|gi" "$f" - sed -i "s|\\(\$eventbubble-others-bg: \\).*;|\$message-bubble-background: $MESSAGE_BUBBLE_BACKGROUND;|gi" "$f" - sed -i "s|\\(\$eventbubble-bg-hover: \\).*;|\$message-bubble-background-selected: $MESSAGE_BUBBLE_BACKGROUND_SELECTED;|gi" "$f" - sed -i "s|\\(\$eventbubble-reply-color: \\).*;$||gi" "$f" + sed -i "s|\\(\$eventbubble-self-bg: \\).*;|\$eventbubble-self-bg: $MESSAGE_BUBBLE_BACKGROUND_SELF;|gi" "$f" + sed -i "s|\\(\$eventbubble-others-bg: \\).*;|\$eventbubble-others-bg: $MESSAGE_BUBBLE_BACKGROUND;|gi" "$f" + sed -i "s|\\(\$eventbubble-bg-hover: \\).*;|\$eventbubble-bg-hover: $MESSAGE_BUBBLE_BACKGROUND_SELECTED;|gi" "$f" + #sed -i "s|\\(\$eventbubble-reply-color: \\).*;$||gi" "$f" } -replace_colors res/themes/dark/css/_dark.pcss +replace_colors res/themes/light/css/light.pcss replace_colors res/themes/light/css/_light.pcss +replace_colors res/themes/legacy-light/css/legacy-light.pcss replace_colors res/themes/legacy-light/css/_legacy-light.pcss +replace_colors res/themes/dark/css/dark.pcss +replace_colors res/themes/dark/css/_dark.pcss +replace_colors res/themes/legacy-dark/css/legacy-dark.pcss replace_colors res/themes/legacy-dark/css/_legacy-dark.pcss for f in res/**/*.svg; do replace_colors "$f" From 2ff1578a577c4a069c26bbacc687ab802db38a18 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 10 Sep 2024 17:58:07 +0200 Subject: [PATCH 32/61] Automatic theme update --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 52715a8..57f3328 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 52715a8a8988d039ddb95266ff32acf38c98325f +Subproject commit 57f3328e37d3f6b1a1f76df82017358236170b70 diff --git a/element-web b/element-web index a0c654a..b85184e 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a0c654a2e4676bf48a7b87d0788fd20267f91f44 +Subproject commit b85184e7579e6d3503bd44f6d283d463eef0558e diff --git a/matrix-js-sdk b/matrix-js-sdk index 0300d63..3e11b1c 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0300d6343fb26f12ff6a34452d3f7c176aa6c190 +Subproject commit 3e11b1c51c4b0f0e673c4b22864f97be7098b888 diff --git a/matrix-react-sdk b/matrix-react-sdk index 25e67be..c6a550e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 25e67beab6d2525fdc1adf4467b6f0da01415470 +Subproject commit c6a550e2c3f9020730c8bd603514e9ce7cf69064 From b214e8d568948a007b588a30143ff754bee38d05 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 10 Sep 2024 17:59:46 +0200 Subject: [PATCH 33/61] Bump patches to 1.11.77 --- ...d-back-schildi-fetch-package.ts-modifications.patch | 2 +- .../0001-Add-fields-for-media-caption-support.patch | 4 ++-- .../matrix-react-sdk/0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 4 ++-- ...ort-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...port-for-rendering-captions-in-media-messages.patch | 2 +- .../0005-Don-t-preview-reactions.patch | 2 +- ...e-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 +- ...ack-showSpaceDMBadges-setting-force-enabled-f.patch | 4 ++-- ...d-Freeform-reactions-from-tadzik-freeform-rea.patch | 2 +- .../0011-Allow-reactions-to-take-more-space.patch | 2 +- ...e-switch-don-t-automatically-show-last-opened.patch | 10 +++++----- .../0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- .../0014-Stop-the-search-bar-wobble.patch | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) 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 36e3ab7..2ceda12 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 9afc676a319a686dfb58490c5fa4e28124d72149 Mon Sep 17 00:00:00 2001 +From 00009e6d27ccc63b0e1e32888a79a3dda12537db 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 aef97d2..8ec1e73 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 0fe8387af0500390a3f17df263d95a22a2d8c9e0 Mon Sep 17 00:00:00 2001 +From 3e11b1c51c4b0f0e673c4b22864f97be7098b888 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,7 +8,7 @@ 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 20e5ca6c6..920d77667 100644 +index ef23668b0..9b4ff3b97 100644 --- a/src/@types/media.ts +++ b/src/@types/media.ts @@ -180,6 +180,9 @@ export interface FileContent extends BaseContent { diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 7f0ac96..bf35661 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 3e53e887c82ee5664ab447a3cd69df59fceaefde Mon Sep 17 00:00:00 2001 +From 6e30626e23f9bd3eed4bb62ce91d86678b6e2023 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 a767a2a..2642465 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 8ce90622ede79277b901e147b3943cc5fee6a5cc Mon Sep 17 00:00:00 2001 +From 60b5acaf9615e189667a594bb1477ea6c0feb457 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,7 +124,7 @@ index 7d47748de8..cec95bcf6d 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 476818a138..35cefb3f28 100644 +index 7cd58c9355..9709fcd83b 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -197,6 +197,14 @@ export interface IFeature extends Omit, "isFeature"> { 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 d56f17b..dc063fc 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 1b346c3db9355aa2da0beb543a430e469fd17ec5 Mon Sep 17 00:00:00 2001 +From b0c7839b0ea5d707120df607eeba7c535b16da3a 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 ede7221..89973e9 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 b5b2d8d9bca50d4ad43cd01a2c8f0ea8c3de9bcc Mon Sep 17 00:00:00 2001 +From bc56cc58fbb23b3e19740e202fe2231240fbc0c9 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 9f08b8a..2e7366c 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 c53dd25c7ddd402ccb774a99fb0436c5c3694e98 Mon Sep 17 00:00:00 2001 +From 9a88dd5e3f1a03a4eecfe11515a502ef89d7d6b3 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 5f06f07..7e99a27 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 d4c665355efa4c385cac9777476882d1fccdfad1 Mon Sep 17 00:00:00 2001 +From b8da294b5d544da9760299037dd2830989298510 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 4cbf369..10bee6c 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 48250ea097e6034d25c6b55666e33496062ad197 Mon Sep 17 00:00:00 2001 +From e8d9cca6e0838659a02373bf922f5aceb16ee015 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 b885fe4..f1fdb94 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 9c91bdbdf95bb8969bf31d9b38b15ad4cfe5b736 Mon Sep 17 00:00:00 2001 +From de95a495964ac0b8a91c3a30268fa362e3cc5373 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 12c32e0..b0902f2 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 8f46bb8a3a76a3fc43be9ad1646a535507c8675a Mon Sep 17 00:00:00 2001 +From 54ff718e21a20c653721ffd6ec30c6d91cb67900 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 35cefb3f28..e5624b33b3 100644 +index 9709fcd83b..7b402ef8cf 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -204,6 +204,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { 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 d25b087..9430d17 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 486cc7ef0c6cc0e6e1e5df593a4bb2cecd2bb9f0 Mon Sep 17 00:00:00 2001 +From bbc655c919fe9283a38e6e3c86bedb8c348776a7 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 652bc50..e1ee37c 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 d72f4c25cc5fb819298adeb0874ad1e825ba2731 Mon Sep 17 00:00:00 2001 +From 998bd83ecf2c8a3f58445cc5bf62b305546627dd 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 e115542..8ac51e2 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 4dc009cab3b625ec5509cf774ea98dc44ba04c77 Mon Sep 17 00:00:00 2001 +From c9fd9e3448066ede633e8e2d388c9e6a040f3956 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 8335b0e3f6..fdaec88357 100644 +index 53514ab817..73068d3090 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1437,7 +1437,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1438,7 +1438,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 8335b0e3f6..fdaec88357 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1449,6 +1457,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1450,6 +1458,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,7 +46,7 @@ index 8335b0e3f6..fdaec88357 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index e5624b33b3..73bb2938f7 100644 +index 7b402ef8cf..cfaeb9ac29 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -209,6 +209,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { 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 4e67635..fa1fbc2 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 f60cd86c579382085e9ad5d2a29f107b155d335a Mon Sep 17 00:00:00 2001 +From 5e5285a00c60802d7ef74fe6881601a3c4f20746 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 5984651..f62a0d7 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 98916e3cfbca37369c5a11eb4a6cd3fb0dcd8dda Mon Sep 17 00:00:00 2001 +From c6a550e2c3f9020730c8bd603514e9ce7cf69064 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 de698e2324..18e28dbb2d 100644 +index 605ad41b81..d1f55282f6 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -189,6 +189,7 @@ input[type="search"].mx_textinput_icon { From 055866f59991253647a878ac44bd17deda1fb114 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 12:14:13 +0200 Subject: [PATCH 34/61] Update upstream remote for add_upstream --- merge_helpers.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index a1e03f3..2e36b6f 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -12,16 +12,16 @@ yarn=yarnpkg add_upstream() { if git remote | grep -q upstream; then - echo "Remote named upstream already exists!" - return 1 + echo "Remote named upstream already exists, deleting..." + git remote remove upstream fi local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')" - if echo "$sc_remote" | grep -q matrix; then + if echo "$sc_remote" | grep -q matrix-js-sdk; then # matrix.org repo local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')" - elif echo "$sc_remote" | grep -q element; then + elif echo "$sc_remote" | grep -q "element\\|matrix-react-sdk"; then # vector-im repo - local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|vector-im|')" + local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|element-hq|')" else echo "Don't know upstream repo for $sc_remote" return 1 From c7181068c60f1e7990acd63e1d35c9b078c75232 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 12:19:47 +0200 Subject: [PATCH 35/61] [TMP] Disable automatic commit for now Need to revise how we do branches --- theme.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/theme.sh b/theme.sh index ee55a49..ef664fd 100755 --- a/theme.sh +++ b/theme.sh @@ -174,8 +174,8 @@ done popd > /dev/null -if [[ "$automatic_commit" == [Yy]* ]]; then - # see: https://devops.stackexchange.com/a/5443 - git add -A - git diff-index --quiet HEAD || git commit -m "Automatic theme update" -fi +#if [[ "$automatic_commit" == [Yy]* ]]; then +# # see: https://devops.stackexchange.com/a/5443 +# git add -A +# git diff-index --quiet HEAD || git commit -m "Automatic theme update" +#fi From ebc349851081e73ff21162463cb9a1cd882edaf9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 12:21:36 +0200 Subject: [PATCH 36/61] Checkout release-specific branch names in our repos --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- merge_upstream.sh | 9 ++++++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/element-desktop b/element-desktop index 57f3328..093d2e2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 57f3328e37d3f6b1a1f76df82017358236170b70 +Subproject commit 093d2e28d82e693b8f7575b1b16206723b9269e5 diff --git a/element-web b/element-web index b85184e..9fa6db0 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit b85184e7579e6d3503bd44f6d283d463eef0558e +Subproject commit 9fa6db056ac4cd2240a9b676cf305a1ca73bc15c diff --git a/matrix-js-sdk b/matrix-js-sdk index 3e11b1c..b6a86ca 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 3e11b1c51c4b0f0e673c4b22864f97be7098b888 +Subproject commit b6a86ca2e65407999a71d92cbbfec7a856d7a586 diff --git a/matrix-react-sdk b/matrix-react-sdk index c6a550e..abfce03 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c6a550e2c3f9020730c8bd603514e9ce7cf69064 +Subproject commit abfce03f8cd209ce9289cdcd6a0f4c91e0da6072 diff --git a/merge_upstream.sh b/merge_upstream.sh index e1fd1f2..2e7d31e 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -34,16 +34,19 @@ if [ -z "$1" ]; then else latest_upstream_tag="$1" fi -forelement_repos git checkout "$latest_upstream_tag" + +sc_branch_name="sc_$latest_upstream_tag" + +forelement_repos git checkout "$latest_upstream_tag" -B "$sc_branch_name" get_current_mxsdk_tags pushd "matrix-js-sdk" > /dev/null -git checkout "$current_mxjssdk_tag" +git checkout "$current_mxjssdk_tag" -B "$sc_branch_name" popd > /dev/null pushd "matrix-react-sdk" > /dev/null -git checkout "$current_mxreactsdk_tag" +git checkout "$current_mxreactsdk_tag" -B "$sc_branch_name" popd > /dev/null # Refresh environment From 4c8f9de4e8e3705f12a6c8df0a3ce8451569961d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 16:52:56 +0200 Subject: [PATCH 37/61] Re-enable auto-commit for icons and theme --- apply_patches.sh | 17 ++++++++++++++++- graphics/icon_gen.sh | 19 +++++++++++++++++-- merge_helpers.sh | 11 ++++++++++- merge_upstream.sh | 1 + theme.sh | 12 ++++++------ 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/apply_patches.sh b/apply_patches.sh index 53b35b6..8d581f9 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -4,22 +4,37 @@ set -e mydir="$(dirname "$(realpath "$0")")" +print_section() { + local msg="$1" + echo "##############################################################" + echo "# $msg" + echo "##############################################################" +} + pushd "$mydir" > /dev/null source ./merge_helpers.sh # Apply our patches +print_section "Apply patches to matrix-js-sdk" apply_patches matrix-js-sdk +print_section "Apply patches to matrix-react-sdk" apply_patches matrix-react-sdk +#print_section "Apply patches to element-web" #apply_patches element-web +print_section "Apply patches to element-desktop" apply_patches element-desktop # Automatic adjustments +#print_section "Apply i18n" #automatic_i18n_adjustment +print_section "Apply automatic package adjustments" automatic_packagejson_adjustment # Automatic theme and icon update +print_section "Apply automatic theme updates" ./theme.sh y -./graphics/icon_gen.sh +print_section "Generate icons" +./graphics/icon_gen.sh y popd > /dev/null diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index 6bd1236..b7fdf4f 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -1,6 +1,16 @@ #!/bin/bash +set -e + mydir="$(dirname "$(realpath "$0")")" +automatic_commit="$1" + +SCHILDI_ROOT="$mydir/.." +source "$SCHILDI_ROOT/merge_helpers.sh" + +if [[ "$automatic_commit" == [Yy]* ]]; then + forelement_repos check_clean_git +fi export_rect() { @@ -17,7 +27,7 @@ export_square() { export_rect "$1" "$size" "$in" "$out" } -repo_dir="$mydir/../element-web" +repo_dir="$SCHILDI_ROOT/element-web" base_out="$repo_dir/res/vector-icons" for i in 1024 120 150 152 180 24 300 44 48 50 76 88; do @@ -45,7 +55,7 @@ for f in "$base_out"/*.png; do done -repo_dir="$mydir/../element-desktop" +repo_dir="$SCHILDI_ROOT/element-desktop" base_out="$repo_dir/res/img" export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/element.png" @@ -77,3 +87,8 @@ rm "$base_out/icons/1024x1024.png" for f in "$base_out/icons"/*.png; do pngcrush -ow "$f" done + + +if [[ "$automatic_commit" == [Yy]* ]]; then + forelement_repos commit_if_dirty "Automatic icon update" +fi diff --git a/merge_helpers.sh b/merge_helpers.sh index 2e36b6f..d80ff9e 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -1,6 +1,8 @@ #!/bin/bash -SCHILDI_ROOT="$(dirname "$(realpath "$0")")" +if [ -z "$SCHILDI_ROOT" ]; then + SCHILDI_ROOT="$(dirname "$(realpath "$0")")" +fi branch=${BRANCH:-"lite"} @@ -290,3 +292,10 @@ on_apply_patch_fail() { echo "----------------------------------" read -p "Press enter after committing resolved conflicts: " } + +commit_if_dirty() { + local message="$1" + # see: https://devops.stackexchange.com/a/5443 + git add -A + git diff-index --quiet HEAD || git commit -m "$message" +} diff --git a/merge_upstream.sh b/merge_upstream.sh index 2e7d31e..79b3f5b 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -52,6 +52,7 @@ popd > /dev/null # Refresh environment make clean make setup +forall_repos commit_if_dirty "Automatic setup commit" ./apply_patches.sh diff --git a/theme.sh b/theme.sh index ef664fd..8aee68d 100755 --- a/theme.sh +++ b/theme.sh @@ -172,10 +172,10 @@ for f in res/**/*.svg; do replace_colors "$f" done -popd > /dev/null +if [[ "$automatic_commit" == [Yy]* ]]; then + # see: https://devops.stackexchange.com/a/5443 + git add -A + git diff-index --quiet HEAD || git commit -m "Automatic theme update" +fi -#if [[ "$automatic_commit" == [Yy]* ]]; then -# # see: https://devops.stackexchange.com/a/5443 -# git add -A -# git diff-index --quiet HEAD || git commit -m "Automatic theme update" -#fi +popd > /dev/null From 8de7f8f8467db68fb9e01c8fb5d711114803d715 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 17:27:23 +0200 Subject: [PATCH 38/61] Some more tooling updates & Update to v1.11.79 --- README.md | 32 ------------ element-desktop | 2 +- element-web | 2 +- generate_patches.sh | 3 ++ matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...ildi-fetch-package.ts-modifications.patch} | 4 +- ...Add-fields-for-media-caption-support.patch | 4 +- .../0001-Disable-sticky-rooms.patch | 8 +-- .../0002-Bring-back-unified-room-list.patch | 50 +++++++++---------- ...-rooms-to-bottom-I-still-want-to-see.patch | 8 +-- ...rendering-captions-in-media-messages.patch | 24 ++++----- .../0005-Don-t-preview-reactions.patch | 8 +-- ...tification-state-the-same-way-as-the.patch | 8 +-- ...llow-muted-rooms-to-render-as-unread.patch | 8 +-- .../0008-Increase-default-visible-tiles.patch | 8 +-- ...paceDMBadges-setting-force-enabled-f.patch | 18 +++---- ...m-reactions-from-tadzik-freeform-rea.patch | 18 +++---- ...1-Allow-reactions-to-take-more-space.patch | 10 ++-- ...don-t-automatically-show-last-opened.patch | 18 +++---- ...0013-Exclude-spaces-from-breadcrumbs.patch | 8 +-- .../0014-Stop-the-search-bar-wobble.patch | 8 +-- push_current_sc_branches.sh | 40 +++++++++++++++ 23 files changed, 152 insertions(+), 141 deletions(-) rename patches/element-desktop/{0001-Add-back-schildi-fetch-package.ts-modifications.patch => 0002-Add-back-schildi-fetch-package.ts-modifications.patch} (96%) create mode 100755 push_current_sc_branches.sh diff --git a/README.md b/README.md index 78b0399..1b5738a 100644 --- a/README.md +++ b/README.md @@ -5,38 +5,6 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/ This branch builds the "lite" variant, which rebases a reduced feature set of the original fork on top of the latest Element, in order to keep maintenance effort more manageable while staying up-to-date. -For bringup I'm currently trying out a new approach which relies less on merges but rather on cherry-picking our changes back. -So while the old build instructions mostly still apply, you need to do some new steps: - -After cloning, add usptream remotes: - -``` -source merge_helpers.sh -forall_repos add_upstream -``` - -Then, to checkout the latest upstream release and pick our changes on top of it (I know the script name isn't accurate right now) - -``` -./merge_upstream.sh -``` - -Note that `./merge_upstream.sh` may pick up a wrong tag right now, e.g. a release candidate instead of the latest build, which may cause problems if you plan to develop on top of it. -If you want to build against a specific Element version rather than the latest (e.g. v1.11.66): - -``` -./merge_upstream.sh v1.11.66 -``` - -If there are conflicts picking some changes running this script, solve them manually. -If you want to persist a new set of patches in `schildichat-desktop`, run - -``` -./generate_patches.sh -``` - -Note this script may be broken right now when not run against actual element releases (it was causing issues for a release candidate for sure). - ## Old build instructions, to be revised in the future diff --git a/element-desktop b/element-desktop index 093d2e2..5782a86 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 093d2e28d82e693b8f7575b1b16206723b9269e5 +Subproject commit 5782a86e0113784cd97d3cd34472ddc5696d4b9b diff --git a/element-web b/element-web index 9fa6db0..6ff1f21 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9fa6db056ac4cd2240a9b676cf305a1ca73bc15c +Subproject commit 6ff1f21927883ac3302430c9406ffb5f5ace6c65 diff --git a/generate_patches.sh b/generate_patches.sh index b456c34..4a2771d 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -28,6 +28,9 @@ persist_patches() { git format-patch -k upstream/master.. -o "$patch_dir" echo "Clearing automated commits from patches" find "$patch_dir" -name "*-Automatic-package.json-adjustment.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-icon-update.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-theme-update.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-setup-commit.patch" -exec rm {} \; find "$patch_dir" -name "*-Update-version-to-*.patch" -exec rm {} \; popd } diff --git a/matrix-js-sdk b/matrix-js-sdk index b6a86ca..646153b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit b6a86ca2e65407999a71d92cbbfec7a856d7a586 +Subproject commit 646153b51b6de55c74beb5666875d283df04cba1 diff --git a/matrix-react-sdk b/matrix-react-sdk index abfce03..048ba0d 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit abfce03f8cd209ce9289cdcd6a0f4c91e0da6072 +Subproject commit 048ba0db6e21468d484303fafed3c3703cba1b89 diff --git a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch similarity index 96% rename from patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch rename to patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch index 2ceda12..30145b0 100644 --- a/patches/element-desktop/0001-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 00009e6d27ccc63b0e1e32888a79a3dda12537db Mon Sep 17 00:00:00 2001 +From 68654457f34f0821d52d61453a7c3de40bd9a473 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 54da3f3..354f039 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.46.0 +2.46.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 8ec1e73..00e3f90 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 3e11b1c51c4b0f0e673c4b22864f97be7098b888 Mon Sep 17 00:00:00 2001 +From 646153b51b6de55c74beb5666875d283df04cba1 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 ef23668b0..9b4ff3b97 100644 /** -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index bf35661..eb55bde 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 6e30626e23f9bd3eed4bb62ce91d86678b6e2023 Mon Sep 17 00:00:00 2001 +From 88a9117efb7131a593c2cb012d831bebcdd5878d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -8,10 +8,10 @@ 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 6e28eb1a4e..775b68e7d9 100644 +index c3450d70cf..e296676149 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 { +@@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter { this.recalculateActiveCallRooms(tagId); } @@ -25,5 +25,5 @@ index 6e28eb1a4e..775b68e7d9 100644 } -- -2.46.0 +2.46.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 2642465..901193c 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 60b5acaf9615e189667a594bb1477ea6c0feb457 Mon Sep 17 00:00:00 2001 +From 108b8d05d2f0c701e75a327094610bf672dcbf75 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,10 +16,10 @@ 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 7d47748de8..cec95bcf6d 100644 +index e27b2ca03f..311a54d9d8 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx -@@ -80,11 +80,13 @@ interface IState { +@@ -72,11 +72,13 @@ interface IState { sublists: ITagMap; currentRoomId?: string; suggestedRooms: ISuggestedRoom[]; @@ -33,7 +33,7 @@ index 7d47748de8..cec95bcf6d 100644 DefaultTagID.DM, DefaultTagID.Untagged, DefaultTagID.Conference, -@@ -97,6 +99,7 @@ export const TAG_ORDER: TagID[] = [ +@@ -89,6 +91,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 7d47748de8..cec95bcf6d 100644 interface ITagAesthetics { sectionLabel: TranslationKey; -@@ -374,6 +377,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { +@@ -366,6 +369,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { return null; }; @@ -59,7 +59,7 @@ index 7d47748de8..cec95bcf6d 100644 const TAG_AESTHETICS: TagAestheticsMap = { [DefaultTagID.Invite]: { sectionLabel: _td("action|invites_list"), -@@ -391,6 +405,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -383,6 +397,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { defaultHidden: false, AuxButtonComponent: DmAuxButton, }, @@ -72,7 +72,7 @@ index 7d47748de8..cec95bcf6d 100644 [DefaultTagID.Conference]: { sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"), isInvite: false, -@@ -429,6 +449,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -421,6 +441,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { export default class RoomList extends React.PureComponent { private dispatcherRef?: string; @@ -80,7 +80,7 @@ index 7d47748de8..cec95bcf6d 100644 private treeRef = createRef(); public static contextType = MatrixClientContext; -@@ -440,7 +461,14 @@ export default class RoomList extends React.PureComponent { +@@ -432,7 +453,14 @@ export default class RoomList extends React.PureComponent { this.state = { sublists: {}, suggestedRooms: SpaceStore.instance.suggestedRooms, @@ -95,7 +95,7 @@ index 7d47748de8..cec95bcf6d 100644 } public componentDidMount(): void { -@@ -455,9 +483,16 @@ export default class RoomList extends React.PureComponent { +@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent { 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 7d47748de8..cec95bcf6d 100644 private onRoomViewStoreUpdate = (): void => { this.setState({ currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined, -@@ -598,7 +633,9 @@ export default class RoomList extends React.PureComponent { +@@ -590,7 +625,9 @@ export default class RoomList extends React.PureComponent { const aesthetics = TAG_AESTHETICS[orderedTagId]; if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`); @@ -124,10 +124,10 @@ index 7d47748de8..cec95bcf6d 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 7cd58c9355..9709fcd83b 100644 +index 2fadb53dde..47eb9b284e 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -197,6 +197,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -190,6 +190,14 @@ export interface IFeature extends Omit, "isFeature"> { export type ISetting = IBaseSetting | IFeature; export const SETTINGS: { [setting: string]: ISetting } = { @@ -143,10 +143,10 @@ index 7cd58c9355..9709fcd83b 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index 7dcb28c325..63f43118fa 100644 +index 53377e0a01..381187b85c 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -508,6 +508,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements this.setAndPersistListOrder(tag, listOrder); } } @@ -156,7 +156,7 @@ index 7dcb28c325..63f43118fa 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -621,7 +624,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -613,7 +616,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -180,10 +180,10 @@ index 7dcb28c325..63f43118fa 100644 } diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 775b68e7d9..39add54d89 100644 +index e296676149..06147137b3 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 { +@@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter { * Set to true to suspend emissions of algorithm updates. */ public updatesInhibited = false; @@ -191,7 +191,7 @@ index 775b68e7d9..39add54d89 100644 public start(): void { CallStore.instance.on(CallStoreEvent.ConnectedCalls, this.onConnectedCalls); -@@ -114,6 +115,10 @@ export class Algorithm extends EventEmitter { +@@ -106,6 +107,10 @@ export class Algorithm extends EventEmitter { return this._cachedRooms; } @@ -202,7 +202,7 @@ index 775b68e7d9..39add54d89 100644 /** * Awaitable version of the sticky room setter. * @param val The new room to sticky. -@@ -521,7 +526,10 @@ export class Algorithm extends EventEmitter { +@@ -513,7 +518,10 @@ export class Algorithm extends EventEmitter { } if (!inTag) { @@ -214,7 +214,7 @@ index 775b68e7d9..39add54d89 100644 newTags[DefaultTagID.DM].push(room); } else { newTags[DefaultTagID.Untagged].push(room); -@@ -565,7 +573,13 @@ export class Algorithm extends EventEmitter { +@@ -557,7 +565,13 @@ export class Algorithm extends EventEmitter { tags.push(...this.getTagsOfJoinedRoom(room)); } @@ -229,7 +229,7 @@ index 775b68e7d9..39add54d89 100644 return tags; } -@@ -575,7 +589,7 @@ export class Algorithm extends EventEmitter { +@@ -567,7 +581,7 @@ export class Algorithm extends EventEmitter { if (tags.length === 0) { // Check to see if it's a DM if it isn't anything else @@ -239,10 +239,10 @@ index 775b68e7d9..39add54d89 100644 } } diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts -index d8b0488842..335097ccdb 100644 +index 50cecda665..8efc2d040d 100644 --- a/src/stores/room-list/models.ts +++ b/src/stores/room-list/models.ts -@@ -21,6 +21,7 @@ export enum DefaultTagID { +@@ -13,6 +13,7 @@ export enum DefaultTagID { LowPriority = "m.lowpriority", Favourite = "m.favourite", DM = "im.vector.fake.direct", @@ -250,7 +250,7 @@ index d8b0488842..335097ccdb 100644 Conference = "im.vector.fake.conferences", ServerNotice = "m.server_notice", Suggested = "im.vector.fake.suggested", -@@ -29,6 +30,7 @@ export enum DefaultTagID { +@@ -21,6 +22,7 @@ export enum DefaultTagID { export const OrderedDefaultTagIDs = [ DefaultTagID.Invite, DefaultTagID.Favourite, @@ -259,5 +259,5 @@ index d8b0488842..335097ccdb 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.46.0 +2.46.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 dc063fc..d51648a 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 b0c7839b0ea5d707120df607eeba7c535b16da3a Mon Sep 17 00:00:00 2001 +From 7c7a368ac7a3e9ae4c096b70994476832fec812c 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. @@ -8,10 +8,10 @@ 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 1b6472a018..8eae273a06 100644 +index 67ee1ca084..67dcaa3855 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -@@ -46,7 +46,7 @@ export abstract class OrderingAlgorithm { +@@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm { } public get isMutedToBottom(): boolean { @@ -21,5 +21,5 @@ index 1b6472a018..8eae273a06 100644 /** -- -2.46.0 +2.46.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 89973e9..aaa686f 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 bc56cc58fbb23b3e19740e202fe2231240fbc0c9 Mon Sep 17 00:00:00 2001 +From eba8b0f5bacb6762146eda9075e4f4e3e8e54e81 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 @@ -11,10 +11,10 @@ Subject: Add support for rendering captions in media messages 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts -index fcc204dae3..95cb2eb37d 100644 +index e48ba96b56..3caeff225c 100644 --- a/src/components/views/messages/IBodyProps.ts +++ b/src/components/views/messages/IBodyProps.ts -@@ -59,4 +59,6 @@ export interface IBodyProps { +@@ -51,4 +51,6 @@ export interface IBodyProps { // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order. // This may be useful when displaying a preview of the event. inhibitInteraction?: boolean; @@ -22,10 +22,10 @@ index fcc204dae3..95cb2eb37d 100644 + OrigBodyType?: React.ComponentType>; } diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx -index fb700579be..76f60bad76 100644 +index 1a5d09e415..bfe908aacc 100644 --- a/src/components/views/messages/MessageEvent.tsx +++ b/src/components/views/messages/MessageEvent.tsx -@@ -183,6 +183,15 @@ export default class MessageEvent extends React.Component implements IMe +@@ -175,6 +175,15 @@ export default class MessageEvent extends React.Component implements IMe } } @@ -41,7 +41,7 @@ index fb700579be..76f60bad76 100644 if (SettingsStore.getValue("feature_mjolnir")) { const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`; const allowRender = localStorage.getItem(key) === "true"; -@@ -216,7 +225,13 @@ export default class MessageEvent extends React.Component implements IMe +@@ -208,7 +217,13 @@ export default class MessageEvent extends React.Component implements IMe getRelationsForEvent={this.props.getRelationsForEvent} isSeeingThroughMessageHiddenForModeration={this.props.isSeeingThroughMessageHiddenForModeration} inhibitInteraction={this.props.inhibitInteraction} @@ -56,10 +56,10 @@ index fb700579be..76f60bad76 100644 + +) diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx -index 5dba3e42b7..f665e6dc67 100644 +index 8b7bfb9a5a..a8890303f8 100644 --- a/src/components/views/messages/TextualBody.tsx +++ b/src/components/views/messages/TextualBody.tsx -@@ -565,6 +565,9 @@ export default class TextualBody extends React.Component { +@@ -557,6 +557,9 @@ export default class TextualBody extends React.Component { const isNotice = content.msgtype === MsgType.Notice; const isEmote = content.msgtype === MsgType.Emote; @@ -69,7 +69,7 @@ index 5dba3e42b7..f665e6dc67 100644 const willHaveWrapper = this.props.replacingEventId || this.props.isSeeingThroughMessageHiddenForModeration || isEmote; -@@ -643,6 +646,14 @@ export default class TextualBody extends React.Component { +@@ -635,6 +638,14 @@ export default class TextualBody extends React.Component { ); } @@ -85,10 +85,10 @@ index 5dba3e42b7..f665e6dc67 100644
{body} diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts -index 75511756f5..a8e3b9cceb 100644 +index 194cb31d20..0c0aec2138 100644 --- a/src/utils/FileUtils.ts +++ b/src/utils/FileUtils.ts -@@ -46,7 +46,9 @@ export function presentableTextForFile( +@@ -38,7 +38,9 @@ export function presentableTextForFile( shortened = false, ): string { let text = fallbackText; @@ -100,5 +100,5 @@ index 75511756f5..a8e3b9cceb 100644 // file extension. text = content.body; -- -2.46.0 +2.46.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 2e7366c..462bf09 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 9a88dd5e3f1a03a4eecfe11515a502ef89d7d6b3 Mon Sep 17 00:00:00 2001 +From e5e461d0bf3dfb693dc63075b653a2c01df9c6f4 Mon Sep 17 00:00:00 2001 From: SpiritCroc 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 a3c44084d5..f412cf3b89 100644 +index e0e06ec980..7ee27f8402 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts -@@ -65,10 +65,12 @@ const PREVIEWS: Record< +@@ -57,10 +57,12 @@ const PREVIEWS: Record< isState: false, previewer: new StickerEventPreview(), }, @@ -25,5 +25,5 @@ index a3c44084d5..f412cf3b89 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.46.0 +2.46.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 7e99a27..3ab319d 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 b8da294b5d544da9760299037dd2830989298510 Mon Sep 17 00:00:00 2001 +From e099a50b6339607e7238567829bbaa245d0b1a2a 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 71ff1ef296..4ab94e7278 100644 +index 93fb42f447..09df8eaac9 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 { +@@ -304,7 +304,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 71ff1ef296..4ab94e7278 100644 return ( -- -2.46.0 +2.46.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 10bee6c..a6e121d 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 e8d9cca6e0838659a02373bf922f5aceb16ee015 Mon Sep 17 00:00:00 2001 +From 61945db01ec4c64a7c89a31a09ba3f7d0fd5da9f 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,10 +8,10 @@ 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 1fb5e5ba4d..f9cb6ed026 100644 +index cc027c9682..c4c31a51cb 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts -@@ -263,7 +263,7 @@ export function determineUnreadState( +@@ -255,7 +255,7 @@ export function determineUnreadState( return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; } @@ -21,5 +21,5 @@ index 1fb5e5ba4d..f9cb6ed026 100644 } -- -2.46.0 +2.46.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 f1fdb94..5e005e9 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 de95a495964ac0b8a91c3a30268fa362e3cc5373 Mon Sep 17 00:00:00 2001 +From ad8b2ad718275363b9aba3a40792b761e3532be8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -8,10 +8,10 @@ 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 afc93f3b01..6020b2148d 100644 +index ff60309e08..275b6d330b 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts -@@ -82,7 +82,7 @@ export class ListLayout { +@@ -74,7 +74,7 @@ export class ListLayout { public get defaultVisibleTiles(): number { // This number is what "feels right", and mostly subject to design's opinion. @@ -21,5 +21,5 @@ index afc93f3b01..6020b2148d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.46.0 +2.46.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 b0902f2..b291c04 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 54ff718e21a20c653721ffd6ec30c6d91cb67900 Mon Sep 17 00:00:00 2001 +From 4ec13ff8a65486fac9a905b79b26530d2257d318 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 9709fcd83b..7b402ef8cf 100644 +index 47eb9b284e..9d43f8e1e0 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -204,6 +204,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -197,6 +197,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, @@ -28,10 +28,10 @@ index 9709fcd83b..7b402ef8cf 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 966b564d68..bda81e9d5f 100644 +index 90358f3310..60df05478a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -162,9 +162,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { /** Whether the feature flag is set for MSC3946 */ private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors"); @@ -49,7 +49,7 @@ index 966b564d68..bda81e9d5f 100644 SettingsStore.monitorSetting("Spaces.allRoomsInHome", null); SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null); SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null); -@@ -200,6 +208,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -192,6 +200,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { return this._allRoomsInHome; } @@ -60,7 +60,7 @@ index 966b564d68..bda81e9d5f 100644 public setActiveRoomInSpace(space: SpaceKey): void { if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return; if (space !== this.activeSpace) this.setActiveSpace(space, false); -@@ -709,6 +721,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -701,6 +713,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false; @@ -71,7 +71,7 @@ index 966b564d68..bda81e9d5f 100644 if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { return s === dmBadgeSpace; } -@@ -1285,6 +1301,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -1277,6 +1293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { break; } @@ -88,5 +88,5 @@ index 966b564d68..bda81e9d5f 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.46.0 +2.46.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 9430d17..f5c0059 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 bbc655c919fe9283a38e6e3c86bedb8c348776a7 Mon Sep 17 00:00:00 2001 +From 9e0626583e090e72a9b14908cf9781aa0766779b 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 @@ -71,10 +71,10 @@ Date: Tue Aug 17 11:29:22 2021 +0200 2 files changed, 16 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index 16258bb3d7..847170dc92 100644 +index 4806ad4216..7d4a4353e2 100644 --- a/src/components/views/emojipicker/EmojiPicker.tsx +++ b/src/components/views/emojipicker/EmojiPicker.tsx -@@ -25,6 +25,7 @@ import Header from "./Header"; +@@ -17,6 +17,7 @@ import Header from "./Header"; import Search from "./Search"; import Preview from "./Preview"; import QuickReactions from "./QuickReactions"; @@ -82,7 +82,7 @@ index 16258bb3d7..847170dc92 100644 import Category, { CategoryKey, ICategory } from "./Category"; import { filterBoolean } from "../../../utils/arrays"; import { -@@ -45,6 +46,7 @@ export const EMOJIS_PER_ROW = 8; +@@ -37,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; const ZERO_WIDTH_JOINER = "\u200D"; interface IProps { @@ -90,7 +90,7 @@ index 16258bb3d7..847170dc92 100644 selectedEmojis?: Set; onChoose(unicode: string): boolean; onFinished(): void; -@@ -349,6 +351,10 @@ class EmojiPicker extends React.Component { +@@ -341,6 +343,10 @@ class EmojiPicker extends React.Component { } }; @@ -101,7 +101,7 @@ index 16258bb3d7..847170dc92 100644 private static categoryHeightForEmojiCount(count: number): number { if (count === 0) { return 0; -@@ -404,6 +410,15 @@ class EmojiPicker extends React.Component { +@@ -396,6 +402,15 @@ class EmojiPicker extends React.Component { return categoryElement; })} @@ -118,10 +118,10 @@ index 16258bb3d7..847170dc92 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 8265331a3c..c29fc698aa 100644 +index 2c2eb442a0..62bfd2ea0f 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx -@@ -131,6 +131,7 @@ class ReactionPicker extends React.Component { +@@ -123,6 +123,7 @@ class ReactionPicker extends React.Component { public render(): React.ReactNode { return ( Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space @@ -8,10 +8,10 @@ Subject: Allow reactions to take more space 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss -index 26d2d25fae..9920c6c20d 100644 +index f2e3885de4..2a8bb9224e 100644 --- a/res/css/views/messages/_ReactionsRowButton.pcss +++ b/res/css/views/messages/_ReactionsRowButton.pcss -@@ -23,6 +23,7 @@ limitations under the License. +@@ -14,6 +14,7 @@ Please see LICENSE files in the repository root for full details. background-color: $secondary-hairline-color; user-select: none; align-items: center; @@ -19,7 +19,7 @@ index 26d2d25fae..9920c6c20d 100644 &:hover { border-color: $quinary-content; -@@ -38,7 +39,6 @@ limitations under the License. +@@ -29,7 +30,6 @@ Please see LICENSE files in the repository root for full details. } .mx_ReactionsRowButton_content { @@ -28,5 +28,5 @@ index 26d2d25fae..9920c6c20d 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.46.0 +2.46.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 8ac51e2..0ded0b7 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 c9fd9e3448066ede633e8e2d388c9e6a040f3956 Mon Sep 17 00:00:00 2001 +From efb1f2b9ca610e6282583d8585317803389a87e2 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 53514ab817..73068d3090 100644 +index 8e0eaabe4f..ed9f1f30c1 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1438,7 +1438,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1446,7 +1446,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 53514ab817..73068d3090 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1450,6 +1458,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1458,6 +1466,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 53514ab817..73068d3090 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 7b402ef8cf..cfaeb9ac29 100644 +index 9d43f8e1e0..eede03b5b7 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -209,6 +209,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -202,6 +202,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -63,10 +63,10 @@ index 7b402ef8cf..cfaeb9ac29 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index bda81e9d5f..6f16e7261f 100644 +index 60df05478a..0be7ba190a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -273,6 +273,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { // 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 ( @@ -75,5 +75,5 @@ index bda81e9d5f..6f16e7261f 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.46.0 +2.46.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 index fa1fbc2..95f28b5 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 5e5285a00c60802d7ef74fe6881601a3c4f20746 Mon Sep 17 00:00:00 2001 +From 19cacbc689d2cd27f400033c7c73dbe5fe9acf8d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -8,10 +8,10 @@ Subject: Exclude spaces from breadcrumbs 1 file changed, 1 insertion(+) diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts -index 36bb0a78b6..c1edee140f 100644 +index 9859f24015..957b54286c 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts -@@ -145,6 +145,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { +@@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { } private async appendRoom(room: Room): Promise { @@ -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.46.0 +2.46.2 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 f62a0d7..3910330 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 c6a550e2c3f9020730c8bd603514e9ce7cf69064 Mon Sep 17 00:00:00 2001 +From 086f83a33c6c3c41cce9fb985d2be4ec4e5dafc4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -8,10 +8,10 @@ Subject: Stop the search bar wobble 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index 605ad41b81..d1f55282f6 100644 +index 05a3dac067..7861af6381 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss -@@ -189,6 +189,7 @@ input[type="search"].mx_textinput_icon { +@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { padding-left: 36px; background-repeat: no-repeat; background-position: 10px center; @@ -20,5 +20,5 @@ index 605ad41b81..d1f55282f6 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.46.0 +2.46.2 diff --git a/push_current_sc_branches.sh b/push_current_sc_branches.sh new file mode 100755 index 0000000..51cab81 --- /dev/null +++ b/push_current_sc_branches.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +get_branch_of() { + local repo="$1" + pushd "$repo" > /dev/null + local b=`git branch --show-current` + if [[ "$b" = sc_v* ]]; then + echo "$b" + else + >&2 echo "Unexpected branch name for $repo: $b" + exit 1 + fi + popd > /dev/null +} + +b_js=`get_branch_of matrix-js-sdk` +b_react=`get_branch_of matrix-react-sdk` +b_web=`get_branch_of element-web` +b_desktop=`get_branch_of element-desktop` + +if [ "$b_js" != "$b_react" ] || [ "$b_react" != "$b_web" ] || [ "$b_web" != "$b_desktop" ]; then + echo "Detected branch name mismatch!" + echo "js-sdk: $b_js" + echo "react-sdk: $b_react" + echo "element-web: $b_web" + echo "element-desktop: $b_desktop" + exit 1 +fi + +branch="$b_js" + +echo "Pushing to all repos: $branch" +forall_repos git push --set-upstream origin "$branch" From fc0edf9dca4fd7486317fa98f158f8810ae394d6 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 9 Oct 2024 08:04:03 +0200 Subject: [PATCH 39/61] 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 From df811401515b879adc2574f2d17c4b7763b47708 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 12:33:26 +0200 Subject: [PATCH 40/61] Initial compound-based SC theme bringup --- matrix-react-sdk | 2 +- ...hildi-fetch-package.ts-modifications.patch | 2 +- ...Add-fields-for-media-caption-support.patch | 2 +- .../0001-Disable-sticky-rooms.patch | 2 +- .../0002-Bring-back-unified-room-list.patch | 2 +- ...-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...rendering-captions-in-media-messages.patch | 2 +- .../0005-Don-t-preview-reactions.patch | 2 +- ...tification-state-the-same-way-as-the.patch | 2 +- ...llow-muted-rooms-to-render-as-unread.patch | 2 +- .../0008-Increase-default-visible-tiles.patch | 2 +- ...paceDMBadges-setting-force-enabled-f.patch | 2 +- ...m-reactions-from-tadzik-freeform-rea.patch | 2 +- ...1-Allow-reactions-to-take-more-space.patch | 2 +- ...don-t-automatically-show-last-opened.patch | 2 +- ...0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- .../0014-Stop-the-search-bar-wobble.patch | 2 +- ...6-Import-SC-compound-theme-overrides.patch | 34 ++++ res/css/sc-cpd-overrides.css | 172 ++++++++++++++++++ theme.sh | 8 + 20 files changed, 231 insertions(+), 17 deletions(-) create mode 100644 patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch create mode 100644 res/css/sc-cpd-overrides.css diff --git a/matrix-react-sdk b/matrix-react-sdk index d377796..d160a1b 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d3777969edf2d708afcbe8b66f843f57a8f03e97 +Subproject commit d160a1bbdef8a93a2139e0e159a5fc5eb7c8ed7a 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 9b45443..462322a 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 @@ -58,5 +58,5 @@ index 54da3f3..354f039 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.46.2 +2.47.0 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 ab4cfdd..27a05d9 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 @@ -52,5 +52,5 @@ index 1128b40d3..d85526642 100644 /** -- -2.46.2 +2.47.0 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 5481670..2004021 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644 } -- -2.46.2 +2.47.0 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 62e2836..41a43aa 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 @@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.46.2 +2.47.0 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 759095e..ae8877f 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 @@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644 /** -- -2.46.2 +2.47.0 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 86ba34d..e28ee51 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 @@ -100,5 +100,5 @@ index 194cb31d20..0c0aec2138 100644 // file extension. text = content.body; -- -2.46.2 +2.47.0 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 6f307c3..65f077a 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -25,5 +25,5 @@ index e0e06ec980..7ee27f8402 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.46.2 +2.47.0 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 2bdaccc..040b871 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 @@ -26,5 +26,5 @@ index 93fb42f447..09df8eaac9 100644 return ( -- -2.46.2 +2.47.0 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 35d844a..7917d42 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 @@ -21,5 +21,5 @@ index cc027c9682..c4c31a51cb 100644 } -- -2.46.2 +2.47.0 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 3320330..6a58ead 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.46.2 +2.47.0 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 940a3aa..2443326 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 @@ -88,5 +88,5 @@ index 90358f3310..60df05478a 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.46.2 +2.47.0 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 7ebbc4a..f1f2631 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 @@ -130,5 +130,5 @@ index 2c2eb442a0..62bfd2ea0f 100644 isEmojiDisabled={this.isEmojiDisabled} onFinished={this.props.onFinished} -- -2.46.2 +2.47.0 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 272c8d6..6e8d6f1 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 @@ -28,5 +28,5 @@ index f2e3885de4..2a8bb9224e 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.46.2 +2.47.0 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 0036759..b23198c 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 @@ -75,5 +75,5 @@ index 60df05478a..0be7ba190a 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.46.2 +2.47.0 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 1fd5871..8739751 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -20,5 +20,5 @@ index 9859f24015..957b54286c 100644 const rooms = (this.state.rooms || []).slice(); // cheap clone const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); -- -2.46.2 +2.47.0 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 744778f..45e461c 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 @@ -20,5 +20,5 @@ index 05a3dac067..7861af6381 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.46.2 +2.47.0 diff --git a/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch new file mode 100644 index 0000000..e5aad3a --- /dev/null +++ b/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch @@ -0,0 +1,34 @@ +From 8b2c552f798e64974d0a0380f55cadb4f72dd67c Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sun, 13 Oct 2024 11:23:54 +0200 +Subject: Import SC compound theme overrides + +--- + res/css/_common.pcss | 1 + + res/css/sc-cpd-overrides.css | 1 + + 2 files changed, 2 insertions(+) + create mode 120000 res/css/sc-cpd-overrides.css + +diff --git a/res/css/_common.pcss b/res/css/_common.pcss +index 7861af6381..f7a660a339 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. + + @import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound); + @import url("@vector-im/compound-web/dist/style.css"); ++@import "./sc-cpd-overrides.css"; + @import "./_font-sizes.pcss"; + @import "./_animations.pcss"; + @import "./_spacing.pcss"; +diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css +new file mode 120000 +index 0000000000..532e96fddc +--- /dev/null ++++ b/res/css/sc-cpd-overrides.css +@@ -0,0 +1 @@ ++../../../res/css/sc-cpd-overrides.css +\ No newline at end of file +-- +2.47.0 + diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css new file mode 100644 index 0000000..bffb61c --- /dev/null +++ b/res/css/sc-cpd-overrides.css @@ -0,0 +1,172 @@ +/* + * Upstream file for reference: + * - Dark: https://github.com/element-hq/compound-design-tokens/blob/main/assets/web/css/cpd-theme-dark-base.css + * - Light: https://github.com/element-hq/compound-design-tokens/blob/main/assets/web/css/cpd-theme-light-base.css + */ + +.cpd-theme-dark.cpd-theme-dark { + /* TODO? + --cpd-color-alpha-green-1400: hsla(152, 88%, 94%, 0.96); + --cpd-color-alpha-green-1300: hsla(152, 93%, 88%, 0.91); + --cpd-color-alpha-green-1200: hsla(156, 97%, 76%, 0.83); + --cpd-color-alpha-green-1100: hsla(162, 98%, 57%, 0.74); + --cpd-color-alpha-green-1000: hsla(163, 99%, 55%, 0.65); + --cpd-color-alpha-green-900: hsla(164, 98%, 53%, 0.58); + --cpd-color-alpha-green-800: hsl(168, 100%, 24%, 1); + --cpd-color-alpha-green-700: hsl(165, 100%, 18%, 1); + --cpd-color-alpha-green-600: hsl(162, 100%, 14%, 1); + --cpd-color-alpha-green-500: hsl(160, 100%, 12%, 1); + --cpd-color-alpha-green-400: hsl(155, 100%, 9%, 1); + --cpd-color-alpha-green-300: hsl(151, 100%, 7%, 1); + --cpd-color-alpha-green-200: hsl(147, 100%, 6%, 1); + --cpd-color-alpha-green-100: hsl(144, 100%, 6%, 1); + + --cpd-color-alpha-gray-1400: hsla(214, 78%, 98%, 0.95); + --cpd-color-alpha-gray-1300: hsla(213, 73%, 97%, 0.89); + --cpd-color-alpha-gray-1200: hsla(215, 74%, 96%, 0.79); + --cpd-color-alpha-gray-1100: hsla(215, 92%, 95%, 0.68); + --cpd-color-alpha-gray-1000: hsla(213, 93%, 94%, 0.61); + --cpd-color-alpha-gray-900: hsla(211, 94%, 94%, 0.54); + --cpd-color-alpha-gray-800: hsla(216, 100%, 94%, 0.41); + --cpd-color-alpha-gray-700: hsla(213, 85%, 95%, 0.27); + --cpd-color-alpha-gray-600: hsla(225, 46%, 95%, 0.2); + --cpd-color-alpha-gray-500: hsla(214, 41%, 97%, 0.15); + --cpd-color-alpha-gray-400: hsla(270, 37%, 93%, 0.1); + --cpd-color-alpha-gray-200: hsla(286, 31%, 82%, 0.04); + --cpd-color-alpha-gray-100: hsla(214, 10%, 86%, 0.02); + */ + /* Hover of room list items, search bar bg, space icon bg */ + --cpd-color-alpha-gray-300: rgba(255, 255, 255, 0.06); + + /* TODO more accent variants? */ + --cpd-color-green-1400: #F1F8E9; + --cpd-color-green-1300: #DCEDC8; + --cpd-color-green-1200: #C5E1A5; + --cpd-color-green-1100: #AED581; + --cpd-color-green-1000: #9CCC65; + --cpd-color-green-900: #8BC34A; + --cpd-color-green-800: #8BC34A; + --cpd-color-green-700: #8BC34A; + --cpd-color-green-600: #8BC34A; + --cpd-color-green-500: #8BC34A; + --cpd-color-green-400: #689F38; + --cpd-color-green-300: #33691E; + --cpd-color-green-200: #33691E; + --cpd-color-green-100: #33691E; + + /* TODO + --cpd-color-red-1400: #ffe9e6; + --cpd-color-red-1300: #ffd4cd; + --cpd-color-red-1200: #ffaea4; + --cpd-color-red-1100: #ff877c; + --cpd-color-red-1000: #ff665d; + --cpd-color-red-900: #fd3e3c; + --cpd-color-red-800: #d1212a; + --cpd-color-red-700: #9f0d1e; + --cpd-color-red-600: #830009; + --cpd-color-red-500: #710000; + --cpd-color-red-400: #590000; + --cpd-color-red-300: #470000; + --cpd-color-red-200: #3e0000; + --cpd-color-red-100: #370000; + */ + + --cpd-color-gray-1400: #eeeeee; + --cpd-color-gray-1300: #e0e0e0; + --cpd-color-gray-1200: #b3b3b3; + --cpd-color-gray-1100: #aaaaaa; + --cpd-color-gray-1000: #9e9e9e; + --cpd-color-gray-900: #808080; + --cpd-color-gray-800: #757575; + --cpd-color-gray-700: #424242; + --cpd-color-gray-600: #424242; + --cpd-color-gray-500: #424242; + --cpd-color-gray-400: #303030; + --cpd-color-gray-300: #212121; + --cpd-color-gray-200: #212121; + --cpd-color-gray-100: #212121; + --cpd-color-theme-bg: #212121; +} + +.cpd-theme-light.cpd-theme-light { + /* TODO? + --cpd-color-alpha-gray-1400: hsla(223, 64%, 2%, 0.9); + --cpd-color-alpha-gray-1300: hsla(225, 57%, 3%, 0.84); + --cpd-color-alpha-gray-1200: hsla(213, 73%, 3%, 0.77); + --cpd-color-alpha-gray-1100: hsla(215, 74%, 5%, 0.71); + --cpd-color-alpha-gray-1000: hsla(218, 79%, 6%, 0.66); + --cpd-color-alpha-gray-900: hsla(213, 83%, 7%, 0.61); + --cpd-color-alpha-gray-800: hsla(213, 87%, 9%, 0.5); + --cpd-color-alpha-gray-700: hsla(215, 96%, 10%, 0.35); + --cpd-color-alpha-gray-600: hsla(212, 97%, 12%, 0.26); + --cpd-color-alpha-gray-500: hsla(212, 87%, 15%, 0.2); + --cpd-color-alpha-gray-400: hsla(213, 90%, 20%, 0.12); + --cpd-color-alpha-gray-300: hsla(216, 89%, 18%, 0.06); + --cpd-color-alpha-gray-200: hsla(200, 41%, 36%, 0.04); + --cpd-color-alpha-gray-100: hsla(210, 48%, 41%, 0.02); + + --cpd-color-alpha-green-1400: hsl(149, 100%, 7%, 1); + --cpd-color-alpha-green-1300: hsl(157, 100%, 10%, 1); + --cpd-color-alpha-green-1200: hsl(162, 100%, 14%, 1); + --cpd-color-alpha-green-1100: hsl(165, 100%, 18%, 1); + --cpd-color-alpha-green-1000: hsl(166, 100%, 21%, 1); + --cpd-color-alpha-green-900: hsl(168, 100%, 24%, 1); + --cpd-color-alpha-green-800: hsl(166, 100%, 30%, 1); + --cpd-color-alpha-green-700: hsla(163, 99%, 38%, 0.96); + --cpd-color-alpha-green-600: hsla(156, 99%, 36%, 0.56); + --cpd-color-alpha-green-500: hsla(154, 96%, 37%, 0.41); + --cpd-color-alpha-green-400: hsla(151, 93%, 37%, 0.23); + --cpd-color-alpha-green-300: hsla(150, 100%, 36%, 0.11); + --cpd-color-alpha-green-200: hsla(150, 79%, 41%, 0.06); + --cpd-color-alpha-green-100: hsla(156, 79%, 41%, 0.03); + */ + + /* TODO accent variants? */ + --cpd-color-green-1400: #33691E; + --cpd-color-green-1300: #33691E; + --cpd-color-green-1200: #33691E; + --cpd-color-green-1100: #33691E; + --cpd-color-green-1000: #33691E; + --cpd-color-green-900: #33691E; + --cpd-color-green-800: #33691E; + --cpd-color-green-700: #8BC34A; + --cpd-color-green-600: #8BC34A; + --cpd-color-green-500: #8BC34A; + --cpd-color-green-400: #8BC34A; + --cpd-color-green-300: #C5E1A5; + --cpd-color-green-200: #DCEDC8; + --cpd-color-green-100: #F1F8E9; + + /* TODO + --cpd-color-red-1400: #450000; + --cpd-color-red-1300: #620000; + --cpd-color-red-1200: #850006; + --cpd-color-red-1100: #a4041d; + --cpd-color-red-1000: #bc0f22; + --cpd-color-red-900: #d51928; + --cpd-color-red-800: #ff3d3d; + --cpd-color-red-700: #ff8c81; + --cpd-color-red-600: #ffafa5; + --cpd-color-red-500: #ffc5bc; + --cpd-color-red-400: #ffdfda; + --cpd-color-red-300: #ffefec; + --cpd-color-red-200: #fff7f6; + --cpd-color-red-100: #fffaf9; + */ + + --cpd-color-gray-1400: #212121; + --cpd-color-gray-1300: #212121; + --cpd-color-gray-1200: #424242; + --cpd-color-gray-1100: #424242; + --cpd-color-gray-1000: #616161; + --cpd-color-gray-900: #616161; + --cpd-color-gray-800: #808080; + --cpd-color-gray-700: #b3b3b3; + --cpd-color-gray-600: #b3b3b3; + --cpd-color-gray-500: #cdd3da; + --cpd-color-gray-400: #e0e0e0; + --cpd-color-gray-300: #f5f5f5; + --cpd-color-gray-200: #f5f5f5; + --cpd-color-gray-100: #fafafa; + --cpd-color-theme-bg: #ffffff; +} diff --git a/theme.sh b/theme.sh index 8aee68d..58927ff 100755 --- a/theme.sh +++ b/theme.sh @@ -37,6 +37,8 @@ replace_colors() { MESSAGE_BUBBLE_BACKGROUND="#424242" MESSAGE_BUBBLE_BACKGROUND_SELF="#303030" MESSAGE_BUBBLE_BACKGROUND_SELECTED="#3f4931" + ROOMLIST_BG_COLOR="#303030" + SPACELIST_BG_COLOR="#424242" else echo "Replacing colors (light) for $f..." BG_ACCENT="$M_ACCENT_LIGHT" @@ -48,6 +50,8 @@ replace_colors() { MESSAGE_BUBBLE_BACKGROUND="#eeeeee" MESSAGE_BUBBLE_BACKGROUND_SELF="#f1f8e9" MESSAGE_BUBBLE_BACKGROUND_SELECTED="#dbedc6" + ROOMLIST_BG_COLOR="#eeeeee" + SPACELIST_BG_COLOR="#fafafa" fi # Neutral colors sed -i 's|#15171b|#212121|gi' "$f" @@ -110,6 +114,7 @@ replace_colors() { sed -i 's|rgba(33, 38, 44,|rgba(48, 48, 48,|gi' "$f" sed -i 's|rgba(34, 38, 46,|rgba(48, 48, 48,|gi' "$f" sed -i 's|rgba(38, 39, 43,|rgba(48, 48, 48,|gi' "$f" + sed -i 's|rgba(38, 40, 45,|rgba(48, 48, 48,|gi' "$f" sed -i 's|rgba(46, 48, 51,|rgba(48, 48, 48,|gi' "$f" sed -i 's|rgba(92, 100, 112,|rgba(97, 97, 97,|gi' "$f" sed -i 's|rgba(141, 151, 165,|rgba(144, 144, 144,|gi' "$f" @@ -127,6 +132,9 @@ replace_colors() { sed -i "s|\\(\$presence-offline: \\).*;|\\1$PRESENCE_OFFLINE;|gi" "$f" + sed -i "s|\\(\$roomlist-bg-color: \\).*;|\\1$ROOMLIST_BG_COLOR;|gi" "$f" + sed -i "s|\\(\$spacePanel-bg-color: \\).*;|\\1$SPACELIST_BG_COLOR;|gi" "$f" + # Accent colors sed -i "s|#368bd6|$M_ACCENT|gi" "$f" sed -i "s|#ac3ba8|$M_ACCENT|gi" "$f" From 0e85ad2ccbd4783060ad560f79e8be7b7d4bcdb9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:03:21 +0200 Subject: [PATCH 41/61] Try out some darker background --- res/css/sc-cpd-overrides.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css index bffb61c..d22ec65 100644 --- a/res/css/sc-cpd-overrides.css +++ b/res/css/sc-cpd-overrides.css @@ -84,8 +84,8 @@ --cpd-color-gray-400: #303030; --cpd-color-gray-300: #212121; --cpd-color-gray-200: #212121; - --cpd-color-gray-100: #212121; - --cpd-color-theme-bg: #212121; + --cpd-color-gray-100: #171717; + --cpd-color-theme-bg: #171717; } .cpd-theme-light.cpd-theme-light { From 3b246ff33fac5552355d0aa9ec3fd3ec3b9d3296 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:07:44 +0200 Subject: [PATCH 42/61] Update patches with more theme tweaks --- matrix-react-sdk | 2 +- ...-Import-SC-compound-theme-overrides.patch} | 2 +- ...-damn-avatar-background-in-room-list.patch | 26 ++++++++++++++++ .../0018-No-red-messages-in-1-1-chats.patch | 30 +++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) rename patches/matrix-react-sdk/{0016-Import-SC-compound-theme-overrides.patch => 0015-Import-SC-compound-theme-overrides.patch} (94%) create mode 100644 patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch create mode 100644 patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch diff --git a/matrix-react-sdk b/matrix-react-sdk index d160a1b..b3273f2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d160a1bbdef8a93a2139e0e159a5fc5eb7c8ed7a +Subproject commit b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 diff --git a/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch similarity index 94% rename from patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch rename to patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index e5aad3a..136ece8 100644 --- a/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 8b2c552f798e64974d0a0380f55cadb4f72dd67c Mon Sep 17 00:00:00 2001 +From 553d957b6d9ef9dd4d730c640a75bbb75fd36f88 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides diff --git a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch new file mode 100644 index 0000000..260eaec --- /dev/null +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -0,0 +1,26 @@ +From d37ff20103b5a650f626ba9910e9ce1f6f7d59b9 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 + +--- + src/components/structures/BackdropPanel.tsx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx +index 80c21235cc..a9c464f4b2 100644 +--- a/src/components/structures/BackdropPanel.tsx ++++ b/src/components/structures/BackdropPanel.tsx +@@ -13,6 +13,9 @@ interface IProps { + } + + export const BackdropPanel: React.FC = ({ backgroundImage, blurMultiplier }) => { ++ // SC: no damn avatar background in room list ++ return null; ++ + if (!backgroundImage) return null; + + const styles: CSSProperties = {}; +-- +2.47.0 + diff --git a/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch b/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch new file mode 100644 index 0000000..85c8dc9 --- /dev/null +++ b/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch @@ -0,0 +1,30 @@ +From b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 Mon Sep 17 00:00:00 2001 +From: su-ex +Date: Tue, 22 Dec 2020 19:16:28 +0100 +Subject: =?UTF-8?q?No=20red=20messages=20in=201:1=20chats=0AClose=20Schild?= + =?UTF-8?q?iChat/schildichat-desktop#13?= + +--- + src/components/views/rooms/EventTile.tsx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx +index 746cceabd8..3e5879f7ad 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 + return false; + } + ++ // don't show highlights in 1:1 rooms ++ const room = cli.getRoom(this.props.mxEvent.getRoomId()); ++ if (room && room.currentState.getJoinedMemberCount() === 2) { ++ return false; ++ } ++ + return !!(actions?.tweaks.highlight || previousActions?.tweaks.highlight); + } + +-- +2.47.0 + From 239da124ad3300a0393376f8345fc7383acbd603 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:30:45 +0200 Subject: [PATCH 43/61] Always round corners for message bubbles --- matrix-react-sdk | 2 +- ...ner-radius-to-all-edges-of-the-bubbl.patch | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch diff --git a/matrix-react-sdk b/matrix-react-sdk index b3273f2..d8699bf 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 +Subproject commit d8699bf1f31e411b5386554110859e85520957fb diff --git a/patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch new file mode 100644 index 0000000..876cfe3 --- /dev/null +++ b/patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -0,0 +1,61 @@ +From d8699bf1f31e411b5386554110859e85520957fb 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 + +--- + res/css/views/rooms/_EventBubbleTile.pcss | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss +index ec443c44de..8e0f3cf1b6 100644 +--- a/res/css/views/rooms/_EventBubbleTile.pcss ++++ b/res/css/views/rooms/_EventBubbleTile.pcss +@@ -277,6 +277,8 @@ Please see LICENSE files in the repository root for full details. + margin-inline: var(--EventTile_bubble_line-margin-inline-start) var(--EventTile_bubble_line-margin-inline-end); + border-top-left-radius: var(--cornerRadius); + border-top-right-radius: var(--cornerRadius); ++ border-bottom-left-radius: var(--cornerRadius); ++ border-bottom-right-radius: var(--cornerRadius); + + /* the selector here is quite weird because timestamps can appear linked & unlinked and in different places */ + /* in the DOM depending on the specific rendering context */ +@@ -371,7 +373,7 @@ Please see LICENSE files in the repository root for full details. + } + + &.mx_EventTile_continuation[data-self="false"] .mx_EventTile_line { +- border-top-left-radius: 0; ++ //border-top-left-radius: 0; + + .mx_MImageBody .mx_MImageBody_thumbnail_container, + .mx_MVideoBody .mx_MVideoBody_container, +@@ -379,7 +381,7 @@ Please see LICENSE files in the repository root for full details. + .mx_MediaBody, + .mx_MLocationBody_map, + .mx_MBeaconBody { +- border-top-left-radius: 0; ++ //border-top-left-radius: 0; + } + } + &.mx_EventTile_lastInSection[data-self="false"] .mx_EventTile_line { +@@ -396,7 +398,7 @@ Please see LICENSE files in the repository root for full details. + } + + &.mx_EventTile_continuation[data-self="true"] .mx_EventTile_line { +- border-top-right-radius: 0; ++ //border-top-right-radius: 0; + + .mx_MImageBody .mx_MImageBody_thumbnail_container, + .mx_MVideoBody .mx_MVideoBody_container, +@@ -404,7 +406,7 @@ Please see LICENSE files in the repository root for full details. + .mx_MediaBody, + .mx_MLocationBody_map, + .mx_MBeaconBody { +- border-top-right-radius: 0; ++ //border-top-right-radius: 0; + } + } + &.mx_EventTile_lastInSection[data-self="true"] .mx_EventTile_line { +-- +2.47.0 + From a130372946bddd34422669f835c7a7d4a36bf087 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:41:07 +0200 Subject: [PATCH 44/61] Fix missed element logo svg for icon_gen.sh --- element-web | 2 +- graphics/icon_gen.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/element-web b/element-web index 9219435..f3389d7 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9219435502cab75af63cfc4271fc0b53d096cee8 +Subproject commit f3389d724f9a44b572d740c1633ad0db62f624c7 diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh index b7fdf4f..d6938d1 100755 --- a/graphics/icon_gen.sh +++ b/graphics/icon_gen.sh @@ -55,6 +55,9 @@ for f in "$base_out"/*.png; do done +cp "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-logo.svg" + + repo_dir="$SCHILDI_ROOT/element-desktop" base_out="$repo_dir/res/img" From 7fbca648df55438ecc0fb11b75499386ef67b7ef Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:24 +0200 Subject: [PATCH 45/61] Always show timestamps by default --- matrix-react-sdk | 2 +- ...20-Always-show-timestamps-by-default.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch diff --git a/matrix-react-sdk b/matrix-react-sdk index d8699bf..ed9cc5c 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d8699bf1f31e411b5386554110859e85520957fb +Subproject commit ed9cc5c53cea9611099618761ab0646c2508114e diff --git a/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch new file mode 100644 index 0000000..e5743cf --- /dev/null +++ b/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch @@ -0,0 +1,25 @@ +From ed9cc5c53cea9611099618761ab0646c2508114e Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sun, 13 Oct 2024 13:53:07 +0200 +Subject: Always show timestamps by default + +--- + src/settings/Settings.tsx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx +index be4433e1bc..1052bca0c9 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -662,7 +662,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { + "alwaysShowTimestamps": { + supportedLevels: LEVELS_ACCOUNT_SETTINGS, + displayName: _td("settings|always_show_message_timestamps"), +- default: false, ++ default: true, + }, + "userTimezone": { + supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, +-- +2.47.0 + From dba9c78816a07b60346c414ae338fd58f0403c09 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 18:04:03 +0200 Subject: [PATCH 46/61] Rename binary to schildichat-desktop-alpha This will be the official successor to old schildichat-desktop builds, so drop "lite" from any user-facing naming. --- README.md | 7 ++----- overlay/element-desktop/package.json | 8 ++++---- overlay/element-web/package.json | 6 +++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1b5738a..b34abad 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,6 @@ -# SchildiChat Web/Desktop Lite +# SchildiChat Web/Desktop -SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). - -This branch builds the "lite" variant, which rebases a reduced feature set of the original fork on top of the latest Element, -in order to keep maintenance effort more manageable while staying up-to-date. +SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/element-hq/element-web)/[Desktop](https://github.com/element-hq/element-desktop). diff --git a/overlay/element-desktop/package.json b/overlay/element-desktop/package.json index 88634fa..d4b78d2 100644 --- a/overlay/element-desktop/package.json +++ b/overlay/element-desktop/package.json @@ -1,10 +1,10 @@ { - "name": "schildichat-desktop-lite", - "productName": "SchildiChatLite", - "description": "A Matrix Client based on Element with a more traditional instant messaging experience", + "name": "schildichat-desktop-alpha", + "productName": "SchildiChat", + "description": "A Matrix Client based on Element with some changes and tweaks", "author": "SchildiChat", "repository": { - "url": "https://github.com/SchildiChat/element-desktop" + "url": "https://github.com/SchildiChat/schildichat-desktop" }, "homepage": "https://schildi.chat/" } diff --git a/overlay/element-web/package.json b/overlay/element-web/package.json index 6b0127b..35e873a 100644 --- a/overlay/element-web/package.json +++ b/overlay/element-web/package.json @@ -1,8 +1,8 @@ { - "name": "schildichat-web-lite", - "description": "A Matrix client based on Element with a more traditional instant messaging experience", + "name": "schildichat-web-alpha", + "description": "A Matrix Client based on Element with some changes and tweaks", "author": "SchildiChat", "repository": { - "url": "https://github.com/SchildiChat/element-web" + "url": "https://github.com/SchildiChat/schildichat-desktop" } } From 522095b79ef3f210ca2ba00f0f18eec68f8cc490 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 18:11:47 +0200 Subject: [PATCH 47/61] Rebase to v1.11.81 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...002-Add-back-schildi-fetch-package.ts-modifications.patch | 2 +- .../0001-Add-fields-for-media-caption-support.patch | 2 +- patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch | 2 +- .../matrix-react-sdk/0002-Bring-back-unified-room-list.patch | 2 +- ...on-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...dd-support-for-rendering-captions-in-media-messages.patch | 2 +- patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch | 2 +- ...ide-the-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 +- ...ring-back-showSpaceDMBadges-setting-force-enabled-f.patch | 2 +- ...quashed-Freeform-reactions-from-tadzik-freeform-rea.patch | 2 +- .../0011-Allow-reactions-to-take-more-space.patch | 2 +- ...n-space-switch-don-t-automatically-show-last-opened.patch | 2 +- .../0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- .../matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch | 2 +- .../0015-Import-SC-compound-theme-overrides.patch | 2 +- .../0016-No-damn-avatar-background-in-room-list.patch | 2 +- ...-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch} | 5 ++--- ...ways-apply-corner-radius-to-all-edges-of-the-bubbl.patch} | 2 +- ...lt.patch => 0019-Always-show-timestamps-by-default.patch} | 2 +- 25 files changed, 26 insertions(+), 27 deletions(-) rename patches/matrix-react-sdk/{0018-No-red-messages-in-1-1-chats.patch => 0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch} (82%) rename patches/matrix-react-sdk/{0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch => 0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch} (97%) rename patches/matrix-react-sdk/{0020-Always-show-timestamps-by-default.patch => 0019-Always-show-timestamps-by-default.patch} (92%) diff --git a/element-desktop b/element-desktop index 47dbe68..e2de1d0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 47dbe68b2a715af9dbb26ba366a0207f5cfaa227 +Subproject commit e2de1d0bae0b16dd2ad81d71a4e3ce4068ff1c98 diff --git a/element-web b/element-web index f3389d7..7942825 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f3389d724f9a44b572d740c1633ad0db62f624c7 +Subproject commit 7942825f423c206c35b6b01c5cf59572f6af6c02 diff --git a/matrix-js-sdk b/matrix-js-sdk index 52798a9..400efbe 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 52798a9d777321422353ca88b27249a6fb0473b3 +Subproject commit 400efbe5175939db5e70c54de2c9d42e1932cf16 diff --git a/matrix-react-sdk b/matrix-react-sdk index ed9cc5c..d38faa8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit ed9cc5c53cea9611099618761ab0646c2508114e +Subproject commit d38faa8f05f2b3a25aea47b18538431fab70efaa 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 462322a..0fdfc8a 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 6c463bac95962effa26e7f95e0d56dd3ea50dc80 Mon Sep 17 00:00:00 2001 +From 14d2d06a2831bf794d643bb91be0f5afc4a159ca 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 27a05d9..c8b7a6c 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 52798a9d777321422353ca88b27249a6fb0473b3 Mon Sep 17 00:00:00 2001 +From 400efbe5175939db5e70c54de2c9d42e1932cf16 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 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 2004021..7739b95 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 b245cc816714627339aaf229657c8a14c73f96e9 Mon Sep 17 00:00:00 2001 +From 3f02a0d47b3c86f94df8b697e6100ff373a5384f 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 41a43aa..772b810 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 15906208d9d34cb9115e1ffa5ceb76d0d54c4125 Mon Sep 17 00:00:00 2001 +From 89c95ab2ec61fe5c3930480af2a1627f819844ee Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list 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 ae8877f..c8d0b26 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 70614b5c6e4061ec1c9d90cbf11782e683b17be6 Mon Sep 17 00:00:00 2001 +From d3573889e17f4f4726d129626e5f0597b138daa0 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 e28ee51..a46fdf4 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 597775e0fb261509b1afecc30c5a5031156c9a66 Mon Sep 17 00:00:00 2001 +From 89bb8eaba1c9fb9d437379daab11b3266c1fc48d 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 65f077a..6d139a9 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 66ac6916f3b57576711c0a3d71c2a7c133f4432b Mon Sep 17 00:00:00 2001 +From 85ce1e9f141ef9c2bb5295f2190e4e67c2bd2a06 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 040b871..cf18ca6 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 0c4e3c5ee2c74ed1f55f0e1965766e896fe79737 Mon Sep 17 00:00:00 2001 +From 49be0de042ea55ca212b819cd173621c9ae5819a 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 7917d42..3efe62a 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 a4fe784a2fe7847319d0a63498a237be0b12d988 Mon Sep 17 00:00:00 2001 +From 13d874b18dfd58eb4c2bdf71f963c1309478c7c3 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 6a58ead..95cc9b0 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 a323175c5a6f3b2f625b0c1359ff6ad89b663027 Mon Sep 17 00:00:00 2001 +From 00ca0cba6bb076b81992dc7c92f93efc00fdd6ed 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 2443326..8db4678 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 b2b850561bdd6fb7c2b73e63aae7b49fa3fd9c13 Mon Sep 17 00:00:00 2001 +From 08b9bb8fabc9255f17a46d44afd214b1fb8ec4ba 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 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 f1f2631..90e0089 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 b7e9f92671330c3b8ae387b6810a391d4bf49207 Mon Sep 17 00:00:00 2001 +From e4cb5dc12ebe1159ae843c99e93e7a91e7f4a8de 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 6e8d6f1..a9b2c96 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 378c416883b6870ef453f39199c44de14d162f81 Mon Sep 17 00:00:00 2001 +From d488b944b1577dfd3469532a6652172baf900b58 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 b23198c..3f8ecbe 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 16e186a3cb6d1929e49afe2feb3b486d9bca10a9 Mon Sep 17 00:00:00 2001 +From 63532e2582e0d2cec771cb864b6fe211640c685b 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 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 8739751..468d7dc 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 6eac7d7c2abaaaa59432bc7ed8c7a7d527fb66ae Mon Sep 17 00:00:00 2001 +From 724b9e916dcdc18fb129f0861871d4eca4d5d053 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 45e461c..a5f07c2 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 a0f93aab26752267e4ef6512d6eccd64a5c8eeb7 Mon Sep 17 00:00:00 2001 +From 10a8e40f96a540a35b253c99f913858cea8db56e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble diff --git a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index 136ece8..a55f479 100644 --- a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 553d957b6d9ef9dd4d730c640a75bbb75fd36f88 Mon Sep 17 00:00:00 2001 +From 8eddbc5b580616be6cce626acf67f856e88d217f Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides diff --git a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch index 260eaec..320a70c 100644 --- a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From d37ff20103b5a650f626ba9910e9ce1f6f7d59b9 Mon Sep 17 00:00:00 2001 +From 224976a0eec90876a7226f217c98bc8b846c1584 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 diff --git a/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch similarity index 82% rename from patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch rename to patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 85c8dc9..788f4ab 100644 --- a/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch +++ b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,8 +1,7 @@ -From b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 Mon Sep 17 00:00:00 2001 +From d4c1653ba04afd5b176b83c6348ae7d9d2580080 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 22 Dec 2020 19:16:28 +0100 -Subject: =?UTF-8?q?No=20red=20messages=20in=201:1=20chats=0AClose=20Schild?= - =?UTF-8?q?iChat/schildichat-desktop#13?= +Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13 --- src/components/views/rooms/EventTile.tsx | 6 ++++++ diff --git a/patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch similarity index 97% rename from patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch rename to patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index 876cfe3..d7a8e5e 100644 --- a/patches/matrix-react-sdk/0019-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From d8699bf1f31e411b5386554110859e85520957fb Mon Sep 17 00:00:00 2001 +From 0f7bc2e7ba410996da05b1c8f96541a9d77cc587 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 diff --git a/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch similarity index 92% rename from patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch rename to patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch index e5743cf..18a3880 100644 --- a/patches/matrix-react-sdk/0020-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From ed9cc5c53cea9611099618761ab0646c2508114e Mon Sep 17 00:00:00 2001 +From cd4f60f04eb1eabb3804b27b9a283eb1c971e304 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default From f9c56fa484a4e60a328c0ce0b78fabae6fe480fa Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 18:21:24 +0200 Subject: [PATCH 48/61] Don't welcome to Element --- element-web | 2 +- i18n-overlays/element-web/en_EN.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/element-web b/element-web index 7942825..bb236d2 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 7942825f423c206c35b6b01c5cf59572f6af6c02 +Subproject commit bb236d239f2fff683c184bf862f5baf964501efa diff --git a/i18n-overlays/element-web/en_EN.json b/i18n-overlays/element-web/en_EN.json index 0967ef4..e707661 100644 --- a/i18n-overlays/element-web/en_EN.json +++ b/i18n-overlays/element-web/en_EN.json @@ -1 +1,3 @@ -{} +{ + "Welcome to SchildiChat": "Welcome to SchildiChat" +} From c66d4c4371c60de05b7b63b778bda767b82a6089 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 18:34:16 +0200 Subject: [PATCH 49/61] push_current_sc_branches.sh: Allow passing arguments to git push --- push_current_sc_branches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/push_current_sc_branches.sh b/push_current_sc_branches.sh index 51cab81..7a34314 100755 --- a/push_current_sc_branches.sh +++ b/push_current_sc_branches.sh @@ -37,4 +37,4 @@ fi branch="$b_js" echo "Pushing to all repos: $branch" -forall_repos git push --set-upstream origin "$branch" +forall_repos git push --set-upstream origin "$branch" "$@" From 8f8ba87d7cd973c63153a5c95958ef434ba52515 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 18:34:46 +0200 Subject: [PATCH 50/61] Keep naming it SchildiChatAlpha to separate .config dirs from old --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- overlay/element-desktop/package.json | 2 +- .../0002-Add-back-schildi-fetch-package.ts-modifications.patch | 2 +- .../0001-Add-fields-for-media-caption-support.patch | 2 +- patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch | 2 +- .../matrix-react-sdk/0002-Bring-back-unified-room-list.patch | 2 +- ...3-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch | 2 +- ...4-Add-support-for-rendering-captions-in-media-messages.patch | 2 +- patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch | 2 +- ...6-Hide-the-mute-notification-state-the-same-way-as-the.patch | 2 +- .../0007-Allow-muted-rooms-to-render-as-unread.patch | 2 +- .../matrix-react-sdk/0008-Increase-default-visible-tiles.patch | 2 +- ...9-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch | 2 +- ...0-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch | 2 +- .../0011-Allow-reactions-to-take-more-space.patch | 2 +- ...2-On-space-switch-don-t-automatically-show-last-opened.patch | 2 +- .../matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch | 2 +- patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch | 2 +- .../0015-Import-SC-compound-theme-overrides.patch | 2 +- .../0016-No-damn-avatar-background-in-room-list.patch | 2 +- ...7-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch | 2 +- ...8-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch | 2 +- .../0019-Always-show-timestamps-by-default.patch | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/element-desktop b/element-desktop index e2de1d0..96aa172 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e2de1d0bae0b16dd2ad81d71a4e3ce4068ff1c98 +Subproject commit 96aa1725d46fe9858108eff051711838da2d60fc diff --git a/element-web b/element-web index bb236d2..60754c1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bb236d239f2fff683c184bf862f5baf964501efa +Subproject commit 60754c17d92a1e8d9790dfb476f703949b60ce47 diff --git a/matrix-js-sdk b/matrix-js-sdk index 400efbe..6390182 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 400efbe5175939db5e70c54de2c9d42e1932cf16 +Subproject commit 63901825c14da3ec6f59017d2696ad98be91d2e0 diff --git a/matrix-react-sdk b/matrix-react-sdk index d38faa8..6ef8e87 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d38faa8f05f2b3a25aea47b18538431fab70efaa +Subproject commit 6ef8e87317ba60fa6066f7e1b510f8844a576f3c diff --git a/overlay/element-desktop/package.json b/overlay/element-desktop/package.json index d4b78d2..f8d8434 100644 --- a/overlay/element-desktop/package.json +++ b/overlay/element-desktop/package.json @@ -1,6 +1,6 @@ { "name": "schildichat-desktop-alpha", - "productName": "SchildiChat", + "productName": "SchildiChatAlpha", "description": "A Matrix Client based on Element with some changes and tweaks", "author": "SchildiChat", "repository": { 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 0fdfc8a..61764fe 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 14d2d06a2831bf794d643bb91be0f5afc4a159ca Mon Sep 17 00:00:00 2001 +From e326039d1acbc5da0cdd95dc235646202264d3c3 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 c8b7a6c..70aff3f 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 400efbe5175939db5e70c54de2c9d42e1932cf16 Mon Sep 17 00:00:00 2001 +From 63901825c14da3ec6f59017d2696ad98be91d2e0 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 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index 7739b95..f8f0dce 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 3f02a0d47b3c86f94df8b697e6100ff373a5384f Mon Sep 17 00:00:00 2001 +From 913772283fd2b9f682a11a594061a6a1189b7869 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 772b810..81bd614 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 89c95ab2ec61fe5c3930480af2a1627f819844ee Mon Sep 17 00:00:00 2001 +From e2045dd5dcbd82f7b5c4f98d89b258cc304d3e26 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list 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 c8d0b26..2363d5b 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 d3573889e17f4f4726d129626e5f0597b138daa0 Mon Sep 17 00:00:00 2001 +From 1d3847da55e91dfc5e555e69fbadcbc1d033a8d9 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 a46fdf4..f097ae4 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 89bb8eaba1c9fb9d437379daab11b3266c1fc48d Mon Sep 17 00:00:00 2001 +From ac0fb82339fc580da9db60c183a39d72e6fba3ea 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 6d139a9..b935d6e 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 85ce1e9f141ef9c2bb5295f2190e4e67c2bd2a06 Mon Sep 17 00:00:00 2001 +From 0f0f80d270be5c88b0b762b51fe570c11b0bea7f 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 cf18ca6..eafb725 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 49be0de042ea55ca212b819cd173621c9ae5819a Mon Sep 17 00:00:00 2001 +From bc49b8d30cf7e0da038fac992ee2ff04c9dc91aa 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 3efe62a..dd98773 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 13d874b18dfd58eb4c2bdf71f963c1309478c7c3 Mon Sep 17 00:00:00 2001 +From 10b23f715bf5115715dca07676ca467a6433c9c9 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 95cc9b0..e2d8e51 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 00ca0cba6bb076b81992dc7c92f93efc00fdd6ed Mon Sep 17 00:00:00 2001 +From 641cd216c155318e35eabef30761613706e36c87 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 8db4678..7ef1a39 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 08b9bb8fabc9255f17a46d44afd214b1fb8ec4ba Mon Sep 17 00:00:00 2001 +From 2203554625f7c8d924981b3cd03b1389dc6873d9 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 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 90e0089..a281def 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 e4cb5dc12ebe1159ae843c99e93e7a91e7f4a8de Mon Sep 17 00:00:00 2001 +From 961ee28392810973057a0c8af410e1067a15547a 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 a9b2c96..c9b4019 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 d488b944b1577dfd3469532a6652172baf900b58 Mon Sep 17 00:00:00 2001 +From 794b8d3b7ccfbea95cba180b13de0ed42e7fc6c2 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 3f8ecbe..b224046 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 63532e2582e0d2cec771cb864b6fe211640c685b Mon Sep 17 00:00:00 2001 +From b43bf7e8a183f36e30e9b79e3fc2dcd14afc6823 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 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 468d7dc..49b0d89 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 724b9e916dcdc18fb129f0861871d4eca4d5d053 Mon Sep 17 00:00:00 2001 +From 3aa2246c56ae3e5b7703003ef785d6e3ad77b844 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 a5f07c2..e4b33fc 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 10a8e40f96a540a35b253c99f913858cea8db56e Mon Sep 17 00:00:00 2001 +From 288aa3cf8e56a4ca60810eac98fb6f692b154f61 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble diff --git a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index a55f479..d823f0d 100644 --- a/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 8eddbc5b580616be6cce626acf67f856e88d217f Mon Sep 17 00:00:00 2001 +From a4bca41b7371c42499fd8c805482066514a9edc2 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides diff --git a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch index 320a70c..2fa7d3a 100644 --- a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -1,4 +1,4 @@ -From 224976a0eec90876a7226f217c98bc8b846c1584 Mon Sep 17 00:00:00 2001 +From fc577303d8c2d290f1c17e13deaf442822af68a1 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 diff --git a/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch index 788f4ab..b81a35b 100644 --- a/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch +++ b/patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch @@ -1,4 +1,4 @@ -From d4c1653ba04afd5b176b83c6348ae7d9d2580080 Mon Sep 17 00:00:00 2001 +From e4a7ea01c2fd9f7d67660402c20bfdc5969f28c4 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 diff --git a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch index d7a8e5e..76d5935 100644 --- a/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch +++ b/patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch @@ -1,4 +1,4 @@ -From 0f7bc2e7ba410996da05b1c8f96541a9d77cc587 Mon Sep 17 00:00:00 2001 +From a37ca889b832578a9201a5b45b059f58eb781bc5 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 diff --git a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch index 18a3880..8abccc6 100644 --- a/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch +++ b/patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch @@ -1,4 +1,4 @@ -From cd4f60f04eb1eabb3804b27b9a283eb1c971e304 Mon Sep 17 00:00:00 2001 +From 57942189da5f80069ee4b03dc2fbeb24ce6b4f7b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 13:53:07 +0200 Subject: Always show timestamps by default From f00efcb568d4cd465233ddfdd93dd1b0b5b253f0 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:14:57 +0200 Subject: [PATCH 51/61] Switch to less aggressive hover color --- matrix-react-sdk | 2 +- theme.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/matrix-react-sdk b/matrix-react-sdk index 6ef8e87..1fa713e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 6ef8e87317ba60fa6066f7e1b510f8844a576f3c +Subproject commit 1fa713ee3675cf0f5efa62e221d395aa3246018c diff --git a/theme.sh b/theme.sh index 58927ff..2255068 100755 --- a/theme.sh +++ b/theme.sh @@ -36,7 +36,7 @@ replace_colors() { PRESENCE_OFFLINE="#e0e0e0" # not applied because not existing specifically for dark MESSAGE_BUBBLE_BACKGROUND="#424242" MESSAGE_BUBBLE_BACKGROUND_SELF="#303030" - MESSAGE_BUBBLE_BACKGROUND_SELECTED="#3f4931" + MESSAGE_BUBBLE_BACKGROUND_SELECTED="#212121" ROOMLIST_BG_COLOR="#303030" SPACELIST_BG_COLOR="#424242" else @@ -49,7 +49,7 @@ replace_colors() { PRESENCE_OFFLINE="#bdbdbd" # for light this should actually be darker MESSAGE_BUBBLE_BACKGROUND="#eeeeee" MESSAGE_BUBBLE_BACKGROUND_SELF="#f1f8e9" - MESSAGE_BUBBLE_BACKGROUND_SELECTED="#dbedc6" + MESSAGE_BUBBLE_BACKGROUND_SELECTED="#e0e0e0" ROOMLIST_BG_COLOR="#eeeeee" SPACELIST_BG_COLOR="#fafafa" fi From d9984f6f40b61a67224dec1c260899add51e58af Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:37:44 +0200 Subject: [PATCH 52/61] Better dark theme secondary text color --- res/css/sc-cpd-overrides.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css index d22ec65..9842093 100644 --- a/res/css/sc-cpd-overrides.css +++ b/res/css/sc-cpd-overrides.css @@ -5,6 +5,8 @@ */ .cpd-theme-dark.cpd-theme-dark { + --cpd-color-text-primary: #ffffff; + --cpd-color-text-secondary: rgba(255, 255, 255, 0.7); /* TODO? --cpd-color-alpha-green-1400: hsla(152, 88%, 94%, 0.96); --cpd-color-alpha-green-1300: hsla(152, 93%, 88%, 0.91); From 915e74ae7ab2baf41ec2901f3e8cb235cdbb32a8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Oct 2024 19:41:46 +0200 Subject: [PATCH 53/61] Enable custom emote rendering by default --- matrix-react-sdk | 2 +- ...le-custom-emote-rendering-by-default.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch diff --git a/matrix-react-sdk b/matrix-react-sdk index 1fa713e..47bcb08 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1fa713ee3675cf0f5efa62e221d395aa3246018c +Subproject commit 47bcb08e971256fe94a0b07fb553b75400e648ed diff --git a/patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch b/patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch new file mode 100644 index 0000000..2db22df --- /dev/null +++ b/patches/matrix-react-sdk/0021-Enable-custom-emote-rendering-by-default.patch @@ -0,0 +1,25 @@ +From 47bcb08e971256fe94a0b07fb553b75400e648ed 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 + +--- + src/settings/Settings.tsx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx +index 1052bca0c9..f5fcb5d7a5 100644 +--- a/src/settings/Settings.tsx ++++ b/src/settings/Settings.tsx +@@ -514,7 +514,7 @@ export const SETTINGS: { [setting: string]: ISetting } = { + 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 +-- +2.47.0 + From 8069120847f03aaa4bb3dbd4a2e2374585fd5b6c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 18 Oct 2024 18:15:42 +0200 Subject: [PATCH 54/61] Tweak dark theme text colors a bit more --- res/css/sc-cpd-overrides.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css index 9842093..a9987b0 100644 --- a/res/css/sc-cpd-overrides.css +++ b/res/css/sc-cpd-overrides.css @@ -5,8 +5,8 @@ */ .cpd-theme-dark.cpd-theme-dark { - --cpd-color-text-primary: #ffffff; - --cpd-color-text-secondary: rgba(255, 255, 255, 0.7); + --cpd-color-text-primary: rgba(255, 255, 255, 0.9); + --cpd-color-text-secondary: rgba(255, 255, 255, 0.65); /* TODO? --cpd-color-alpha-green-1400: hsla(152, 88%, 94%, 0.96); --cpd-color-alpha-green-1300: hsla(152, 93%, 88%, 0.91); From a8f231f80f990e533d0f5e4fe65cebb3e507b782 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 19 Oct 2024 15:35:40 +0200 Subject: [PATCH 55/61] Remove outdated publish_release.sh This script pushes branches in the old style, use push_current_sc_branches.sh instead. --- publish_release.sh | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100755 publish_release.sh diff --git a/publish_release.sh b/publish_release.sh deleted file mode 100755 index cd5874c..0000000 --- a/publish_release.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -set -e - -mydir="$(dirname "$(realpath "$0")")" - -pushd "$mydir" > /dev/null - -source ./merge_helpers.sh - -# Check branch -check_branch $branch -forall_repos check_branch $branch - -# Ensure clean git state -forall_repos check_clean_git - -git fetch origin -git branch -D master || true -git checkout -b master --track origin/master -git merge --ff-only sc -git push -git checkout sc -forall_repos git fetch origin -forall_repos git branch -D master || true -forall_repos git checkout -b master --track origin/master -forall_repos git merge --ff-only sc -forall_repos git push -forall_repos git checkout sc - -popd > /dev/null From 70a053f7d9eaca18d383c9ccdca8fa1be0d03cd8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 19 Oct 2024 16:00:30 +0200 Subject: [PATCH 56/61] Update containers and fix some release builds --- Containerfile.debian | 7 ++++--- Containerfile.fedora | 5 +++-- Makefile | 11 ++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Containerfile.debian b/Containerfile.debian index 85222fc..6eb9310 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION -FROM docker.io/node:${NODE_VERSION}-buster +FROM docker.io/node:${NODE_VERSION}-bookworm RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ curl \ @@ -14,13 +14,14 @@ RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ make \ openssl \ pkg-config \ - python \ + python3 \ tcl \ vim +RUN ln -s /usr/bin/python3 /usr/bin/python ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -WORKDIR /project \ No newline at end of file +WORKDIR /project diff --git a/Containerfile.fedora b/Containerfile.fedora index a886a89..d1074da 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,4 +1,4 @@ -FROM docker.io/fedora:38 +FROM docker.io/fedora:40 RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl @@ -12,10 +12,11 @@ RUN npm install -g n RUN npm install -g yarn RUN npm install -g node-gyp RUN gem install --no-user-install --no-document fpm +RUN ln -s /usr/bin/python3 /usr/bin/python ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -WORKDIR /project \ No newline at end of file +WORKDIR /project diff --git a/Makefile b/Makefile index 472d391..56ead93 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,11 @@ all: web YARN ?= yarnpkg CONTAINER_ENGINE ?= podman -NODE_VERSION ?= 18 +NODE_VERSION ?= 22 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') -WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') +#WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') +WEB_APP_NAME := element DESKTOP_APP_NAME := $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') PRODUCT_NAME := $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') @@ -186,9 +187,9 @@ container-appimage-release: container-build-debian container-windows-release: container-build-windows $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make windows-release -container-release: container-build-windows container-build-fedora - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release windows-setup-release windows-portable-release - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release +container-release: container-build-windows #container-build-fedora + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release rpm-release windows-setup-release windows-portable-release + #$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release container-local-pkgbuild: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild From 8e8d8742360ce20969139792db828f48c42a41b7 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 19 Oct 2024 15:40:26 +0200 Subject: [PATCH 57/61] Prepare prerelease --- deploy/create-github-release.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deploy/create-github-release.sh b/deploy/create-github-release.sh index b93f7d5..63c327c 100755 --- a/deploy/create-github-release.sh +++ b/deploy/create-github-release.sh @@ -10,12 +10,16 @@ set -e version="$1" releasepath="$2" -github_api_token=`cat ~/githubtoken` +if [ -z "$GITHUB_API_TOKEN" ]; then + github_api_token=`cat ~/githubtoken` +else + github_api_token="$GITHUB_API_TOKEN" +fi release_notes_file="/tmp/scrn.md" owner=SchildiChat repo=schildichat-desktop -target=master +target=lite # Define variables GH_API="https://api.github.com" @@ -37,7 +41,7 @@ json_string=`jq -n --arg tag "v$version" --arg target "$target" --arg body "$rel name: $tag, body: $body, draft: true, - prerelease: false + prerelease: true }'` # echo "$json_string" res=`echo "$json_string" | curl -sH "$AUTH" $GH_REPO/releases -d @-` From 85546de7b728180cab0c600321c9efc740efe6ee Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 20 Oct 2024 15:32:25 +0200 Subject: [PATCH 58/61] Fix rpm build with debian --- Containerfile.debian | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile.debian b/Containerfile.debian index 6eb9310..86614ba 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -15,6 +15,7 @@ RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ openssl \ pkg-config \ python3 \ + rpm \ tcl \ vim RUN ln -s /usr/bin/python3 /usr/bin/python From a8eb3ece19d37c79143c9c521f1449e01c057b4e Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 20 Oct 2024 15:35:27 +0200 Subject: [PATCH 59/61] Stop requiring webapp symlink Causes issues on Windows-native compile --- Makefile | 2 +- setup.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 56ead93..96fa180 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ clean: $(YARN) --cwd matrix-react-sdk clean $(YARN) --cwd element-web clean $(YARN) --cwd element-desktop clean - rm -f element-desktop/webapp + rm -f element-desktop/webapp || true rm -rf element-web/dist rm -rf local-pkgbuild rm -f bom.lock diff --git a/setup.sh b/setup.sh index a919ade..0344ec2 100755 --- a/setup.sh +++ b/setup.sh @@ -25,7 +25,6 @@ popd pushd element-desktop $yarn install -ln -s ../element-web/webapp ./ || true # Seshat: compare https://github.com/element-hq/element-desktop/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms $yarn add matrix-seshat #$yarn add electron-build-env From 630f4f786eae55a2924f1728c863c14d9e9cdf4b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 20 Oct 2024 17:01:12 +0200 Subject: [PATCH 60/61] Fix webapp compile on Windows --- matrix-react-sdk | 2 +- ...link-css-to-fix-Windows-native-build.patch | 32 +++++++++++++++++++ setup.sh | 3 ++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch diff --git a/matrix-react-sdk b/matrix-react-sdk index 47bcb08..16fe0fe 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 47bcb08e971256fe94a0b07fb553b75400e648ed +Subproject commit 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7 diff --git a/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch b/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch new file mode 100644 index 0000000..124a69c --- /dev/null +++ b/patches/matrix-react-sdk/0022-Don-t-symlink-css-to-fix-Windows-native-build.patch @@ -0,0 +1,32 @@ +From 16fe0fe8d0068e4c5da3fa5516c5578d2ffaabc7 Mon Sep 17 00:00:00 2001 +From: SpiritCroc +Date: Sun, 20 Oct 2024 17:00:19 +0200 +Subject: Don't symlink css to fix Windows-native build + +--- + .gitignore | 2 ++ + res/css/sc-cpd-overrides.css | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + delete mode 120000 res/css/sc-cpd-overrides.css + +diff --git a/.gitignore b/.gitignore +index 3137cd555b..5345301b97 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,3 +1,5 @@ ++res/css/sc-*.css ++ + /.npmrc + /*.log + package-lock.json +diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css +deleted file mode 120000 +index 532e96fddc..0000000000 +--- a/res/css/sc-cpd-overrides.css ++++ /dev/null +@@ -1 +0,0 @@ +-../../../res/css/sc-cpd-overrides.css +\ No newline at end of file +-- +2.47.0 + diff --git a/setup.sh b/setup.sh index 0344ec2..65e945a 100755 --- a/setup.sh +++ b/setup.sh @@ -34,3 +34,6 @@ popd pushd i18n-helper $yarn install popd + +# CSS overrides +cp res/css/* matrix-react-sdk/res/css/ From c6286dafc7dd999ea9eaf79d5bf82cfafac16727 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 20 Oct 2024 17:09:37 +0200 Subject: [PATCH 61/61] Add dedicated linux-container-release make target Windows targets should be compiled on windows natively --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 96fa180..ab3280b 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,9 @@ container-release: container-build-windows #container-build-fedora $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release rpm-release windows-setup-release windows-portable-release #$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release +linux-container-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release debian-release appimage-release rpm-release + container-local-pkgbuild: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild