diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 44bdc97ccb..aed640450f 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -428,13 +428,21 @@ class PresenceHandler(BaseHandler):
hosts_to_states = {}
for room_id, states in room_ids_to_states.items():
+ local_states = filter(lambda s: self.hs.is_mine_id(s.user_id), states)
+ if not local_states:
+ continue
+
hosts = yield self.store.get_joined_hosts_for_room(room_id)
for host in hosts:
- hosts_to_states.setdefault(host, []).extend(states)
+ hosts_to_states.setdefault(host, []).extend(local_states)
for user_id, states in users_to_states.items():
+ local_states = filter(lambda s: self.hs.is_mine_id(s.user_id), states)
+ if not local_states:
+ continue
+
host = UserID.from_string(user_id).domain
- hosts_to_states.setdefault(host, []).extend(states)
+ hosts_to_states.setdefault(host, []).extend(local_states)
# TODO: de-dup hosts_to_states, as a single host might have multiple
# of same presence
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index efeec72fd8..558c7bacb9 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -845,16 +845,20 @@ class SyncHandler(BaseHandler):
# TODO(mjark) Check for new redactions in the state events.
with Measure(self.clock, "compute_state_delta"):
- current_state = yield self.get_state_at(
- room_id, stream_position=now_token
- )
-
if full_state:
if batch:
+ current_state = yield self.store.get_state_for_event(
+ batch.events[-1].event_id
+ )
+
state = yield self.store.get_state_for_event(
batch.events[0].event_id
)
else:
+ current_state = yield self.get_state_at(
+ room_id, stream_position=now_token
+ )
+
state = current_state
timeline_state = {
@@ -873,6 +877,10 @@ class SyncHandler(BaseHandler):
room_id, stream_position=since_token
)
+ current_state = yield self.store.get_state_for_event(
+ batch.events[-1].event_id
+ )
+
state_at_timeline_start = yield self.store.get_state_for_event(
batch.events[0].event_id
)
|
