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

Send the m.room.create stripped event with invites (support MSC1772). #9966

Merged
merged 4 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.d/9915.feature
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Support stable identifiers from [MSC1772](https://github.com/matrix-org/matrix-doc/pull/1772).
Support [MSC1772](https://github.com/matrix-org/matrix-doc/pull/1772).
1 change: 1 addition & 0 deletions changelog.d/9966.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support [MSC1772](https://github.com/matrix-org/matrix-doc/pull/1772).
clokep marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions docs/sample_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,7 @@ room_prejoin_state:
# - m.room.avatar
# - m.room.encryption
# - m.room.name
# - m.room.create
#
# Uncomment the following to disable these defaults (so that only the event
# types listed in 'additional_event_types' are shared). Defaults to 'false'.
Expand Down
6 changes: 2 additions & 4 deletions synapse/config/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ def _get_prejoin_state_types(self, config: JsonDict) -> Iterable[str]:
if not room_prejoin_state_config.get("disable_default_event_types"):
yield from _DEFAULT_PREJOIN_STATE_TYPES

if self.spaces_enabled:
# MSC1772 suggests adding m.room.create to the prejoin state
yield EventTypes.Create

yield from room_prejoin_state_config.get("additional_event_types", [])


Expand All @@ -109,6 +105,8 @@ def _get_prejoin_state_types(self, config: JsonDict) -> Iterable[str]:
EventTypes.RoomAvatar,
EventTypes.RoomEncryption,
EventTypes.Name,
# Per MSC1772.
EventTypes.Create,
]


Expand Down