summary refs log tree commit diff
path: root/synapse/handlers/account_data.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
commit6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch)
tree1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/handlers/account_data.py
parentrename get_devices_by_remote to get_device_updates_by_remote (diff)
parentMerge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff)
downloadsynapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/handlers/account_data.py')
-rw-r--r--synapse/handlers/account_data.py7
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})