From 6156e9bbdd7b5957532f2c9ad340aa11983150de Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:20:11 -0500
Subject: [PATCH 1/4] Update _common.sh

Add helper for getting synapse DB name
---
 scripts/_common.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8a31c04..674ce8d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -2,6 +2,16 @@
 
 APP_BIN=mautrix-discord
 
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+get_synapse_db_name() {
+	# Parameters: synapse instance identifier
+	# Returns: database name
+	ynh_app_setting_get --app="$1" --key=db_name
+}
+
 apply_permissions() {
     set -o noglob # Disable globbing to avoid expansions when passing * as value.
     declare values="list$role"

From 5123430ac3b76d221255891072f0275abc7e47f1 Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:21:22 -0500
Subject: [PATCH 2/4] Update install

Fix synapse DB name
---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 35c6880..b7710a5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,7 +14,7 @@ server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
 domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
 ynh_app_setting_set --app=$app --key=server_name --value=$server_name
 ynh_app_setting_set --app=$app --key=domain --value=$domain
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 
 synapse_version=$(yunohost app info $synapse_instance | grep -oP "version:\s*\K.*")
 

From bdc0cfae08d946b9800fb0bc7499141920e80101 Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:22:54 -0500
Subject: [PATCH 3/4] Update restore

Fix synapse DB name
---
 scripts/restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index 1742f10..a22c121 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 
 async_media=$(ynh_app_setting_get --app=$app --key=async_media)

From 5fa02ababfeea67b862f503afed4122fb8dac07b Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:23:24 -0500
Subject: [PATCH 4/4] Update upgrade

Fix synapse DB name
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 038403f..cf77d39 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -11,7 +11,7 @@ source /usr/share/yunohost/helpers
 
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 appserviceid=$app