Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-19 01:34:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #375 from matrix-org/daniel/guestroominitialsync

Browse Source 
Clean up room initialSync for guest users
This commit is contained in:
Daniel Wagner-Hall 2015-11-23 16:10:49 +00:00
commit 924d85a75e
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
synapse/handlers/message.py
View File

@ -588,23 +588,28 @@ class MessageHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_presence(): def get_presence():
states = {} states = yield presence_handler.get_states(
if not is_guest: target_users=[UserID.from_string(m.user_id) for m in room_members],
states = yield presence_handler.get_states( auth_user=auth_user,
target_users=[UserID.from_string(m.user_id) for m in room_members], as_event=True,
auth_user=auth_user, check_auth=False,
as_event=True, )
check_auth=False,
)
defer.returnValue(states.values()) defer.returnValue(states.values())
receipts_handler = self.hs.get_handlers().receipts_handler @defer.inlineCallbacks
def get_receipts():
receipts_handler = self.hs.get_handlers().receipts_handler
receipts = yield receipts_handler.get_receipts_for_room(
room_id,
now_token.receipt_key
)
defer.returnValue(receipts)
presence, receipts, (messages, token) = yield defer.gatherResults( presence, receipts, (messages, token) = yield defer.gatherResults(
[ [
get_presence(), get_presence(),
receipts_handler.get_receipts_for_room(room_id, now_token.receipt_key), get_receipts(),
self.store.get_recent_events_for_room( self.store.get_recent_events_for_room(
room_id, room_id,
limit=limit, limit=limit,