From 0d08958fd76890025f884701ee7c5cf2cdbd5408 Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:16:21 -0500
Subject: [PATCH 1/2] Fix synapse DB name in upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 813b29e..c357095 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -10,7 +10,7 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 mautrix_version=$(ynh_app_upstream_version)
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
 domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
 

From 0481b6776add9b2db1058dffe102261ae833435e Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Tue, 11 Jun 2024 13:24:23 -0500
Subject: [PATCH 2/2] Update restore

Fix permission for config.yaml
---
 scripts/restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index e9858f4..bfd2874 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -48,7 +48,7 @@ ynh_script_progression --message="Registering Synapse app-service" --weight=1
 $install_dir/mautrix-signal -g -c $install_dir/config.yaml -r /etc/matrix-$synapse_instance/app-service/$app.yaml
 /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration"
 
-chown -R $app:$app "$install_dir"
+chown -R $app:$app "$install_dir/config.yaml"
 ynh_store_file_checksum --file="/etc/matrix-$synapse_instance/app-service/$app.yaml"
 ynh_store_file_checksum --file="$install_dir/config.yaml"