Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert

1 files changed, 1 insertions, 2 deletions

diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py

index 059260a8aa..1ede117c79 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -575,8 +575,7 @@ class PresenceHandler(object):
                 if not local_states:
                     continue
 
-                users = yield self.store.get_users_in_room(room_id)
-                hosts = set(get_domain_from_id(u) for u in users)
+                hosts = yield self.store.get_hosts_in_room(room_id)
 
                 for host in hosts:
                     hosts_to_states.setdefault(host, []).extend(local_states)