From 82a05d37eb7873b23285fbcabf1b8a7b56613c49 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 2 Aug 2024 10:40:35 +0100 Subject: [PATCH 1/2] Clarify `auto_accept_invites.worker_to_run_on` config docs --- docs/usage/configuration/config_documentation.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index 40f64be8561..567bbf88d28 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -4685,7 +4685,9 @@ This setting has the following sub-options: * `only_for_direct_messages`: Whether invites should be automatically accepted for all room types, or only for direct messages. Defaults to false. * `only_from_local_users`: Whether to only automatically accept invites from users on this homeserver. Defaults to false. -* `worker_to_run_on`: Which worker to run this module on. This must match the "worker_name". +* `worker_to_run_on`: Which worker to run this module on. This must match + the "worker_name". If not set or `null`, invites will be accepted on the + main process. NOTE: Care should be taken not to enable this setting if the `synapse_auto_accept_invite` module is enabled and installed. The two modules will compete to perform the same task and may result in undesired behaviour. For example, multiple join From f05252dce5c6a98fbdc64e3ff705b0d0a067c4de Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 2 Aug 2024 10:42:24 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/17515.doc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/17515.doc diff --git a/changelog.d/17515.doc b/changelog.d/17515.doc new file mode 100644 index 00000000000..c2dbe24e9de --- /dev/null +++ b/changelog.d/17515.doc @@ -0,0 +1,3 @@ +Clarify default behaviour of the +[`auto_accept_invites.worker_to_run_on`](https://element-hq.github.io/synapse/develop/usage/configuration/config_documentation.html#auto-accept-invites) +option. \ No newline at end of file