From 014b6029c56e4ce9989620dabf278b403e6b3078 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 20 Feb 2021 11:10:08 +0100
Subject: [PATCH] nodes/htz.ex42-1048908: update element-web config

---
 bundles/element-web/items.py |  4 ++--
 nodes/htz/ex42-1048908.py    | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bundles/element-web/items.py b/bundles/element-web/items.py
index 76e21d6..59f4a9f 100644
--- a/bundles/element-web/items.py
+++ b/bundles/element-web/items.py
@@ -1,6 +1,6 @@
 assert node.has_bundle('nodejs')
 
-from json import dumps
+from bundlewrap.metadata import metadata_to_json
 
 element_web_root = '/var/www/{}'.format(node.metadata['element-web']['url'])
 
@@ -20,7 +20,7 @@ git_deploy = {
 
 files = {
     element_web_root + '/webapp/config.json': {
-        'content': dumps(node.metadata['element-web']['config']),
+        'content': metadata_to_json(node.metadata['element-web']['config']),
         'needs': {
             'action:element-web_yarn',
         },
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 22d3db6..247534c 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -91,20 +91,23 @@ nodes['htz.ex42-1048908'] = {
             'url': 'chat.franzi.business',
             'version': 'v1.7.21',
             'config': {
-                'default_server_name': 'franzi.business',
+                'default_server_config': {
+                    'm.homeserver': {
+                        'base_url': 'https://matrix.franzi.business',
+                        'server_name': 'franzi.business',
+                    },
+                },
                 'brand': 'franzi.business',
                 'showLabsSettings': True,
                 'integrations_ui_url': 'https://dimension.franzi.business/riot',
                 'integrations_rest_url': 'https://dimension.franzi.business/api/v1/scalar',
-                'integrations_widgets_urls': ['https://dimension.franzi.business/widgets'],
+                'integrations_widgets_urls': {
+                    'https://dimension.franzi.business/widgets'
+                },
                 'default_theme': 'dark',
                 'defaultCountryCode': 'DE',
-                'features': {
-                    'feature_bridge_state': 'labs',
-                    'feature_font_scaling': 'labs',
-                    'feature_irc_ui': 'labs',
-                    'feature_mjolnir': 'labs',
-                    'feature_presence_in_room_list': 'labs',
+                'jitsi': {
+                    'preferredDomain': 'meet.ffmuc.net',
                 },
             },
         },