Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Additional configuration options for auto-join rooms #7763

Merged
merged 3 commits into from
Jun 30, 2020

Conversation

clokep
Copy link
Member

@clokep clokep commented Jun 30, 2020

This adds a couple of additional configuration options for auto-join rooms:

  • autocreate_auto_join_rooms_federated to control whether those rooms should be federated
  • autocreate_auto_join_room_preset to control the preset when those rooms are created
  • auto_join_mxid_localpart to help with rooms that need an invite to be sent to join (e.g. invite only rooms)

This also makes a few tangentially related changes:

  • Updates some documentation in the config
  • The auto-join rooms now explicitly must be aliases, not IDs (as far as I can tell providing room IDs has been broken for > 5 years)
  • Uses some constants in additional places

@clokep clokep requested a review from a team June 30, 2020 18:29
Copy link
Member

@erikjohnston erikjohnston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand the config options comments got discussed at length, so I won't weigh in there 🙂 Code LGTM though

@clokep clokep merged commit 71cccf1 into develop Jun 30, 2020
@clokep clokep deleted the clokep/auto-join-presets branch June 30, 2020 19:41
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'dc80a0762':
  1.16.0rc1
  Back out MSC2625 implementation (#7761)
  Additional configuration options for auto-join rooms (#7763)
  Add some metrics for inbound and outbound federation processing times (#7755)
  Explain the purpose of the "tests" conditional dependency requirement (#7751)
  Add another yield point to state res v2 (#7746)
  Move flake8 to end. Don't exit script on failure (#7738)
  Make tox actions work on Debian 10 (#7703)
  Yield during large v2 state res. (#7735)
  add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)
  Set Content-Length for Metrics requests (#7730)
  Sync ignored table names in synapse_port_db to current database schema (#7717)
  Allow local media to be marked as safe from being quarantined. (#7718)
  Convert directory handler to async/await (#7727)
  Speed up state res v2 across large state differences. (#7725)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants