Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress notices should trump content/room/sender rules.

This commit is contained in:
David Baker 2015-03-06 10:27:32 +00:00
parent 83d31144eb
commit 1487bba226
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
synapse/push/baserules.py
View File

@ -70,6 +70,19 @@ def make_base_content_rules(user):
def make_base_override_rules():
return [
{
'rule_id': 'global/underride/.m.rule.suppress_notices',
'conditions': [
{
'kind': 'event_match',
'key': 'content.msgtype',
'pattern': 'm.notice',
}
],
'actions': [
'dont-notify',
]
},
{
'rule_id': 'global/override/.m.rule.contains_display_name',
'conditions': [
@ -108,19 +121,6 @@ def make_base_override_rules():
def make_base_underride_rules():
return [
{
'rule_id': 'global/underride/.m.rule.suppress_notices',
'conditions': [
{
'kind': 'event_match',
'key': 'content.msgtype',
'pattern': 'm.notice',
}
],
'actions': [
'dont-notify',
]
},
{
'rule_id': 'global/underride/.m.rule.fallback',
'conditions': [