summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
committerErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
commit97e1159ac19c269b5f6aa9cd62a267e7a1525c7c (patch)
tree8597d522e195f8b5a962fccfe3ae6497ba54b224 /synapse
parentAllow accounts to be re-activated from the admin APIs. (#7847) (diff)
parentFix tests (diff)
downloadsynapse-97e1159ac19c269b5f6aa9cd62a267e7a1525c7c.tar.xz
Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/typing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 879c4c07c6..846ddbdc6c 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -185,7 +185,7 @@ class TypingHandler(object):
 
     async def _push_remote(self, member, typing):
         try:
-            users = await self.state.get_current_users_in_room(member.room_id)
+            users = await self.store.get_users_in_room(member.room_id)
             self._member_last_federation_poke[member] = self.clock.time_msec()
 
             now = self.clock.time_msec()
@@ -224,7 +224,7 @@ class TypingHandler(object):
             )
             return
 
-        users = await self.state.get_current_users_in_room(room_id)
+        users = await self.store.get_users_in_room(room_id)
         domains = {get_domain_from_id(u) for u in users}
 
         if self.server_name in domains: