From 675aaa12155c9c4ad316e4018d80d8d10191ee94 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 13 Jan 2020 10:56:48 +0200 Subject: [PATCH] Fix escaping issues affecting the Whatsapp bridge Regression introduced in 53186ffa1c883f28b9 --- .../defaults/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml index 4d1818d0..f83c78f0 100644 --- a/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml +++ b/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml @@ -176,19 +176,19 @@ matrix_mautrix_whatsapp_configuration_yaml: | # The management room for the bot. This is where all status notifications are posted and # in this room, you can use `!wa ` instead of `!wa relaybot `. Omitting # the command prefix completely like in user management rooms is not possible. - management: !foo:example.com + management: '!foo:example.com' # List of users to invite to all created rooms that include the relaybot. invites: [] # The formats to use when sending messages to WhatsApp via the relaybot. message_formats: - m.text: "{{ .Sender.Displayname }}: {{ .Message }}" - m.notice: "{{ .Sender.Displayname }}: {{ .Message }}" - m.emote: "* {{ .Sender.Displayname }} {{ .Message }}" - m.file: "{{ .Sender.Displayname }} sent a file" - m.image: "{{ .Sender.Displayname }} sent an image" - m.audio: "{{ .Sender.Displayname }} sent an audio file" - m.video: "{{ .Sender.Displayname }} sent a video" - m.location: "{{ .Sender.Displayname }} sent a location" + m.text: "{{ '{{ .Sender.Displayname }}' }}: {{ '{{ .Message }}' }}" + m.notice: "{{ '{{ .Sender.Displayname }}' }}:: {{ '{{ .Message }}' }}" + m.emote: "* {{ '{{ .Sender.Displayname }}' }}: {{ '{{ .Message }}' }}" + m.file: "{{ '{{ .Sender.Displayname }}' }}: sent a file" + m.image: "{{ '{{ .Sender.Displayname }}' }}: sent an image" + m.audio: "{{ '{{ .Sender.Displayname }}' }}: sent an audio file" + m.video: "{{ '{{ .Sender.Displayname }}' }}: sent a video" + m.location: "{{ '{{ .Sender.Displayname }}' }}: sent a location" # Logging config. logging: # The directory for log files. Will be created if not found.