From 53f3c94bef59f34924c1e5e5d6777d64f9c8c3d9 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 17 Sep 2024 09:37:36 +0300 Subject: [PATCH] Enable backfilling for mautrix-gmessages, mautrix-signal and mautrix-slack We'be already been going against upstream defaults and have been enabling backfilling for a few other bridges (Messenger, Instagram, Telegram, Twitter). Now I'm enabling backfilling by default for the remaining ones, for consistency. --- .../matrix-bridge-mautrix-gmessages/defaults/main.yml | 2 +- .../matrix-bridge-mautrix-signal/defaults/main.yml | 6 ++++++ .../templates/config.yaml.j2 | 10 +++++----- .../matrix-bridge-mautrix-slack/defaults/main.yml | 6 ++++++ .../templates/config.yaml.j2 | 10 +++++----- .../matrix-bridge-mautrix-telegram/defaults/main.yml | 7 +------ 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml index 1dd535d4a..0cea11e08 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml @@ -25,7 +25,7 @@ matrix_mautrix_gmessages_homeserver_address: "" matrix_mautrix_gmessages_homeserver_domain: "{{ matrix_domain }}" matrix_mautrix_gmessages_appservice_address: "http://matrix-mautrix-gmessages:8080" -matrix_mautrix_gmessages_backfill_enabled: false +matrix_mautrix_gmessages_backfill_enabled: true matrix_mautrix_gmessages_backfill_max_initial_messages: 50 matrix_mautrix_gmessages_backfill_max_catchup_messages: 500 matrix_mautrix_gmessages_backfill_unread_hours_threshold: 720 diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index 3181fd52a..72e1ae830 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -100,6 +100,12 @@ matrix_mautrix_signal_logging_level: 'warn' # If false, created portal rooms will never be federated. matrix_mautrix_signal_federate_rooms: true +matrix_mautrix_signal_backfill_enabled: true +matrix_mautrix_signal_backfill_max_initial_messages: 50 +matrix_mautrix_signal_backfill_max_catchup_messages: 500 +matrix_mautrix_signal_backfill_unread_hours_threshold: 720 +matrix_mautrix_signal_backfill_threads_max_initial_messages: 50 + # Whether or not metrics endpoint should be enabled. # Enabling them is usually enough for a local (in-container) Prometheus to consume them. # If metrics need to be consumed by another (external) Prometheus server, consider exposing them via `matrix_mautrix_signal_metrics_proxying_enabled`. diff --git a/roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2 index 9151335af..e4af6d962 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2 @@ -280,18 +280,18 @@ direct_media: # See https://docs.mau.fi/bridges/general/backfill.html for more details. backfill: # Whether to do backfilling at all. - enabled: false + enabled: {{ matrix_mautrix_signal_backfill_enabled | to_json }} # Maximum number of messages to backfill in empty rooms. - max_initial_messages: 50 + max_initial_messages: {{ matrix_mautrix_signal_backfill_max_initial_messages | to_json }} # Maximum number of missed messages to backfill after bridge restarts. - max_catchup_messages: 500 + max_catchup_messages: {{ matrix_mautrix_signal_backfill_max_catchup_messages | to_json }} # If a backfilled chat is older than this number of hours, # mark it as read even if it's unread on the remote network. - unread_hours_threshold: 720 + unread_hours_threshold: {{ matrix_mautrix_signal_backfill_unread_hours_threshold| to_json }} # Settings for backfilling threads within other backfills. threads: # Maximum number of messages to backfill in a new thread. - max_initial_messages: 50 + max_initial_messages: {{ matrix_mautrix_signal_backfill_threads_max_initial_messages | to_json }} # Settings for the backwards backfill queue. This only applies when connecting to # Beeper as standard Matrix servers don't support inserting messages into history. queue: diff --git a/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml index 0ebdae27f..213b1e1f1 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml @@ -55,6 +55,12 @@ matrix_mautrix_slack_homeserver_token: '' matrix_mautrix_slack_appservice_bot_username: slackbot +matrix_mautrix_slack_backfill_enabled: true +matrix_mautrix_slack_backfill_max_initial_messages: 50 +matrix_mautrix_slack_backfill_max_catchup_messages: 500 +matrix_mautrix_slack_backfill_unread_hours_threshold: 720 +matrix_mautrix_slack_backfill_threads_max_initial_messages: 50 + # Minimum severity of journal log messages. # Options: debug, info, warn, error, fatal matrix_mautrix_slack_logging_level: 'warn' diff --git a/roles/custom/matrix-bridge-mautrix-slack/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-slack/templates/config.yaml.j2 index ed3b9c0c2..f1ce5dbe0 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-mautrix-slack/templates/config.yaml.j2 @@ -317,18 +317,18 @@ direct_media: # See https://docs.mau.fi/bridges/general/backfill.html for more details. backfill: # Whether to do backfilling at all. - enabled: false + enabled: {{ matrix_mautrix_slack_backfill_enabled | to_json }} # Maximum number of messages to backfill in empty rooms. - max_initial_messages: 50 + max_initial_messages: {{ matrix_mautrix_slack_backfill_max_initial_messages | to_json }} # Maximum number of missed messages to backfill after bridge restarts. - max_catchup_messages: 500 + max_catchup_messages: {{ matrix_mautrix_slack_backfill_max_catchup_messages | to_json }} # If a backfilled chat is older than this number of hours, # mark it as read even if it's unread on the remote network. - unread_hours_threshold: 720 + unread_hours_threshold: {{ matrix_mautrix_slack_backfill_unread_hours_threshold| to_json }} # Settings for backfilling threads within other backfills. threads: # Maximum number of messages to backfill in a new thread. - max_initial_messages: 50 + max_initial_messages: {{ matrix_mautrix_slack_backfill_threads_max_initial_messages | to_json }} # Settings for the backwards backfill queue. This only applies when connecting to # Beeper as standard Matrix servers don't support inserting messages into history. queue: diff --git a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml index 4ad48c81c..3c5989b44 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml @@ -1,10 +1,5 @@ -# File : roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml -# Author : Pierre (McFly) Marty -# Date : 17.01.2024 -# Last Modified Date: 17.01.2024 -# Last Modified By : Pierre (McFly) Marty -# ----- --- + # mautrix-telegram is a Matrix <-> Telegram bridge # Project source code URL: https://github.com/mautrix/telegram