forked from MirrorHub/synapse
		
	Suppress notices should trump content/room/sender rules.
This commit is contained in:
		
					parent
					
						
							
								83d31144eb
							
						
					
				
			
			
				commit
				
					
						1487bba226
					
				
			
		
					 1 changed files with 13 additions and 13 deletions
				
			
		|  | @ -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': [ | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue