Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pushers

Browse source 
Conflicts:
	synapse/rest/__init__.py
This commit is contained in:
David Baker 2015-01-22 17:46:16 +00:00
commit 5c6189ea3e
91 changed files with 638 additions and 1705 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/events.py
View file

@ -70,10 +70,8 @@ class EventStreamHandler(BaseHandler):
pagin_config.from_token = None
rm_handler = self.hs.get_handlers().room_member_handler
logger.debug("BETA")
room_ids = yield rm_handler.get_rooms_for_user(auth_user)
logger.debug("ALPHA")
with PreserveLoggingContext():
events, tokens = yield self.notifier.get_events_for(
auth_user, room_ids, pagin_config, timeout