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

Upstream v1.11.84-rc.0: Get rid of matrix-react-sdk

Browse Source
This commit is contained in:
SpiritCroc 2024-10-30 18:07:40 +01:00
parent 9f65d55aad
commit aa69433842
45 changed files with 69 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "matrix-js-sdk"]
path = matrix-js-sdk
url = https://github.com/SchildiChat/matrix-js-sdk.git
[submodule "matrix-react-sdk"]
path = matrix-react-sdk
url = https://github.com/SchildiChat/matrix-react-sdk.git
[submodule "element-web"]
path = element-web
url = https://github.com/SchildiChat/element-web.git

7
Makefile
View File

@ -202,7 +202,7 @@ linux-container-release: container-debian-based-release container-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
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock
./build-bom.sh
bom: bom.lock
@ -211,17 +211,16 @@ fix_yarn_cache:
clean:
$(YARN) --cwd matrix-js-sdk clean
$(YARN) --cwd matrix-react-sdk clean
$(YARN) --cwd element-web clean
$(YARN) --cwd element-desktop clean
rm -f element-desktop/webapp || true
rm -rf element-web/dist
rm -rf local-pkgbuild
rm -f bom.lock
rm -f matrix-react-sdk/res/css/sc-cpd-overrides.css
rm -f element-web/res/css/sc-cpd-overrides.css
undo_setup:
rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
rm -rf element-desktop/node_modules element-web/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
fixup: undo_setup fix_yarn_cache
make setup

5
README.md
View File

