diff options
author | David Baker <dave@matrix.org> | 2016-01-20 13:40:22 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-01-20 13:40:22 +0000 |
commit | 7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e (patch) | |
tree | 77dee2daedba4a17ab6bebd3e0ca343a217635a3 | |
parent | Merge branch 'develop' into push_badge_counts (diff) | |
parent | Merge pull request #511 from matrix-org/dbkr/no_push_for_own_events (diff) | |
download | synapse-7441d8cc0c4e719dd2dea47a1bfc0ecb5865199e.tar.xz |
Merge remote-tracking branch 'origin/develop' into push_badge_counts
-rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 1000ae6301..f27ae62db5 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -107,6 +107,9 @@ class BulkPushRuleEvaluator: if len(filtered) == 0: continue + if filtered.sender == uid: + continue + for rule in rules: if 'enabled' in rule and not rule['enabled']: continue |