Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Include read receipts in v2 sync #341

Merged
merged 2 commits into from
Nov 3, 2015
Merged

Include read receipts in v2 sync #341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2657140
Include read receipts in v2 sync
Nov 2, 2015
a3bfef3
Merge branch 'develop' into markjh/v2_sync_receipts
Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 30 additions & 15 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def full_state_sync(self, sync_config, timeline_since_token):
"""
now_token = yield self.event_sources.get_current_token()

now_token, typing_by_room = yield self.typing_by_room(
now_token, ephemeral_by_room = yield self.ephemeral_by_room(
sync_config, now_token
)

Expand Down Expand Up @@ -222,7 +222,7 @@ def full_state_sync(self, sync_config, timeline_since_token):
sync_config=sync_config,
now_token=now_token,
timeline_since_token=timeline_since_token,
typing_by_room=typing_by_room,
ephemeral_by_room=ephemeral_by_room,
tags_by_room=tags_by_room,
)
joined.append(room_sync)
Expand Down Expand Up @@ -257,7 +257,7 @@ def full_state_sync(self, sync_config, timeline_since_token):
@defer.inlineCallbacks
def full_state_sync_for_joined_room(self, room_id, sync_config,
now_token, timeline_since_token,
typing_by_room, tags_by_room):
ephemeral_by_room, tags_by_room):
"""Sync a room for a client which is starting without any state
Returns:
A Deferred JoinedSyncResult.
Expand All @@ -276,7 +276,7 @@ def full_state_sync_for_joined_room(self, room_id, sync_config,
room_id=room_id,
timeline=batch,
state=current_state_events,
ephemeral=typing_by_room.get(room_id, []),
ephemeral=ephemeral_by_room.get(room_id, []),
private_user_data=self.private_user_data_for_room(
room_id, tags_by_room
),
Expand All @@ -293,8 +293,8 @@ def private_user_data_for_room(self, room_id, tags_by_room):
return private_user_data

@defer.inlineCallbacks
def typing_by_room(self, sync_config, now_token, since_token=None):
"""Get the typing events for each room the user is in
def ephemeral_by_room(self, sync_config, now_token, since_token=None):
"""Get the ephemeral events for each room the user is in
Args:
sync_config (SyncConfig): The flags, filters and user for the sync.
now_token (StreamToken): Where the server is currently up to.
Expand All @@ -316,12 +316,27 @@ def typing_by_room(self, sync_config, now_token, since_token=None):
)
now_token = now_token.copy_and_replace("typing_key", typing_key)

typing_by_room = {event["room_id"]: [event] for event in typing}
ephemeral_by_room = {}

for event in typing:
event.pop("room_id")
logger.debug("Typing %r", typing_by_room)
room_id = event.pop("room_id")
ephemeral_by_room.setdefault(room_id, []).append(event)

receipt_key = since_token.receipt_key if since_token else "0"

receipt_source = self.event_sources.sources["receipt"]
receipts, receipt_key = yield receipt_source.get_new_events_for_user(
user=sync_config.user,
from_key=receipt_key,
limit=sync_config.filter.ephemeral_limit(),
)
now_token = now_token.copy_and_replace("receipt_key", receipt_key)

for event in receipts:
room_id = event.pop("room_id")
ephemeral_by_room.setdefault(room_id, []).append(event)

defer.returnValue((now_token, typing_by_room))
defer.returnValue((now_token, ephemeral_by_room))

@defer.inlineCallbacks
def full_state_sync_for_archived_room(self, room_id, sync_config,
Expand Down Expand Up @@ -366,7 +381,7 @@ def incremental_sync_with_gap(self, sync_config, since_token):
)
now_token = now_token.copy_and_replace("presence_key", presence_key)

now_token, typing_by_room = yield self.typing_by_room(
now_token, ephemeral_by_room = yield self.ephemeral_by_room(
sync_config, now_token, since_token
)

Expand Down Expand Up @@ -437,7 +452,7 @@ def incremental_sync_with_gap(self, sync_config, since_token):
limited=limited,
),
state=state,
ephemeral=typing_by_room.get(room_id, []),
ephemeral=ephemeral_by_room.get(room_id, []),
private_user_data=self.private_user_data_for_room(
room_id, tags_by_room
),
Expand All @@ -457,7 +472,7 @@ def incremental_sync_with_gap(self, sync_config, since_token):
for room_id in joined_room_ids:
room_sync = yield self.incremental_sync_with_gap_for_room(
room_id, sync_config, since_token, now_token,
typing_by_room, tags_by_room
ephemeral_by_room, tags_by_room
)
if room_sync:
joined.append(room_sync)
Expand Down Expand Up @@ -528,7 +543,7 @@ def load_filtered_recents(self, room_id, sync_config, now_token,
@defer.inlineCallbacks
def incremental_sync_with_gap_for_room(self, room_id, sync_config,
since_token, now_token,
typing_by_room, tags_by_room):
ephemeral_by_room, tags_by_room):
""" Get the incremental delta needed to bring the client up to date for
the room. Gives the client the most recent events and the changes to
state.
Expand Down Expand Up @@ -569,7 +584,7 @@ def incremental_sync_with_gap_for_room(self, room_id, sync_config,
room_id=room_id,
timeline=batch,
state=state_events_delta,
ephemeral=typing_by_room.get(room_id, []),
ephemeral=ephemeral_by_room.get(room_id, []),
private_user_data=self.private_user_data_for_room(
room_id, tags_by_room
),
Expand Down