From ae12ab5c24a85ac8defaf7d20a75d9b9258f6b50 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 10 Aug 2023 15:57:29 +0300
Subject: [PATCH] Rename variable (matrix_client_element_jitsi_preferredDomain
 -> matrix_client_element_jitsi_preferredDomain)

---
 group_vars/matrix_servers                                   | 2 +-
 roles/custom/matrix-base/defaults/main.yml                  | 2 +-
 .../templates/static-files/well-known/matrix-client.j2      | 6 +++---
 roles/custom/matrix-client-element/defaults/main.yml        | 2 +-
 .../custom/matrix-client-element/tasks/validate_config.yml  | 1 +
 roles/custom/matrix-client-element/templates/config.json.j2 | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 74f382fa3..114fc09f2 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3341,7 +3341,7 @@ matrix_client_element_enable_presence_by_hs_url: |
 
 matrix_client_element_welcome_user_id: ~
 
-matrix_client_element_jitsi_preferredDomain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
+matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
 
 ######################################################################
 #
diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index 637ce3bb9..8642ace2d 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -158,7 +158,7 @@ matrix_integration_manager_ui_url: ~
 # The domain name where a Jitsi server is self-hosted.
 # If set, `/.well-known/matrix/client` will suggest Element clients to use that Jitsi server.
 # See: https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server
-matrix_client_element_jitsi_preferredDomain: ''  # noqa var-naming
+matrix_client_element_jitsi_preferred_domain: ''  # noqa var-naming
 
 # Controls whether Element should use End-to-End Encryption by default.
 # Setting this to false will update `/.well-known/matrix/client` and tell Element clients to avoid E2EE.
diff --git a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
index 45c3ea2a0..4de91a370 100644
--- a/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -18,12 +18,12 @@
 		]
 	}
 	{% endif %}
-	{% if matrix_client_element_jitsi_preferredDomain %},
+	{% if matrix_client_element_jitsi_preferred_domain %},
 	"io.element.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
 	},
 	"im.vector.riot.jitsi": {
-		"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+		"preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
 	}
 	{% endif %}
 	{% if matrix_sliding_sync_enabled %},
diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index ac1630014..917738aee 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -183,7 +183,7 @@ matrix_client_element_page_template_welcome_path: "{{ role_path }}/templates/wel
 # point this to a `home.html` template file on your local filesystem.
 matrix_client_element_embedded_pages_home_path: ~
 
-matrix_client_element_jitsi_preferredDomain: ''  # noqa var-naming
+matrix_client_element_jitsi_preferred_domain: ''  # noqa var-naming
 
 # Controls whether the self-check feature should validate SSL certificates.
 matrix_client_element_self_check_validate_certificates: true
diff --git a/roles/custom/matrix-client-element/tasks/validate_config.yml b/roles/custom/matrix-client-element/tasks/validate_config.yml
index e2241b749..dc6c9f5ad 100644
--- a/roles/custom/matrix-client-element/tasks/validate_config.yml
+++ b/roles/custom/matrix-client-element/tasks/validate_config.yml
@@ -41,6 +41,7 @@
     - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
     - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
     - {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
+    - {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
 
 - when: matrix_client_element_container_labels_traefik_enabled | bool
   block:
diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2
index 883c89bfc..180a8f818 100644
--- a/roles/custom/matrix-client-element/templates/config.json.j2
+++ b/roles/custom/matrix-client-element/templates/config.json.j2
@@ -33,9 +33,9 @@
 	"embedded_pages": {
 		"homeUrl": {{ matrix_client_element_embedded_pages_home_url | string | to_json }}
 	},
-	{% if matrix_client_element_jitsi_preferredDomain %}
+	{% if matrix_client_element_jitsi_preferred_domain %}
 	"jitsi": {
-        "preferred_domain": {{ matrix_client_element_jitsi_preferredDomain | to_json }}
+        "preferred_domain": {{ matrix_client_element_jitsi_preferred_domain | to_json }}
     },
 	{% endif %}
 	{% if matrix_client_element_location_sharing_enabled %}