diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-21 13:45:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-21 13:45:02 +0000 |
| commit | 3346a213241544faa48b1243906452a646f93a4a (patch) | |
| tree | 9b94212dbce78d9bc1e82cf99204518fc72fe5ed /synapse | |
| parent | Update metrics-howto.rst (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-3346a213241544faa48b1243906452a646f93a4a.tar.xz | |
Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse v0.19.2
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 7 | ||||
| -rw-r--r-- | synapse/rest/client/v1/room.py | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index da8ef90a77..ff251ce597 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.19.1" +__version__ = "0.19.2" diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 7e7671c9a2..99cb7db0db 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -356,7 +356,7 @@ class RoomCreationHandler(BaseHandler): class RoomContextHandler(BaseHandler): @defer.inlineCallbacks - def get_event_context(self, user, room_id, event_id, limit, is_guest): + def get_event_context(self, user, room_id, event_id, limit): """Retrieves events, pagination tokens and state around a given event in a room. @@ -375,12 +375,15 @@ class RoomContextHandler(BaseHandler): now_token = yield self.hs.get_event_sources().get_current_token() + users = yield self.store.get_users_in_room(room_id) + is_peeking = user.to_string() not in users + def filter_evts(events): return filter_events_for_client( self.store, user.to_string(), events, - is_peeking=is_guest + is_peeking=is_peeking ) event = yield self.store.get_event(event_id, get_prev_content=True, diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 2ebf5e59a0..6554f57df1 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -505,7 +505,6 @@ class RoomEventContext(ClientV1RestServlet): room_id, event_id, limit, - requester.is_guest, ) if not results: |