diff options
| author | Erik Johnston <erik@matrix.org> | 2020-02-06 11:04:03 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-02-06 11:04:03 +0000 |
| commit | 2201ef8556a5b9aae48f9dc4a7b7b8b7c00940cd (patch) | |
| tree | 4942a7e144158592e72efa30a73727ec13ffde99 /synapse/storage/data_stores | |
| parent | Merge pull request #6855 from matrix-org/clokep/readme-pip-install (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-2201ef8556a5b9aae48f9dc4a7b7b8b7c00940cd.tar.xz | |
Merge tag 'v1.10.0rc2' into develop
Synapse 1.10.0rc2 (2020-02-06) ============================== Bugfixes -------- - Fix an issue with cross-signing where device signatures were not sent to remote servers. ([\#6844](https://github.com/matrix-org/synapse/issues/6844)) - Fix to the unknown remote device detection which was introduced in 1.10.rc1. ([\#6848](https://github.com/matrix-org/synapse/issues/6848)) Internal Changes ---------------- - Detect unexpected sender keys on remote encrypted events and resync device lists. ([\#6850](https://github.com/matrix-org/synapse/issues/6850))
Diffstat (limited to 'synapse/storage/data_stores')
| -rw-r--r-- | synapse/storage/data_stores/main/stats.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/stats.py b/synapse/storage/data_stores/main/stats.py index 7bc186e9a1..7af1495e47 100644 --- a/synapse/storage/data_stores/main/stats.py +++ b/synapse/storage/data_stores/main/stats.py @@ -744,7 +744,7 @@ class StatsStore(StateDeltasStore): EventTypes.Create, EventTypes.JoinRules, EventTypes.RoomHistoryVisibility, - EventTypes.Encryption, + EventTypes.RoomEncryption, EventTypes.Name, EventTypes.Topic, EventTypes.RoomAvatar, @@ -816,7 +816,7 @@ class StatsStore(StateDeltasStore): room_state["history_visibility"] = event.content.get( "history_visibility" ) - elif event.type == EventTypes.Encryption: + elif event.type == EventTypes.RoomEncryption: room_state["encryption"] = event.content.get("algorithm") elif event.type == EventTypes.Name: room_state["name"] = event.content.get("name") |