@ -85,15 +85,14 @@ See [here](RELEASE.md).
## Building SchildiChat Web/Desktop
This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.
This particular repo is a wrapper project for element-desktop, element-web, and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.
The `master` branch contains the latest release.
Development happens in the `sc` branch, which might be **broken at any time**!
<pre><code><b>schildichat-desktop</b> <i>&lt;-- this repo</i> (recommended starting point to build SchildiChat for Web <b>and</b> Desktop)
|-- <a href="https://github.com/SchildiChat/element-desktop">element-desktop</a> (electron wrapper)
|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> ("skin" for matrix-react-sdk)
|-- <a href="https://github.com/SchildiChat/matrix-react-sdk">matrix-react-sdk</a> (most of the development happens here)
|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> (most of the development happens here)
`-- <a href="https://github.com/SchildiChat/matrix-js-sdk">matrix-js-sdk</a> (Matrix client js sdk)
</code></pre>

6
apply_patches.sh
View File

@ -16,10 +16,8 @@ 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 matrix-js-sdk"
#apply_patches matrix-js-sdk
print_section "Apply patches to element-web"
apply_patches element-web
print_section "Apply patches to element-desktop"

2
build-bom.sh
View File

@ -5,8 +5,6 @@ cat element-web/yarn.lock >> bom.lock
echo "" >> bom.lock
cat matrix-js-sdk/yarn.lock >> bom.lock
echo "" >> bom.lock
cat matrix-react-sdk/yarn.lock >> bom.lock
echo "" >> bom.lock
# matrix-seshat
cat << EOF >> bom.lock

2
compound-web

@ -1 +1 @@
Subproject commit 049d117dbd9fb88f15277e42fa9702fdab5003d1
Subproject commit 141771eb303d48dc388b2e5a01504359ad47b2c1

2
element-desktop

@ -1 +1 @@
Subproject commit 3000a9fafe155bd0f3fc3c15a692597de4aeb396
Subproject commit e638e582ce5e0a751089bca0845ec3fa983f52a3

2
element-web

@ -1 +1 @@
Subproject commit 0ba8354eedf0bd6855f161a0bd35f4b0f7ea2032
Subproject commit 4be764ae1d579c5fde1f35bccd389cd00d80be3d

9
generate_patches.sh
View File

@ -24,8 +24,10 @@ persist_patches() {
echo "Creating new patch dir $patch_dir..."
mkdir "$patch_dir"
fi
echo "Creating new patches"
git format-patch -k upstream/master.. -o "$patch_dir"
# Assume we forked from a tag starting with 'v' (our own tags start with sc_)
local fork_point=`git describe --tags --match 'v*'| sed 's|-[^-]*-[^-]*$||'`
echo "Creating new patches from $fork_point"
git format-patch -k "$fork_point".. -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 {} \;
@ -37,7 +39,6 @@ persist_patches() {
persist_patches element-desktop
persist_patches element-web
persist_patches matrix-react-sdk
persist_patches matrix-js-sdk
#persist_patches matrix-js-sdk
popd > /dev/null

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit 385dbd386c7417f95dbd2f48b1494bf49a62438c
Subproject commit a8f8a9c14d25525738d61903705281de43047a14

1
matrix-react-sdk

@ -1 +0,0 @@
Subproject commit 0c042df7e4ccc549719eada69985985940c836f7

17
merge_helpers.sh
View File

@ -21,7 +21,7 @@ add_upstream() {
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\\|matrix-react-sdk\\|compound-web"; then
elif echo "$sc_remote" | grep -q "element\\|compound-web"; then
# vector-im repo
local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|element-hq|')"
else
@ -34,7 +34,7 @@ add_upstream() {
}
forall_repos() {
for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop" "compound-web"; do
for repo in "matrix-js-sdk" "element-web" "element-desktop" "compound-web"; do
pushd "$SCHILDI_ROOT/$repo" > /dev/null
"$@"
popd > /dev/null
@ -99,13 +99,8 @@ automatic_i18n_reversion() {
get_current_upstream_tag
local current_mxjssdk_tag
local current_mxreactsdk_tag
get_current_mxsdk_tags
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
revert_i18n_changes "$i18n_path" "$current_mxreactsdk_tag" "$skip_commit"
popd > /dev/null
pushd "$SCHILDI_ROOT/element-web" > /dev/null
revert_i18n_changes "$i18n_path" "$current_upstream_tag" "$skip_commit"
popd > /dev/null
@ -116,13 +111,6 @@ automatic_i18n_reversion() {
}
automatic_i18n_adjustment() {
# matrix-react-sdk
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
$yarn i18n
node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
apply_i18n_changes "$i18n_path"
popd > /dev/null
# element-web
pushd "$SCHILDI_ROOT/element-web" > /dev/null
$yarn i18n
@ -248,7 +236,6 @@ get_current_upstream_tag() {
}
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)"
}

6
merge_upstream.sh
View File

@ -45,10 +45,6 @@ pushd "matrix-js-sdk" > /dev/null
git checkout "$current_mxjssdk_tag" -B "$sc_branch_name"
popd > /dev/null
pushd "matrix-react-sdk" > /dev/null
git checkout "$current_mxreactsdk_tag" -B "$sc_branch_name"
popd > /dev/null
# Refresh environment
make clean
make setup
@ -56,7 +52,7 @@ forall_repos commit_if_dirty "Automatic setup commit"
./apply_patches.sh
compound_web_version=`cat matrix-react-sdk/package.json|grep compound-web|sed 's|.*: \"\(.*\)",|\1|;s|\^||'`
compound_web_version=`cat element-web/package.json|grep compound-web|sed 's|.*: \"\(.*\)",|\1|;s|\^||'`
echo "TODO: merge compound web at $compound_web_version"
popd > /dev/null

18
nix/overlay.nix
View File

@ -1,18 +0,0 @@
final: prev: {
cleanSchildichatDesktopSource = src: with final.lib; cleanSourceWith {
filter = name: type: cleanSourceFilter name type
&& !(hasInfix "/node_modules/" name)
&& !(hasInfix "/nix/" name && hasSuffix ".nix" name)
;
inherit src;
};
schildichat-web = final.callPackage ./schildichat-web.nix {
};
schildichat-desktop = final.callPackage ./schildichat-desktop.nix {
inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
};
schildichat-desktop-wayland = final.callPackage ./schildichat-desktop.nix {
inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
useWayland = true;
};
}

109
nix/schildichat-desktop.nix
View File

@ -1,109 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, makeDesktopItem
, mkYarnPackage
, electron
, element-desktop # for native modules
, schildichat-web
, callPackage
, Security
, AppKit
, CoreServices
, useWayland ? false
, cleanSchildichatDesktopSource
, schildichat-desktop-src ? ../.
}:
let
packageJSON = schildichat-desktop-src + "/element-desktop/package.json";
yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock";
package = builtins.fromJSON (builtins.readFile packageJSON);
pname = "schildichat-desktop";
version = package.version;
executableName = pname;
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in mkYarnPackage rec {
inherit pname version packageJSON;
src = cleanSchildichatDesktopSource (schildichat-desktop-src + "/element-desktop");
nativeBuildInputs = [ makeWrapper ];
inherit (element-desktop) seshat keytar;
buildPhase = ''
runHook preBuild
export HOME=$(mktemp -d)
pushd deps/schildichat-desktop/
npx tsc
yarn run i18n
node ./scripts/copy-res.js
popd
rm -rf node_modules/matrix-seshat node_modules/keytar
ln -s $keytar node_modules/keytar
ln -s $seshat node_modules/matrix-seshat
runHook postBuild
'';
installPhase = ''
runHook preInstall
# resources
mkdir -p "$out/share/element"
ln -s '${schildichat-web}' "$out/share/element/webapp"
cp -r './deps/schildichat-desktop' "$out/share/element/electron"
cp -r './deps/schildichat-desktop/res/img' "$out/share/element"
rm "$out/share/element/electron/node_modules"
cp -r './node_modules' "$out/share/element/electron"
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
# icons
for icon in $out/share/element/electron/build/icons/*.png; do
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
done
# desktop item
mkdir -p "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/applications"
# executable wrapper
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
--add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
runHook postInstall
'';
# Do not attempt generating a tarball for element-web again.
# note: `doDist = false;` does not work.
distPhase = ''
true
'';
# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/vector-im/element-desktop/blob/develop/package.json
desktopItem = makeDesktopItem {
name = "schildichat-desktop";
exec = "${executableName} %u";
icon = "schildichat";
desktopName = "SchildiChat";
genericName = "Matrix Client";
categories = "Network;InstantMessaging;Chat;";
extraEntries = ''
StartupWMClass=schildichat
MimeType=x-scheme-handler/element;
'';
};
}

75
nix/schildichat-web.nix
View File

@ -1,75 +0,0 @@
{ stdenv
, mkYarnModules
, nodejs
, cleanSchildichatDesktopSource
, schildichat-desktop-src ? ../.
, ...
}:
let
packageJSON = schildichat-desktop-src + "/element-web/package.json";
yarnLock = schildichat-desktop-src + "/element-web/yarn.lock";
package = builtins.fromJSON (builtins.readFile packageJSON);
pname = "schildichat-web";
version = package.version;
modules = mkYarnModules {
name = "${pname}-modules-${version}";
inherit pname version packageJSON yarnLock;
};
in stdenv.mkDerivation {
inherit pname version;
src = cleanSchildichatDesktopSource schildichat-desktop-src;
buildInputs = [ nodejs ];
postPatch = ''
patchShebangs .
'';
configurePhase = ''
runHook preConfigure
cp configs/sc/config.json element-web/
cp -r ${modules}/node_modules node_modules
chmod u+rwX -R node_modules
rm -rf node_modules/matrix-react-sdk
ln -s $PWD/matrix-react-sdk node_modules/
ln -s $PWD/node_modules matrix-react-sdk/
ln -s $PWD/node_modules element-web/
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
pushd matrix-react-sdk
node_modules/.bin/reskindex -h ../element-web/src/header
popd
pushd element-web
node scripts/copy-res.js
node_modules/.bin/reskindex -h ../element-web/src/header
node_modules/.bin/webpack --progress --mode production
popd
runHook postBuild
'';
installPhase = ''
runHook preInstall
cp -r element-web/webapp $out
runHook postInstall
'';
passthru = {
inherit modules;
};
}

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

@ -1,4 +1,4 @@
From 643b50c598174d1f968e09b69b72a2747d04b713 Mon Sep 17 00:00:00 2001
From 8bf07f17ee205abe08fd47e5615d7f79ff60eced Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 2 Dec 2023 12:57:26 +0100
Subject: Add back schildi fetch-package.ts modifications
@ -8,7 +8,7 @@ Subject: Add back schildi fetch-package.ts modifications
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts
index 54da3f3..354f039 100644
index e32dcbb..5ed781f 100644
--- a/scripts/fetch-package.ts
+++ b/scripts/fetch-package.ts
@@ -55,6 +55,7 @@ async function main(): Promise<number | undefined> {
@ -49,7 +49,7 @@ index 54da3f3..354f039 100644
await fs.opendir(expectedDeployDir);
console.log(expectedDeployDir + "already exists");
haveDeploy = true;
- } catch (e) {}
- } catch {}
+ } catch (e) {
+ console.log("Not a valid webapp dir: " + expectedDeployDir, e);
+ return 1;

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

@ -1,4 +1,4 @@
From df9cbf4de43a3f8a5d4a539ab21c63230af629ea Mon Sep 17 00:00:00 2001
From b3b4e755efb1851b4790cdedf230cf85f64d775d Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 29 Nov 2020 23:30:59 +0100
Subject: Change default login background
@ -22103,10 +22103,10 @@ literal 0
HcmV?d00001
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index 6641f94133..2053903c03 100644
index 969cc560a3..4636cfe808 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -18,7 +18,7 @@ export default class VectorAuthPage extends React.PureComponent {
@@ -18,7 +18,7 @@ export default class VectorAuthPage extends React.PureComponent<React.PropsWithC
if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;
const brandingConfig = SdkConfig.getObject("branding");

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

@ -1,4 +1,4 @@
From 7b6f836434f75fbb7d21277f4dd31c1f3166d315 Mon Sep 17 00:00:00 2001
From fe40e94fc7092912bca454f1c2c197ca42c7dccd Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:38:47 +0100
Subject: Don't welcome to Element

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

@ -1,4 +1,4 @@
From ffaaeb91e6d35ff59ac020680fdfa3fdadaa7de6 Mon Sep 17 00:00:00 2001
From 4a593cab4f41b9ac0b07b43c3574d77d4d85238d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:55:30 +0100
Subject: Stronger login background to ensure contrast of our icon with our bg
@ -8,10 +8,10 @@ Subject: Stronger login background to ensure contrast of our icon with our bg
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index 2053903c03..822db9da93 100644
index 4636cfe808..05dcdbbbf7 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -56,7 +56,7 @@ export default class VectorAuthPage extends React.PureComponent {
@@ -56,7 +56,7 @@ export default class VectorAuthPage extends React.PureComponent<React.PropsWithC
const modalContentStyle: React.CSSProperties = {
display: "flex",
zIndex: 1,

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

@ -1,4 +1,4 @@
From 177e652388fbeef0113d3fa07f00de09f24f70dd Mon Sep 17 00:00:00 2001
From 113e105d802f904e9cfdc3dca4cb6a74f4ae259a Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 20:07:30 +0100
Subject: Schildify login footer
@ -8,7 +8,7 @@ Subject: Schildify login footer
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/views/auth/VectorAuthFooter.tsx b/src/components/views/auth/VectorAuthFooter.tsx
index a81517b516..3828e5ad74 100644
index 234c6b127b..44d41004a0 100644
--- a/src/components/views/auth/VectorAuthFooter.tsx
+++ b/src/components/views/auth/VectorAuthFooter.tsx
@@ -14,9 +14,10 @@ import { _t } from "../../../languageHandler";

2
patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch → patches/element-web/0006-Disable-sticky-rooms.patch
View File

@ -1,4 +1,4 @@
From 8ec9250d0c49983e45a72f314305710642c64c53 Mon Sep 17 00:00:00 2001
From 89ffe82738128afc556bdbf5e07a1ed05640a78b Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 18 Jan 2022 13:28:22 +0100
Subject: Disable sticky rooms

4
patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch → patches/element-web/0007-Bring-back-unified-room-list.patch
View File

@ -1,4 +1,4 @@
From aefc9db0e98069b535461e34c62fddc5e202af8f Mon Sep 17 00:00:00 2001
From aa67c52dbb37da389722571f480f1d391598bb77 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 5 May 2024 10:12:17 +0200
Subject: Bring back unified room list
@ -124,7 +124,7 @@ 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 4f788ee224..2e475871fa 100644
index 1c27f03e88..ae4b0ea644 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -192,6 +192,14 @@ export interface IFeature extends Omit<IBaseSetting<boolean>, "isFeature"> {

2
patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch → patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
View File

@ -1,4 +1,4 @@
From 5b185275d1ced63047c580a2f702f2bab01da6ac Mon Sep 17 00:00:00 2001
From 52a8331e22a92e72cd470924a898bb5dc0050c12 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 17 Dec 2023 11:11:58 +0100
Subject: Don't sort muted rooms to bottom, I still want to see them.

2
patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch → patches/element-web/0009-Don-t-preview-reactions.patch
View File

@ -1,4 +1,4 @@
From f351e4cf95fca2d48abe5187126af4ded44d7f96 Mon Sep 17 00:00:00 2001
From 6b180bc740d00b2c12e7484611436ed0a0441d91 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 14 Dec 2023 10:32:10 +0100
Subject: Don't preview reactions

2
patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch → patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
View File

@ -1,4 +1,4 @@
From 06bd8ded3fd97417563a6b4f908f9fe9c55d4748 Mon Sep 17 00:00:00 2001
From c8326bf3b2024cb21dae646d552f440e8be31a92 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 17 Nov 2021 12:50:25 +0100
Subject: Hide the "mute" notification state the same way as the other states

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

@ -1,4 +1,4 @@
From d91b5c4562a35251927f52faac41ae5214f2d452 Mon Sep 17 00:00:00 2001
From ad6ae2391b4e9ffafcdfd9a9cd369e77714f8e92 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Fri, 10 May 2024 18:58:32 +0200
Subject: Allow muted rooms to render as unread
@ -8,7 +8,7 @@ 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 cc027c9682..c4c31a51cb 100644
index 7c281d0d2d..f06be85437 100644
--- a/src/RoomNotifs.ts
+++ b/src/RoomNotifs.ts
@@ -255,7 +255,7 @@ export function determineUnreadState(

2
patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch → patches/element-web/0012-Increase-default-visible-tiles.patch
View File

@ -1,4 +1,4 @@
From e2ae548bbeb5e9e00c012b3e368f6adc071ba20e Mon Sep 17 00:00:00 2001
From bdd02fd32781cbd9f592bee2dece18e758a4b0a3 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 30 Aug 2020 15:33:01 +0200
Subject: Increase default visible tiles

4
patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch → patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
View File

@ -1,4 +1,4 @@
From e5431bd8f8beec8fae6233fdfeeb795c06ce522c Mon Sep 17 00:00:00 2001
From 1a73e666d193a583aa025fb75a9afdf59f1d36fa Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 26 May 2024 10:43:36 +0200
Subject: Bring back showSpaceDMBadges setting, force-enabled for now
@ -12,7 +12,7 @@ Co-authored-by: SpiritCroc <dev@spiritcroc.de>
2 files changed, 30 insertions(+)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 2e475871fa..43eb44fa3a 100644
index ae4b0ea644..12d9965cf1 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -199,6 +199,11 @@ export const SETTINGS: { [setting: string]: ISetting } = {

2
patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch → patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
View File

@ -1,4 +1,4 @@
From 84466b80a06ac2ac4e9d85241613a01c5cc071a8 Mon Sep 17 00:00:00 2001
From 911b4438f6f2240e99d3a80aed35ff3e4f1d70ff Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 29 May 2024 19:32:42 +0200
Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

2
patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch → patches/element-web/0015-Allow-reactions-to-take-more-space.patch
View File

@ -1,4 +1,4 @@
From 38c09908626f1d16c26d09ea7fa96920554e825d Mon Sep 17 00:00:00 2001
From 3d8a7358ea859b70bd713e758cb3efc273eb56ef Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 22 Apr 2023 12:15:18 +0200
Subject: Allow reactions to take more space

10
patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch → patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
View File

@ -1,4 +1,4 @@
From 6ac6ee31dbd41bef928b6ab6976e0a081f0a057a Mon Sep 17 00:00:00 2001
From 89e083af2be11b17c756c6078a43ce1c6c305cc2 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 30 May 2024 14:35:16 +0200
Subject: On space switch don't automatically show last opened room
@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 0e5ec04d33..24185623d3 100644
index d0edcccd4f..3146200c68 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1458,7 +1458,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1457,7 +1457,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
if (this.screenAfterLogin && this.screenAfterLogin.screen) {
this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
this.screenAfterLogin = undefined;
@ -30,7 +30,7 @@ index 0e5ec04d33..24185623d3 100644
// Before defaulting to directory, show the last viewed room
this.viewLastRoom();
} else {
@@ -1470,6 +1478,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -1469,6 +1477,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}
}
@ -46,7 +46,7 @@ index 0e5ec04d33..24185623d3 100644
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 43eb44fa3a..d354b67d3d 100644
index 12d9965cf1..3e9fb95799 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -204,6 +204,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {

2
patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch → patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
View File

@ -1,4 +1,4 @@
From 2a4c64e09f43e000a6e5a76ae5f151ca5302ea72 Mon Sep 17 00:00:00 2001
From ddf0d3e26a63b1c3602a78dc3f2253f170e93b90 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 9 Aug 2022 09:32:19 +0200
Subject: Exclude spaces from breadcrumbs

2
patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch → patches/element-web/0018-Stop-the-search-bar-wobble.patch
View File

@ -1,4 +1,4 @@
From 0d64b639e1f2f1fd2e3dd9455b1d4269d1bf0c7a Mon Sep 17 00:00:00 2001
From 684ed334d998c827cfadfdf1c5f46e5b6db722bc Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Mon, 19 Aug 2024 20:27:33 +0200
Subject: Stop the search bar wobble

2
patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch → patches/element-web/0019-Import-SC-compound-theme-overrides.patch
View File

@ -1,4 +1,4 @@
From 0cff07ac21260e5364303112713a659331b13dfb Mon Sep 17 00:00:00 2001
From fb1f422cbea4bb050088e5dbb02c342e70a2aebb Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 13 Oct 2024 11:23:54 +0200
Subject: Import SC compound theme overrides

2
patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch → patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
View File

@ -1,4 +1,4 @@
From 191cc01929de4d7f9727cbc1a8149bfea1d356b5 Mon Sep 17 00:00:00 2001
From da372cc9cf48128a4918917298c3904f0773e7ae Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 7 Sep 2021 19:41:52 +0200
Subject: No damn avatar background in room list

6
patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch → patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
View File

@ -1,4 +1,4 @@
From 6ea45c757519594ec9a08100368455ce409926f7 Mon Sep 17 00:00:00 2001
From 0fa53f5f6b26b88aed25ab425ba04ebc28509684 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 22 Dec 2020 19:16:28 +0100
Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
@ -8,10 +8,10 @@ Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
1 file changed, 6 insertions(+)
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 813e5de40c..4b7118eb9a 100644
index eca61f7d22..59dd12e7ab 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -679,6 +679,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
@@ -683,6 +683,12 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
return false;
}

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

@ -1,4 +1,4 @@
From 6911e311321ab23f04fee5d7a694ec1ec0024094 Mon Sep 17 00:00:00 2001
From 6c031a5258cc31485b889b5487d5e44ebac2c8de Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 13 Oct 2024 13:26:16 +0200
Subject: Always apply corner radius to all edges of the bubble

6
patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch → patches/element-web/0023-Always-show-timestamps-by-default.patch
View File

@ -1,4 +1,4 @@
From 4d504e8ff814cd1f3452d35c74033313b5db61ee Mon Sep 17 00:00:00 2001
From 5a59cf2ab1fc5483be4ab0a157072d6bec18d052 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 13 Oct 2024 13:53:07 +0200
Subject: Always show timestamps by default
@ -8,10 +8,10 @@ Subject: Always show timestamps by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index d354b67d3d..925f104bb0 100644
index 3e9fb95799..b76ec5feb2 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -643,7 +643,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -644,7 +644,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
"alwaysShowTimestamps": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("settings|always_show_message_timestamps"),

6
patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch → patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
View File

@ -1,4 +1,4 @@
From 27eea6fe0d24d89675c88f35925dc83ad6bdab69 Mon Sep 17 00:00:00 2001
From 2968ddb18dfe25fb1f0aaa08e796a7d0960e4263 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 17 Oct 2024 19:40:51 +0200
Subject: Enable custom emote rendering by default
@ -8,10 +8,10 @@ Subject: Enable custom emote rendering by default
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 925f104bb0..1c8d82e30f 100644
index b76ec5feb2..51404c88d4 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -507,7 +507,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
@@ -508,7 +508,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
description: _td("labs|render_reaction_images_description"),
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
supportedLevelsAreOrdered: true,

2
patches/matrix-react-sdk/0021-Enable-chat-previews-by-default.patch → patches/element-web/0025-Enable-chat-previews-by-default.patch
View File

@ -1,4 +1,4 @@
From 528bc546808c6d572e547a439825eb68e8f90f96 Mon Sep 17 00:00:00 2001
From de706cd1c2fcca44f8c04467f675477045572670 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 27 Oct 2024 19:24:26 +0100
Subject: Enable chat previews by default

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

@ -1,56 +0,0 @@
From 385dbd386c7417f95dbd2f48b1494bf49a62438c Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 9 May 2024 09:21:21 +0200
Subject: Add fields for media caption support
---
src/@types/media.ts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/@types/media.ts b/src/@types/media.ts
index 1128b40d3..d85526642 100644
--- a/src/@types/media.ts
+++ b/src/@types/media.ts
@@ -189,6 +189,9 @@ export interface FileContent extends BaseContent {
* One of: [m.file].
*/
msgtype: MsgType.File;
+
+ format?: string;
+ formatted_body?: string;
}
/**
@@ -205,6 +208,9 @@ export interface ImageContent extends BaseContent {
* One of: [m.image].
*/
msgtype: MsgType.Image;
+
+ format?: string;
+ formatted_body?: string;
}
/**
@@ -221,6 +227,9 @@ export interface AudioContent extends BaseContent {
* One of: [m.audio].
*/
msgtype: MsgType.Audio;
+
+ format?: string;
+ formatted_body?: string;
}
/**
@@ -237,6 +246,9 @@ export interface VideoContent extends BaseContent {
* One of: [m.video].
*/
msgtype: MsgType.Video;
+
+ format?: string;
+ formatted_body?: string;
}
/**
--
2.47.0

4
push_current_sc_branches.sh
View File

@ -21,14 +21,12 @@ get_branch_of() {
}
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
if [ "$b_js" != "$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

15
setup.sh
View File

@ -16,18 +16,9 @@ $yarn link
$yarn install
popd
pushd matrix-react-sdk
$yarn link matrix-js-sdk
$yarn link @vector-im/compound-web
$yarn unlink &>/dev/null || true
$yarn link
$yarn install
popd
pushd element-web
$yarn link matrix-js-sdk
$yarn link @vector-im/compound-web
$yarn link matrix-react-sdk
$yarn install
popd
@ -44,14 +35,14 @@ $yarn install
popd
# CSS overrides
cp res/css/* matrix-react-sdk/res/css/
cp res/css/* element-web/res/css/
# Ensure appropriate .gitignore to avoid unnecessary dirty repos
# when re-running setup. merge_upstream.sh will include this into the
# "Automatic setup commit".
if grep -q res/css/sc- matrix-react-sdk/.gitignore; then
if grep -q res/css/sc- element-web/.gitignore; then
echo "Skip updating .gitignore, already looks ok"
else
echo "Updating .gitignore"
echo -e "\nres/css/sc-*.css" >> matrix-react-sdk/.gitignore
echo -e "\nres/css/sc-*.css" >> element-web/.gitignore
fi

2
theme.sh
View File

@ -6,7 +6,7 @@ shopt -s globstar
mydir="$(dirname "$(realpath "$0")")"
automatic_commit="$1"
pushd "$mydir/matrix-react-sdk" > /dev/null
pushd "$mydir/element-web" > /dev/null
if [[ "$automatic_commit" == [Yy]* ]]; then
# Require clean git state