diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-01-21 09:42:59 +0000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-21 20:42:58 +1100 |
| commit | 702c4b750c4db529d3789a899aa9badfa8c9df6e (patch) | |
| tree | 0953d513f3f270e6ffcccc4124717dd1521bfecc /synapse | |
| parent | Fix race when persisting create event (#4404) (diff) | |
| download | synapse-702c4b750c4db529d3789a899aa9badfa8c9df6e.tar.xz | |
Migrate encryption state on room upgrade (#4411)
* Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/api/constants.py | 1 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 022f772714..46c4b4b9dc 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -68,6 +68,7 @@ class EventTypes(object): Aliases = "m.room.aliases" Redaction = "m.room.redaction" ThirdPartyInvite = "m.room.third_party_invite" + Encryption = "m.room.encryption" RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias" diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 581e96c743..cb8c5f77dd 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -269,6 +269,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.RoomHistoryVisibility, ""), (EventTypes.GuestAccess, ""), (EventTypes.RoomAvatar, ""), + (EventTypes.Encryption, ""), ) old_room_state_ids = yield self.store.get_filtered_current_state_ids( |