diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:13:34 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:13:34 +0100 |
commit | dae6dc1e776cc6198dc1f71575876fc16693c170 (patch) | |
tree | c0d3bddd971c0e2aa003193460a01b849b7c63b7 /synapse/storage/push_rule.py | |
parent | Merge pull request #3571 from matrix-org/rav/limiter_fixes (diff) | |
download | synapse-dae6dc1e776cc6198dc1f71575876fc16693c170.tar.xz |
Remove redundant checks on room forgottenness
Fixes #3550
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r-- | synapse/storage/push_rule.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index be655d287b..d25b39ec02 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -21,7 +21,6 @@ from canonicaljson import json from twisted.internet import defer -from synapse.api.constants import EventTypes from synapse.push.baserules import list_with_base_rules from synapse.storage.appservice import ApplicationServiceWorkerStore from synapse.storage.pusher import PusherWorkerStore @@ -247,18 +246,6 @@ class PushRulesWorkerStore(ApplicationServiceWorkerStore, if uid in local_users_in_room: user_ids.add(uid) - forgotten = yield self.who_forgot_in_room( - event.room_id, on_invalidate=cache_context.invalidate, - ) - - for row in forgotten: - user_id = row["user_id"] - event_id = row["event_id"] - - mem_id = current_state_ids.get((EventTypes.Member, user_id), None) - if event_id == mem_id: - user_ids.discard(user_id) - rules_by_user = yield self.bulk_get_push_rules( user_ids, on_invalidate=cache_context.invalidate, ) |