diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 14:16:09 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 14:16:09 +0100 |
| commit | 197f4646bd9280959323a1175ba4ed471aea224a (patch) | |
| tree | 54e8f8cccad813ab954d7512ed4ae4fed2ba40e8 | |
| parent | unhardcode m.room.avatar (diff) | |
| download | synapse-github/matthew/room-summary-on-invites.tar.xz | |
allow m.room.summary and m.room.encryption events in invites github/matthew/room-summary-on-invites matthew/room-summary-on-invites
to provide better UX for clients receiving invites, so they can show a padlock icon or correct avatars on the inbound invite
| -rw-r--r-- | synapse/api/constants.py | 2 | ||||
| -rw-r--r-- | synapse/config/api.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index c2630c4c64..a1a7db8709 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -70,6 +70,8 @@ class EventTypes(object): RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias" RoomAvatar = "m.room.avatar" + RoomSummary = "m.room.summary" + RoomEncryption = "m.room.encryption" GuestAccess = "m.room.guest_access" # These are used for validation diff --git a/synapse/config/api.py b/synapse/config/api.py index 403d96ba76..0417778cc6 100644 --- a/synapse/config/api.py +++ b/synapse/config/api.py @@ -24,6 +24,8 @@ class ApiConfig(Config): EventTypes.JoinRules, EventTypes.CanonicalAlias, EventTypes.RoomAvatar, + EventTypes.RoomSummary, + EventTypes.RoomEncryption, EventTypes.Name, ]) @@ -36,5 +38,7 @@ class ApiConfig(Config): - "{JoinRules}" - "{CanonicalAlias}" - "{RoomAvatar}" + - "{RoomSummary}" + - "{RoomEncryption}" - "{Name}" """.format(**vars(EventTypes)) |