diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:35:17 +0000 |
| commit | 347146be2928d36937d44130748ead296ed28f94 (patch) | |
| tree | 4960b2026946b938ffd35f371508cdb7adadde3e /synapse/handlers/room.py | |
| parent | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Open up /events to anonymous users for room events only (diff) | |
| download | synapse-347146be2928d36937d44130748ead296ed28f94.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 36878a6c20..736ffe9066 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -807,7 +807,14 @@ class RoomEventSource(object): self.store = hs.get_datastore() @defer.inlineCallbacks - def get_new_events_for_user(self, user, from_key, limit): + def get_new_events( + self, + user, + from_key, + limit, + room_ids, + is_guest, + ): # We just ignore the key for now. to_key = yield self.get_current_key() @@ -827,8 +834,9 @@ class RoomEventSource(object): user_id=user.to_string(), from_key=from_key, to_key=to_key, - room_id=None, limit=limit, + room_ids=room_ids, + is_guest=is_guest, ) defer.returnValue((events, end_key)) |