From 68d4e04f4f2e7eb05e43d6c6a76c1f7d633fd4bf Mon Sep 17 00:00:00 2001 From: Nikolai Raitsev Date: Fri, 9 Feb 2024 14:17:16 +0100 Subject: [PATCH 1/2] allow to configure whatsapp polls via extev_polls parameter. --- roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml | 2 ++ .../matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml index 4011ff40c..9919a3071 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml @@ -25,6 +25,8 @@ matrix_mautrix_whatsapp_homeserver_address: "" matrix_mautrix_whatsapp_homeserver_domain: "{{ matrix_domain }}" matrix_mautrix_whatsapp_appservice_address: "http://matrix-mautrix-whatsapp:8080" +matrix_mautrix_whatsapp_extev_polls: false + matrix_mautrix_whatsapp_command_prefix: "!wa" matrix_mautrix_whatsapp_container_network: "" diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 index 80e0f683a..d543ddd15 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 @@ -292,7 +292,7 @@ bridge: # Send galleries as a single event? This is not an MSC (yet). beeper_galleries: false # Should polls be sent using MSC3381 event types? - extev_polls: false + extev_polls: {{ matrix_mautrix_whatsapp_extev_polls }} # Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this. cross_room_replies: false # Disable generating reply fallbacks? Some extremely bad clients still rely on them, From 1bfafa70045d96ab959b8948587c3c5608539ef7 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 9 Feb 2024 16:42:48 +0200 Subject: [PATCH 2/2] Use to_json for matrix_mautrix_whatsapp_extev_polls --- .../matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 index d543ddd15..cbaef5921 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 @@ -292,7 +292,7 @@ bridge: # Send galleries as a single event? This is not an MSC (yet). beeper_galleries: false # Should polls be sent using MSC3381 event types? - extev_polls: {{ matrix_mautrix_whatsapp_extev_polls }} + extev_polls: {{ matrix_mautrix_whatsapp_extev_polls | to_json }} # Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this. cross_room_replies: false # Disable generating reply fallbacks? Some extremely bad clients still rely on them,