diff options
| author | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-12-16 10:40:10 +0000 |
| commit | f5a4001bb116c468cc5e8e0ae04a1c570e2cb171 (patch) | |
| tree | fce7147d9b4422f76b5cec8b53312bb34932d84f /synapse/storage/push_rule.py | |
| parent | Merge pull request #1685 from matrix-org/rav/update_readme_for_tests (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-f5a4001bb116c468cc5e8e0ae04a1c570e2cb171.tar.xz | |
Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse v0.18.5
Diffstat (limited to 'synapse/storage/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 49721656b6..cbec255966 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -156,12 +156,20 @@ class PushRuleStore(SQLBaseStore): event=event, ) - local_users_in_room = set(u for u in users_in_room if self.hs.is_mine_id(u)) + # We ignore app service users for now. This is so that we don't fill + # up the `get_if_users_have_pushers` cache with AS entries that we + # know don't have pushers, nor even read receipts. + local_users_in_room = set( + u for u in users_in_room + if self.hs.is_mine_id(u) + and not self.get_if_app_services_interested_in_user(u) + ) # users in the room who have pushers need to get push rules run because # that's how their pushers work if_users_with_pushers = yield self.get_if_users_have_pushers( - local_users_in_room, on_invalidate=cache_context.invalidate, + local_users_in_room, + on_invalidate=cache_context.invalidate, ) user_ids = set( uid for uid, have_pusher in if_users_with_pushers.items() if have_pusher |