From c78d679d2e2eedf2a92be776a7a987367c522597 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 14 Jan 2022 10:49:58 +0100
Subject: [PATCH] Update config file to upstream

---
 conf/config.json | 45 ++++++++++++++++++++++++++++++++++++++++++---
 manifest.json    |  2 +-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index fb0a558..291dd13 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,13 +1,52 @@
 {
-    "default_hs_url": "https://__DEFAULT_HOME_SERVER__",
-    "default_is_url": "https://vector.im",
+    "default_server_config": {
+        "m.homeserver": {
+            "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",
-    "enableLabs": true,
+    "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"
+    ],
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "defaultCountryCode": "GB",
+    "showLabsSettings": false,
+    "features": { },
+    "default_federate": true,
+    "default_theme": "light",
     "roomDirectory": {
         "servers": [
             "matrix.org"
         ]
+    },
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "whitelistedHSUrls": ["https://matrix.org"],
+        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
+        "siteId": 1
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false,
+        "https://matrix-client.matrix.org": false
+    },
+    "settingDefaults": {
+        "breadcrumbs": true
+    },
+    "jitsi": {
+        "preferredDomain": "meet.element.io"
     }
 }
diff --git a/manifest.json b/manifest.json
index e489a92..7c871e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,7 +47,7 @@
 					"fr": "Choisissez un serveur par défault"
 				},
 				"example": "my-own-homeserver.tld",
-				"default": "matrix.org"
+				"default": "matrix-client.matrix.org"
 			},
 			{
 				"name": "is_public",