Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse i…

…nto develop
matrix-org · Jul 15, 2020 · 97e1159 · 97e1159
2 parents 8c7d0f1 + 9006e12
commit 97e1159
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/changelog.d/7856.misc b/changelog.d/7856.misc
@@ -0,0 +1 @@
+Small performance improvement in typing processing.
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
@@ -185,7 +185,7 @@ def _push_update(self, member, typing):
 
     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 @@ async def _recv_edu(self, origin, content):
             )
             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:

diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
@@ -138,10 +138,10 @@ def get_joined_hosts_for_room(room_id):
 
         self.datastore.get_joined_hosts_for_room = get_joined_hosts_for_room
 
-        def get_current_users_in_room(room_id):
+        def get_users_in_room(room_id):
             return defer.succeed({str(u) for u in self.room_members})
 
-        hs.get_state_handler().get_current_users_in_room = get_current_users_in_room
+        self.datastore.get_users_in_room = get_users_in_room
 
         self.datastore.get_user_directory_stream_pos.return_value = (
             # we deliberately return a non-None stream pos to avoid doing an initial_spam
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Small performance improvement in typing processing.