1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 44bdc97ccb..acf400e324 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
@@ -514,6 +522,7 @@ class PresenceHandler(BaseHandler):
new_fields["last_active_ts"] = now - last_active_ago
new_fields["status_msg"] = push.get("status_msg", None)
+ new_fields["currently_active"] = push.get("currently_active", False)
prev_state = yield self.current_state_for_user(user_id)
updates.append(prev_state.copy_and_replace(**new_fields))
|
