From 1c7c317df1124ff262d40b40966956a952d1e03b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 15 Aug 2016 18:34:53 +0100
Subject: [PATCH] Move display name rule

As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
---
 synapse/push/baserules.py | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 024c14904..9d60f7696 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -217,6 +217,27 @@ BASE_APPEND_OVERRIDE_RULES = [
             'dont_notify'
         ]
     },
+    # This was changed from underride to override so it's closer in priority
+    # to the content rules where the user name highlight rule lives. This
+    # way a room rule is lower priority than both but a custom override rule
+    # is higher priority than both.
+    {
+        'rule_id': 'global/underride/.m.rule.contains_display_name',
+        'conditions': [
+            {
+                'kind': 'contains_display_name'
+            }
+        ],
+        'actions': [
+            'notify',
+            {
+                'set_tweak': 'sound',
+                'value': 'default'
+            }, {
+                'set_tweak': 'highlight'
+            }
+        ]
+    },
 ]
 
 
@@ -242,23 +263,6 @@ BASE_APPEND_UNDERRIDE_RULES = [
             }
         ]
     },
-    {
-        'rule_id': 'global/underride/.m.rule.contains_display_name',
-        'conditions': [
-            {
-                'kind': 'contains_display_name'
-            }
-        ],
-        'actions': [
-            'notify',
-            {
-                'set_tweak': 'sound',
-                'value': 'default'
-            }, {
-                'set_tweak': 'highlight'
-            }
-        ]
-    },
     {
         'rule_id': 'global/underride/.m.rule.room_one_to_one',
         'conditions': [