From bb02467958825d36b22b1a259e45f98e6acbca91 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 14 Jan 2022 10:56:52 +0100
Subject: [PATCH] Fix

---
 config_panel.toml | 15 ++-------------
 scripts/install   |  5 -----
 scripts/upgrade   | 16 +---------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index f3591f8..fa521b5 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -8,17 +8,6 @@ name = "Element configuration"
 
         [main.config.default_home_server]
         ask = "Choose a home server"
-        type = "url"
-        default = "https://matrix.org"
-        bind = "__FINALPATH__/config.json"
-
-        [main.config.enable_labs]
-        ask = "Enable labs settings"
-        type = "boolean"
-        bind = "__FINALPATH__/config.json"
-
-        [main.config.default_theme]
-        ask = "Choose a theme"
-        type = "select"
-        choices = ["light", "dark"]
+        type = "string"
+        default = "matrix-client.matrix.org"
         bind = "__FINALPATH__/config.json"
diff --git a/scripts/install b/scripts/install
index 85b7acf..39c9aec 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,9 +28,6 @@ default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
 
 app=$YNH_APP_INSTANCE_NAME
 
-enable_labs="1"
-default_theme="light"
-
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -50,8 +47,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
-ynh_app_setting_set --app=$app --key=enable_labs --value=$enable_labs
-ynh_app_setting_set --app=$app --key=default_theme --value=$default_theme
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/upgrade b/scripts/upgrade
index b07516d..7c8d6b2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,8 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
-enable_labs=$(ynh_app_setting_get --app=$app --key=enable_labs)
-default_theme=$(ynh_app_setting_get --app=$app --key=default_theme)
 
 #=================================================
 # CHECK VERSION
@@ -50,22 +48,10 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If default_home_server doesn't exist, create it
 if [ -z "$default_home_server" ]; then
-	default_home_server="https://matrix.org"
+	default_home_server="matrix-client.matrix.org"
 	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 fi
 
-# If enable_labs doesn't exist, create it
-if [ -z "$enable_labs" ]; then
-	enable_labs="1"
-	ynh_app_setting_set --app=$app --key=enable_labs --value=$enable_labs
-fi
-
-# If default_theme doesn't exist, create it
-if [ -z "$default_theme" ]; then
-	default_theme="light"
-	ynh_app_setting_set --app=$app --key=default_theme --value=$default_theme
-fi
-
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
 	ynh_legacy_permissions_delete_all