From 0ee8ca5c7f2835f70099bcb2d25c47e9c8d9aa5f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 1 Apr 2026 22:49:05 +0300
Subject: [PATCH] Assemble MatrixRTC foci outside the template

---
 roles/custom/matrix-continuwuity/defaults/main.yml   | 12 +++++++++++-
 .../templates/continuwuity.toml.j2                   |  6 +-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/roles/custom/matrix-continuwuity/defaults/main.yml b/roles/custom/matrix-continuwuity/defaults/main.yml
index e902a0004..912c0bece 100644
--- a/roles/custom/matrix-continuwuity/defaults/main.yml
+++ b/roles/custom/matrix-continuwuity/defaults/main.yml
@@ -227,8 +227,18 @@ matrix_continuwuity_config_ignore_messages_from_server_names: []
 # probably don't want to enable this.
 matrix_continuwuity_config_allow_outgoing_presence: false
 
-# Controls MatrixRTC Livekit URL served via `/_matrix/client/v1/rtc/transports`
+# Controls MatrixRTC foci served via `/_matrix/client/v1/rtc/transports`
 # and `/_matrix/client/unstable/org.matrix.msc4143/rtc/transports` (MSC4143)
+matrix_continuwuity_config_rtc_foci: "{{ matrix_continuwuity_config_rtc_foci_auto + matrix_continuwuity_config_rtc_foci_custom }}"
+matrix_continuwuity_config_rtc_foci_auto: |-
+  {{
+    (
+      [{'type': 'livekit', 'livekit_service_url': matrix_continuwuity_config_rtc_foci_livekit_url}] if matrix_continuwuity_config_rtc_foci_livekit_url != '' else []
+    )
+  }}
+matrix_continuwuity_config_rtc_foci_custom: []
+
+# Controls MatrixRTC Livekit URL auto-added to `matrix_continuwuity_config_rtc_foci`.
 #
 # This is set automatically if you are using the playbook MatrixRTC stack.
 matrix_continuwuity_config_rtc_foci_livekit_url: ''
diff --git a/roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2 b/roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2
index 8a79861ac..4134aa274 100644
--- a/roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2
+++ b/roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2
@@ -1882,11 +1882,7 @@ url_preview_check_root_domain = {{ matrix_continuwuity_config_url_preview_check_
 #
 # To disable, set this to an empty list (`[]`).
 #
-{% if matrix_continuwuity_config_rtc_foci_livekit_url != '' %}
-foci = [{ type = "livekit", livekit_service_url = {{ matrix_continuwuity_config_rtc_foci_livekit_url | to_json }} }]
-{% else %}
-foci = []
-{% endif %}
+foci = [{%- for focus in matrix_continuwuity_config_rtc_foci -%}{ {% for key, value in focus.items() %}{{ key }} = {{ value | to_json }}{% if not loop.last %}, {% endif %}{% endfor %} }{% if not loop.last %}, {% endif %}{%- endfor -%}]
 
 [global.ldap]