summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorNathan Pennie <kb1rd@kb1rd.net>2018-12-19 06:53:02 -0500
committerGitHub <noreply@github.com>2018-12-19 06:53:02 -0500
commit668e6625b0ec1c9dde0f81713c2c4a4f5a62f5b0 (patch)
treeed8a368baaf1ca9689dde3ff6ece2d34a92cd7b4 /synapse/handlers/sync.py
parentensure can report mau stats when hs.config.mau_stats_only is set (#4305) (diff)
downloadsynapse-668e6625b0ec1c9dde0f81713c2c4a4f5a62f5b0.tar.xz
Fix the variable names used for account_data
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 09739f2862..6d2b4096ab 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1668,13 +1668,13 @@ class SyncHandler(object):
                 "content": content,
             })
 
-        account_data = sync_config.filter_collection.filter_room_account_data(
+        account_data_events = sync_config.filter_collection.filter_room_account_data(
             account_data_events
         )
 
         ephemeral = sync_config.filter_collection.filter_room_ephemeral(ephemeral)
 
-        if not (always_include or batch or account_data or ephemeral or full_state):
+        if not (always_include or batch or account_data_events or ephemeral or full_state):
             return
 
         state = yield self.compute_state_delta(
@@ -1745,7 +1745,7 @@ class SyncHandler(object):
                 room_id=room_id,
                 timeline=batch,
                 state=state,
-                account_data=account_data,
+                account_data=account_data_events,
             )
             if room_sync or always_include:
                 sync_result_builder.archived.append(room_sync)