diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-15 16:54:30 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-07-15 16:54:30 +0100 |
| commit | 97e1159ac19c269b5f6aa9cd62a267e7a1525c7c (patch) | |
| tree | 8597d522e195f8b5a962fccfe3ae6497ba54b224 | |
| parent | Allow accounts to be re-activated from the admin APIs. (#7847) (diff) | |
| parent | Fix tests (diff) | |
| download | synapse-97e1159ac19c269b5f6aa9cd62a267e7a1525c7c.tar.xz | |
Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | changelog.d/7856.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/typing.py | 4 | ||||
| -rw-r--r-- | tests/handlers/test_typing.py | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/7856.misc b/changelog.d/7856.misc new file mode 100644 index 0000000000..7d99fb67be --- /dev/null +++ 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 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: diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 1e6a53bf7f..5878f74175 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -138,10 +138,10 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase): 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 |