diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 17:08:15 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 17:08:15 +0000 |
| commit | 85d36b62c4c2f3fbeb1415cf43df1383830effe2 (patch) | |
| tree | a372b626ef0f20804a20d9f9c940cc96f9c1a239 /synapse/handlers | |
| parent | Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fed (diff) | |
| parent | Fix detecting unknown devices from remote encrypted events. (#6848) (diff) | |
| download | synapse-85d36b62c4c2f3fbeb1415cf43df1383830effe2.tar.xz | |
Fix detecting unknown devices from remote encrypted events. (#6848)
* commit '6475382d8': Fix detecting unknown devices from remote encrypted events. (#6848)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/stats.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index a8cbb2f2c4..28ec48dc70 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -756,7 +756,7 @@ class FederationHandler(BaseHandler): # For encrypted messages we check that we know about the sending device, # if we don't then we mark the device cache for that user as stale. - if event.type == EventTypes.Encryption: + if event.type == EventTypes.Encrypted: device_id = event.content.get("device_id") if device_id is not None: cached_devices = await self.store.get_cached_devices_for_user( diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index da75e7bfab..4b836d5bd0 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -374,7 +374,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.RoomHistoryVisibility, ""), (EventTypes.GuestAccess, ""), (EventTypes.RoomAvatar, ""), - (EventTypes.Encryption, ""), + (EventTypes.RoomEncryption, ""), (EventTypes.ServerACL, ""), (EventTypes.RelatedGroups, ""), (EventTypes.PowerLevels, ""), diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py index 7f7d56390e..68e6edace5 100644 --- a/synapse/handlers/stats.py +++ b/synapse/handlers/stats.py @@ -286,7 +286,7 @@ class StatsHandler(StateDeltasHandler): room_state["history_visibility"] = event_content.get( "history_visibility" ) - elif typ == EventTypes.Encryption: + elif typ == EventTypes.RoomEncryption: room_state["encryption"] = event_content.get("algorithm") elif typ == EventTypes.Name: room_state["name"] = event_content.get("name") |