Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-filter-spaces2

Conflicts:
	synapse/handlers/sliding_sync.py
	tests/handlers/test_sliding_sync.py
This commit is contained in:
Eric Eastwood 2024-06-13 15:17:26 -05:00
commit 8b42e2aecf

View file

@ -489,7 +489,7 @@ class SlidingSyncHandler:
# TODO: Re-order filters so that the easiest, most likely to eliminate rooms,
# are first. This way when people use multiple filters, we can eliminate rooms
# and do less work for the subsequent filters.
#
# TODO: Exclude partially stated rooms unless the `required_state` has
# `["m.room.member", "$LAZY"]`