From 68d4e04f4f2e7eb05e43d6c6a76c1f7d633fd4bf Mon Sep 17 00:00:00 2001 From: Nikolai Raitsev Date: Fri, 9 Feb 2024 14:17:16 +0100 Subject: [PATCH 1/5] 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/5] 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, From 89288cce0e624adc6ae6c5ed8d2469c53a8bcd85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 21:13:33 +0000 Subject: [PATCH 3/5] Update gnuxie/draupnir Docker tag to v1.86.2 --- roles/custom/matrix-bot-draupnir/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-draupnir/defaults/main.yml b/roles/custom/matrix-bot-draupnir/defaults/main.yml index 3a4bdc250..e2a7ca9cb 100644 --- a/roles/custom/matrix-bot-draupnir/defaults/main.yml +++ b/roles/custom/matrix-bot-draupnir/defaults/main.yml @@ -5,7 +5,7 @@ matrix_bot_draupnir_enabled: true # renovate: datasource=docker depName=gnuxie/draupnir -matrix_bot_draupnir_version: "v1.86.1" +matrix_bot_draupnir_version: "v1.86.2" matrix_bot_draupnir_container_image_self_build: false matrix_bot_draupnir_container_image_self_build_repo: "https://github.com/the-draupnir-project/Draupnir.git" From 2d4b96e0c5a904857bc440d0a4d49fcade11fa8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 01:50:50 +0000 Subject: [PATCH 4/5] Update turt2live/matrix-media-repo Docker tag to v1.3.4 --- roles/custom/matrix-media-repo/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-media-repo/defaults/main.yml b/roles/custom/matrix-media-repo/defaults/main.yml index 0fa520e72..b931943c0 100755 --- a/roles/custom/matrix-media-repo/defaults/main.yml +++ b/roles/custom/matrix-media-repo/defaults/main.yml @@ -19,7 +19,7 @@ matrix_media_repo_docker_image_path: "turt2live/matrix-media-repo" matrix_media_repo_docker_image: "{{ matrix_media_repo_docker_image_name_prefix }}{{ matrix_media_repo_docker_image_path }}:{{ matrix_media_repo_docker_image_tag }}" matrix_media_repo_docker_image_name_prefix: "{{ 'localhost/' if matrix_media_repo_container_image_self_build else matrix_container_global_registry_prefix }}" # renovate: datasource=docker depName=turt2live/matrix-media-repo -matrix_media_repo_docker_image_tag: "v1.3.3" +matrix_media_repo_docker_image_tag: "v1.3.4" matrix_media_repo_docker_image_force_pull: "{{ matrix_media_repo_docker_image.endswith(':latest') }}" matrix_media_repo_base_path: "{{ matrix_base_data_path }}/{{ matrix_media_repo_identifier }}" From 05e1fa3546ec597abdc7da398bd4d80145fd53fe Mon Sep 17 00:00:00 2001 From: Antoine-Ali Zarrouk <3798576+sidewinder94@users.noreply.github.com> Date: Sat, 10 Feb 2024 10:18:46 +0100 Subject: [PATCH 5/5] Update SRV delegation docs The path rule was not working because for federation fo work it needs several endpoints. Two of them are not under /_matrix/federation : - /_matrix/key - /_matrix/media --- docs/howto-srv-server-delegation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/howto-srv-server-delegation.md b/docs/howto-srv-server-delegation.md index a5c1990de..ba45a1c09 100644 --- a/docs/howto-srv-server-delegation.md +++ b/docs/howto-srv-server-delegation.md @@ -27,7 +27,7 @@ Also, all instructions below are from an older version of the playbook and may n ```yaml # To serve the federation from any domain, as long as the path matches -matrix_synapse_container_labels_public_federation_api_traefik_rule: PathPrefix(`/_matrix/federation`) +matrix_synapse_container_labels_public_federation_api_traefik_rule: PathPrefix(`/_matrix/`) ``` This is because with SRV federation, some servers / tools (one of which being the federation tester) try to access the federation API using the resolved IP address instead of the domain name (or they are not using SNI). This change will make Traefik route all traffic for which the path match this rule go to the federation endpoint.