diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-17 10:56:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-17 10:56:55 +0100 |
| commit | 5299707329e1c5d6228605ca660800f6dc4cf20d (patch) | |
| tree | 5277555c65670460cbd761698b1c920473d2835f /synapse/push | |
| parent | Merge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes (diff) | |
| parent | Merge pull request #5597 from matrix-org/erikj/admin_api_cmd (diff) | |
| download | synapse-5299707329e1c5d6228605ca660800f6dc4cf20d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/baserules.py | 13 | ||||
| -rw-r--r-- | synapse/push/mailer.py | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 96d087de22..134bf805eb 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -1,5 +1,6 @@ # Copyright 2015, 2016 OpenMarket Ltd # Copyright 2017 New Vector Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -248,6 +249,18 @@ BASE_APPEND_OVERRIDE_RULES = [ ], "actions": ["notify", {"set_tweak": "highlight", "value": True}], }, + { + "rule_id": "global/override/.m.rule.reaction", + "conditions": [ + { + "kind": "event_match", + "key": "type", + "pattern": "m.reaction", + "_id": "_reaction", + } + ], + "actions": ["dont_notify"], + }, ] diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 809199fe88..521c6e2cd7 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -29,6 +29,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes from synapse.api.errors import StoreError +from synapse.logging.context import make_deferred_yieldable from synapse.push.presentable_names import ( calculate_room_name, descriptor_from_member_events, @@ -36,7 +37,6 @@ from synapse.push.presentable_names import ( ) from synapse.types import UserID from synapse.util.async_helpers import concurrently_execute -from synapse.util.logcontext import make_deferred_yieldable from synapse.visibility import filter_events_for_client logger = logging.getLogger(__name__) |