Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix the variable names used for account_data #4309

Merged
richvdh merged 3 commits into from
Dec 19, 2018
Merged

Fix the variable names used for account_data #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
668e662
Fix the variable names used for account_data
KB1RD Dec 19, 2018
81b5134
Fixed line length
KB1RD Dec 19, 2018
da8628b
Create 4309.bugfix
KB1RD Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4309.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed per-room account data filters
10 changes: 7 additions & 3 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,13 +1668,17 @@ def _generate_room_entry(self, sync_result_builder, ignored_users,
"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(
Expand Down Expand Up @@ -1745,7 +1749,7 @@ def _generate_room_entry(self, sync_result_builder, ignored_users,
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)
Expand Down