From c4a2d93990884b97f8dfb4739bb6ffe8eedf5a23 Mon Sep 17 00:00:00 2001
From: jasonlaguidice <19523621+jasonlaguidice@users.noreply.github.com>
Date: Sun, 7 Jun 2026 13:33:08 -0700
Subject: [PATCH] Remove possible template parsing conflicts and revert
 installation script

---
 .../matrix-bridge-rustpush/tasks/setup_install.yml  | 13 +------------
 .../matrix-bridge-rustpush/templates/config.yaml.j2 |  5 +++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml b/roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml
index 2edbefe66..95d794cab 100644
--- a/roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml
+++ b/roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml
@@ -65,22 +65,11 @@
 
 - name: Ensure rustpush-bridge config.yaml installed
   ansible.builtin.copy:
-    content: >-
-      {{
-        matrix_rustpush_bridge_configuration
-        | combine({
-          'network': {
-            'displayname_template': matrix_rustpush_bridge_network_displayname_template_effective,
-          },
-        }, recursive=True)
-        | to_nice_yaml(indent=2, width=999999)
-      }}
+    content: "{{ matrix_rustpush_bridge_configuration | to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_rustpush_bridge_config_path }}/config.yaml"
     mode: 0644
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
-  vars:
-    matrix_rustpush_bridge_network_displayname_template_effective: "{{ (matrix_rustpush_bridge_configuration.network | default({}, true)).displayname_template | default(matrix_rustpush_bridge_network_displayname_template) }}"
   register: matrix_rustpush_bridge_config_result
 
 - name: Ensure rustpush-bridge registration.yaml installed
diff --git a/roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2 b/roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2
index d3c064842..05df2bd73 100644
--- a/roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2
+++ b/roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2
@@ -2,8 +2,9 @@
 # Network-specific config options (iMessage via RustPush)
 network:
     # Displayname template for iMessage contacts.
-    # Available variables: {% raw %}{{.FirstName}}, {{.LastName}}, {{.Nickname}},
-    # {{.Phone}}, {{.Email}}, {{.ID}}{% endraw %}
+    # Available variables:
+    # .FirstName, .LastName, .Nickname
+    # .Phone, .Email, .ID
     displayname_template: {{ matrix_rustpush_bridge_network_displayname_template | to_json }}
 
     # How many days back to look for chats during initial sync.