tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #4309 from KB1RD/KB1RD-fixes

Browse source 
Fix the variable names used for account_data
This commit is contained in:
Richard van der Hoff 2018-12-19 22:52:59 +01:00 committed by GitHub
commit 3b2ba2fbb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4309.bugfix Normal file
View file

@ -0,0 +1 @@
Fixed per-room account data filters

10
synapse/handlers/sync.py
View file

@ -1668,13 +1668,17 @@ class SyncHandler(object):
"content": content, "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 account_data_events
) )
ephemeral = sync_config.filter_collection.filter_room_ephemeral(ephemeral) 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 return
state = yield self.compute_state_delta( state = yield self.compute_state_delta(
@ -1745,7 +1749,7 @@ class SyncHandler(object):
room_id=room_id, room_id=room_id,
timeline=batch, timeline=batch,
state=state, state=state,
account_data=account_data, account_data=account_data_events,
) )
if room_sync or always_include: if room_sync or always_include:
sync_result_builder.archived.append(room_sync) sync_result_builder.archived.append(room_sync)