From bc8d9c5b514870f158567a071314bf9d09950ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 30 Nov 2023 15:59:43 +0100
Subject: [PATCH] Update config from upstream

---
 conf/config.json  | 33 +++++++++++++++++++++++++++++----
 config_panel.toml |  9 ---------
 scripts/config    | 22 ++++++++++++++++++++++
 scripts/install   |  2 --
 scripts/upgrade   |  5 -----
 5 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 scripts/config

diff --git a/conf/config.json b/conf/config.json
index 7001039..4fe2638 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,16 +1,32 @@
 {
     "default_server_config": {
         "m.homeserver": {
-            "base_url": "https://__DEFAULT_HOME_SERVER__"
+            "base_url": "https://__DEFAULT_HOME_SERVER__",
+            "server_name": "matrix.org"
         },
         "m.identity_server": {
             "base_url": "https://vector.im"
         }
     },
+    "disable_custom_urls": false,
+    "disable_guests": false,
+    "disable_login_language_selector": false,
+    "disable_3pid_login": false,
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_widgets_urls": [
+        "https://scalar.vector.im/_matrix/integrations/v1",
+        "https://scalar.vector.im/api",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
+    "default_country_code": "GB",
     "show_labs_settings": false,
+    "features": {},
+    "default_federate": true,
+    "default_theme": "light",
     "room_directory": {
         "servers": ["matrix.org"]
     },
@@ -18,7 +34,16 @@
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
-    "embedded_pages": {
-        "login_for_welcome": __LOGIN_FOR_WELCOME__
-    }
+    "setting_defaults": {
+        "breadcrumbs": true
+    },
+    "jitsi": {
+        "preferred_domain": "meet.element.io"
+    },
+    "element_call": {
+        "url": "https://call.element.io",
+        "participant_limit": 8,
+        "brand": "Element Call"
+    },
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
diff --git a/config_panel.toml b/config_panel.toml
index ae49309..f75c4e6 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -15,12 +15,3 @@ name.fr = "Configuration d'Element"
         default = "matrix.org"
         help.en = "Define Matrix default home server address."
         help.fr = "Définir l'adresse du serveur par défaut de Matrix."
-
-        [main.config.login_for_welcome]
-        ask.en = "Display login as welcome page"
-        ask.fr = "Afficher la connexion comme page d'accueil"
-        type = "boolean"
-        yes = true
-        no = false
-        help.en = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
-        help.fr = "Quand l'option est sélectionnée, l'application utilisera le formulaire de connexion comme page d'accueil au lieu de la page d'accueil elle-même. Cela désactive l'utilisation de welcome_url et de toutes les fonctionnalités de la page d'accueil."
diff --git a/scripts/config b/scripts/config
new file mode 100644
index 0000000..3c2c734
--- /dev/null
+++ b/scripts/config
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source ./_common.sh
+source /usr/share/yunohost/helpers
+
+ynh_app_config_apply() {
+    _ynh_app_config_apply
+    configure_element
+}
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT
+#=================================================
+ynh_app_config_run $1
diff --git a/scripts/install b/scripts/install
index 18fc280..06b633b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,8 +13,6 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-login_for_welcome=true
-ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index 8aa39e7..07b0b0b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,11 +26,6 @@ if [ -z "${default_home_server:-}" ]; then
 	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 fi
 
-if [ -z "${login_for_welcome:-}" ]; then
-	login_for_welcome=true
-	ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================