diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-09-08 09:58:07 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-09-08 09:58:07 +0100 |
| commit | 8d6f97f932f4f9b37c6000a3f858ac12fc391eb5 (patch) | |
| tree | dac26ab0b375d4185ef31b51fcace79d4c1e4ba6 /synapse/push | |
| parent | Fix stack overflow when logging system encounters an error (#8268) (diff) | |
| parent | Only add rows to the push actions table if the event notifies or should be ma... (diff) | |
| download | synapse-8d6f97f932f4f9b37c6000a3f858ac12fc391eb5.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.20.0' into develop
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 1bb8e346b9..c440f2545c 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -219,7 +219,12 @@ class BulkPushRuleEvaluator: if event.type == EventTypes.Member and event.state_key == uid: display_name = event.content.get("displayname", None) - actions_by_user[uid] = [] + if count_as_unread: + # Add an element for the current user if the event needs to be marked as + # unread, so that add_push_actions_to_staging iterates over it. + # If the event shouldn't be marked as unread but should notify the + # current user, it'll be added to the dict later. + actions_by_user[uid] = [] for rule in rules: if "enabled" in rule and not rule["enabled"]: |