diff options
author | Erik Johnston <erik@matrix.org> | 2022-07-20 14:59:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2022-07-20 14:59:43 +0100 |
commit | d3995049a8f2f2a2ebd1d8a3abed4c84820fe7ff (patch) | |
tree | a3d06b8380a2ec6739a13454c360a4e6edde3a3a /synapse | |
parent | Fix spurious warning when fetching state after a missing prev event (#13258) (diff) | |
parent | 1.63.1 (diff) | |
download | synapse-d3995049a8f2f2a2ebd1d8a3abed4c84820fe7ff.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index e581af9a9a..713dcf6950 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -131,6 +131,13 @@ class BulkPushRuleEvaluator: local_users = await self.store.get_local_users_in_room(event.room_id) + # Filter out appservice users. + local_users = [ + u + for u in local_users + if not self.store.get_if_app_services_interested_in_user(u) + ] + # if this event is an invite event, we may need to run rules for the user # who's been invited, otherwise they won't get told they've been invited if event.type == EventTypes.Member and event.membership == Membership.INVITE: |