Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-23 18:19:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Filter rooms list before chunking

Browse Source
This commit is contained in:
Erik Johnston 2016-04-01 13:10:07 +01:00
parent c42f46ab7d
commit 35bb465b86
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
synapse/handlers/sync.py
View File

@ -252,6 +252,18 @@ class SyncHandler(BaseHandler):
archived = [] archived = []
deferreds = [] deferreds = []
user_id = sync_config.user.to_string()
def _should_include_room(event):
# Always send down rooms we were banned or kicked from.
if not sync_config.filter_collection.include_leave:
if event.membership == Membership.LEAVE:
if user_id == event.sender:
return False
return True
room_list = filter(_should_include_room, room_list)
room_list_chunks = [room_list[i:i + 10] for i in xrange(0, len(room_list), 10)] room_list_chunks = [room_list[i:i + 10] for i in xrange(0, len(room_list), 10)]
for room_list_chunk in room_list_chunks: for room_list_chunk in room_list_chunks:
for event in room_list_chunk: for event in room_list_chunk:
@ -276,12 +288,6 @@ class SyncHandler(BaseHandler):
invite=invite, invite=invite,
)) ))
elif event.membership in (Membership.LEAVE, Membership.BAN): elif event.membership in (Membership.LEAVE, Membership.BAN):
# Always send down rooms we were banned or kicked from.
if not sync_config.filter_collection.include_leave:
if event.membership == Membership.LEAVE:
if sync_config.user.to_string() == event.sender:
continue
leave_token = now_token.copy_and_replace( leave_token = now_token.copy_and_replace(
"room_key", "s%d" % (event.stream_ordering,) "room_key", "s%d" % (event.stream_ordering,)
) )