From 840d1f60ea9ff2142780f00b2e8751a8954f4a66 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Fri, 25 Oct 2024 18:29:06 +0200
Subject: [PATCH] Fork compound-web and make tooltip design less bad

---
 .gitmodules                  | 3 +++
 compound-web                 | 1 +
 merge_helpers.sh             | 6 +++---
 merge_upstream.sh            | 3 +++
 res/css/sc-cpd-overrides.css | 2 ++
 setup.sh                     | 8 ++++++++
 6 files changed, 20 insertions(+), 3 deletions(-)
 create mode 160000 compound-web

diff --git a/.gitmodules b/.gitmodules
index da54f13..ddfec49 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "element-desktop"]
 	path = element-desktop
 	url = https://github.com/SchildiChat/element-desktop.git
+[submodule "compound-web"]
+	path = compound-web
+	url = https://github.com/SchildiChat/compound-web.git
diff --git a/compound-web b/compound-web
new file mode 160000
index 0000000..049d117
--- /dev/null
+++ b/compound-web
@@ -0,0 +1 @@
+Subproject commit 049d117dbd9fb88f15277e42fa9702fdab5003d1
diff --git a/merge_helpers.sh b/merge_helpers.sh
index d80ff9e..621aee7 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -17,11 +17,11 @@ add_upstream() {
         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|')"
+    local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|;s|git@github.com:|https://github.com/|')"
     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"; then
+    elif echo "$sc_remote" | grep -q "element\\|matrix-react-sdk\\|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"; do
+    for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop" "compound-web"; do
         pushd "$SCHILDI_ROOT/$repo" > /dev/null
         "$@"
         popd > /dev/null
diff --git a/merge_upstream.sh b/merge_upstream.sh
index 79b3f5b..fb4055d 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -56,4 +56,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|\^||'`
+echo "TODO: merge compound web at $compound_web_version"
+
 popd > /dev/null
diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css
index a9987b0..2157bac 100644
--- a/res/css/sc-cpd-overrides.css
+++ b/res/css/sc-cpd-overrides.css
@@ -88,6 +88,7 @@
   --cpd-color-gray-200: #212121;
   --cpd-color-gray-100: #171717;
   --cpd-color-theme-bg: #171717;
+  --cpd-color-tooltip-bg: #424242;
 }
 
 .cpd-theme-light.cpd-theme-light {
@@ -171,4 +172,5 @@
   --cpd-color-gray-200: #f5f5f5;
   --cpd-color-gray-100: #fafafa;
   --cpd-color-theme-bg: #ffffff;
+  --cpd-color-tooltip-bg: #f5f5f5;
 }
diff --git a/setup.sh b/setup.sh
index 65e945a..a6f0a73 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,8 +10,15 @@ $yarn link
 $yarn install
 popd
 
+pushd compound-web
+$yarn unlink &>/dev/null || true
+$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
@@ -19,6 +26,7 @@ popd
 
 pushd element-web
 $yarn link matrix-js-sdk
+$yarn link @vector-im/compound-web
 $yarn link matrix-react-sdk
 $yarn install
 popd