Merge pull request #2020 from matrix-org/travis/1.0/msc1930-tombstone-notif

Add a .m.rule.tombstone default push rule for room upgrades

changelogs/client_server/newsfragments/2020.feature

@@ -0,0 +1 @@
+Add a ``.m.rule.tombstone`` default push rule for room ugprade notifications.

specification/modules/push.rst

@@ -177,7 +177,7 @@ notification is delivered for a matching event. The following actions are define
   This prevents each matching event from generating a notification
 ``coalesce``
   This enables notifications for matching events but activates homeserver
-  specific behaviour to intelligently coalesce multiple events into a single 
+  specific behaviour to intelligently coalesce multiple events into a single
   notification. Not all homeservers may support this. Those that do not support
   it should treat it as the ``notify`` action.
 ``set_tweak``
@@ -369,6 +369,37 @@ Definition:
     }
 
 
+``.m.rule.tombstone``
+`````````````````````
+Matches any event whose type is ``m.room.tombstone``. This is intended
+to notify users of a room when it is upgraded, similar to what an
+``@room`` notification would accomplish.
+
+Definition:
+
+.. code:: json
+
+    {
+        "rule_id": ".m.rule.tombstone",
+        "default": true,
+        "enabled": true,
+        "conditions": [
+            {
+                "kind": "event_match",
+                "key": "type",
+                "pattern": "m.room.tombstone"
+            }
+        ],
+        "actions": [
+            "notify",
+            {
+                "set_tweak": "highlight",
+                "value": true
+            }
+        ]
+    }
+
+
 ``.m.rule.roomnotif``
 `````````````````````
 Matches any message whose content is unencrypted and contains the
@@ -599,7 +630,7 @@ Definition:
 Conditions
 ++++++++++
 
-Override, Underride and Default Rules MAY have a list of 'conditions'. 
+Override, Underride and Default Rules MAY have a list of 'conditions'.
 All conditions must hold true for an event in order to apply the ``action`` for
 the event. A rule with no conditions always matches. Room, Sender, User and
 Content rules do not have conditions in the same way, but instead have