From 80296f6c11b001739e723ff68f3647f8e6a15ab8 Mon Sep 17 00:00:00 2001
From: Gredin67 <gredin67@sans-nuage.fr>
Date: Tue, 10 Jan 2023 11:33:10 +0100
Subject: [PATCH] dumb

---
 config_panel.toml | 2 +-
 scripts/install   | 2 +-
 scripts/upgrade   | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 7200e34..e1cc4de 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -113,7 +113,7 @@ services = ["__APP__"]
         yes = "true"
 		no = "false"
         help = "If allowed, `!sg set-relay` can be used to turn any authenticated user into a RelayBot for that chat."
-        bind = ":__FINALPATH__/config.yaml"
+        bind = "relay>enabled:__FINALPATH__/config.yaml"
 
     [bridge.portal_rooms]
     name = "Portal Rooms & Encryption Settings"
diff --git a/scripts/install b/scripts/install
index f6dc8f3..5022982 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,7 +26,7 @@ ynh_abort_if_errors
 synapsenumber=$YNH_APP_ARG_SYNAPSENUMBER
 botname=$YNH_APP_ARG_BOTNAME
 bot_synapse_adm=true
-encryption="'${YNH_APP_ARG_ENCRYPTION}'"
+encryption=${YNH_APP_ARG_ENCRYPTION}
 listadmin=$YNH_APP_ARG_BOTADMIN
 listuser=$YNH_APP_ARG_BOTUSERS
 
diff --git a/scripts/upgrade b/scripts/upgrade
index db35fc8..c67b9db 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -47,8 +47,7 @@ federate_rooms=$(ynh_app_setting_get --app=$app --key=federate_rooms)
 encryption=$(ynh_app_setting_get --app=$app --key=encryption)
 encryption_default=$(ynh_app_setting_get --app=$app --key=encryption_default)
 print_level=$(ynh_app_setting_get --app=$app --key=print_level)
-enable_relaybot="true"
-#enable_relaybot=$(ynh_app_setting_get --app=$app --key=enable_relaybot)
+enable_relaybot=$(ynh_app_setting_get --app=$app --key=enable_relaybot)
 listrelay=$(ynh_app_setting_get --app=$app --key=listrelay)
 listuser=$(ynh_app_setting_get --app=$app --key=listuser)
 listadmin=$(ynh_app_setting_get --app=$app --key=listadmin)
@@ -167,6 +166,12 @@ then
     ynh_app_setting_set --app=$app --key=listrelay --value=$listrelay
 fi
 
+if [ -z "$enable_relaybot" ]
+then
+    enable_relaybot="true"
+    ynh_app_setting_set --app=$app --key=enable_relaybot --value=$enable_relaybot
+fi
+
 if [ -z "$listuser" ]
 then
     listuser=$(ynh_app_setting_get --app=$app --key=botusers)