diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
| commit | 6a0092d3715a168415619fd253c7fb4da5faf348 (patch) | |
| tree | 72f8553014ff152fecd10a40cd2ad7b46387f44d /synapse/handlers/account_data.py | |
| parent | Fix up comment (diff) | |
| parent | document the REPLICATE command a bit better (#6305) (diff) | |
| download | synapse-6a0092d3715a168415619fd253c7fb4da5faf348.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/handlers/account_data.py')
| -rw-r--r-- | synapse/handlers/account_data.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/account_data.py b/synapse/handlers/account_data.py index 38bc67191c..2d7e6df6e4 100644 --- a/synapse/handlers/account_data.py +++ b/synapse/handlers/account_data.py @@ -38,9 +38,10 @@ class AccountDataEventSource(object): {"type": "m.tag", "content": {"tags": room_tags}, "room_id": room_id} ) - account_data, room_account_data = ( - yield self.store.get_updated_account_data_for_user(user_id, last_stream_id) - ) + ( + account_data, + room_account_data, + ) = yield self.store.get_updated_account_data_for_user(user_id, last_stream_id) for account_data_type, content in account_data.items(): results.append({"type": account_data_type, "content": content}) |