diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
| commit | 6a0092d3715a168415619fd253c7fb4da5faf348 (patch) | |
| tree | 72f8553014ff152fecd10a40cd2ad7b46387f44d /synapse/handlers/pagination.py | |
| parent | Fix up comment (diff) | |
| parent | document the REPLICATE command a bit better (#6305) (diff) | |
| download | synapse-6a0092d3715a168415619fd253c7fb4da5faf348.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 6d8b04efe3..260a4351ca 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -214,9 +214,10 @@ class PaginationHandler(object): source_config = pagin_config.get_source_config("room") with (yield self.pagination_lock.read(room_id)): - membership, member_event_id = yield self.auth.check_in_room_or_world_readable( - room_id, user_id - ) + ( + membership, + member_event_id, + ) = yield self.auth.check_in_room_or_world_readable(room_id, user_id) if source_config.direction == "b": # if we're going backwards, we might need to backfill. This @@ -299,10 +300,8 @@ class PaginationHandler(object): } if state: - chunk["state"] = ( - yield self._event_serializer.serialize_events( - state, time_now, as_client_event=as_client_event - ) + chunk["state"] = yield self._event_serializer.serialize_events( + state, time_now, as_client_event=as_client_event ) return chunk |