mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-09 13:42:02 +00:00
Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse
This commit is contained in:
commit
3346a21324
@ -1,3 +1,10 @@
|
|||||||
|
Changes in synapse v0.19.2 (2017-02-20)
|
||||||
|
=======================================
|
||||||
|
|
||||||
|
* Fix bug with event visibility check in /context/ API. Thanks to Tokodomo for
|
||||||
|
pointing it out! (PR #1929)
|
||||||
|
|
||||||
|
|
||||||
Changes in synapse v0.19.1 (2017-02-09)
|
Changes in synapse v0.19.1 (2017-02-09)
|
||||||
=======================================
|
=======================================
|
||||||
|
|
||||||
|
@ -16,4 +16,4 @@
|
|||||||
""" This is a reference implementation of a Matrix home server.
|
""" This is a reference implementation of a Matrix home server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "0.19.1"
|
__version__ = "0.19.2"
|
||||||
|
@ -356,7 +356,7 @@ class RoomCreationHandler(BaseHandler):
|
|||||||
|
|
||||||
class RoomContextHandler(BaseHandler):
|
class RoomContextHandler(BaseHandler):
|
||||||
@defer.inlineCallbacks
|
@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
|
"""Retrieves events, pagination tokens and state around a given event
|
||||||
in a room.
|
in a room.
|
||||||
|
|
||||||
@ -375,12 +375,15 @@ class RoomContextHandler(BaseHandler):
|
|||||||
|
|
||||||
now_token = yield self.hs.get_event_sources().get_current_token()
|
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):
|
def filter_evts(events):
|
||||||
return filter_events_for_client(
|
return filter_events_for_client(
|
||||||
self.store,
|
self.store,
|
||||||
user.to_string(),
|
user.to_string(),
|
||||||
events,
|
events,
|
||||||
is_peeking=is_guest
|
is_peeking=is_peeking
|
||||||
)
|
)
|
||||||
|
|
||||||
event = yield self.store.get_event(event_id, get_prev_content=True,
|
event = yield self.store.get_event(event_id, get_prev_content=True,
|
||||||
|
@ -505,7 +505,6 @@ class RoomEventContext(ClientV1RestServlet):
|
|||||||
room_id,
|
room_id,
|
||||||
event_id,
|
event_id,
|
||||||
limit,
|
limit,
|
||||||
requester.is_guest,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if not results:
|
if not results:
|
||||||
|
Loading…
Reference in New Issue
Block a user