Use unstable prefixes.

Author: clokep

synapse/push/baserules.py

@@ -353,10 +353,10 @@ def make_base_prepend_rules(
         ],
     },
     {
-        "rule_id": "global/underride/.m.rule.thread_reply",
+        "rule_id": "global/underride/.org.matrix.msc3772.thread_reply",
         "conditions": [
             {
-                "kind": "relation_match",
+                "kind": "org.matrix.msc3772.relation_match",
                 "rel_type": "m.thread",
                 # Match the requester's MXID.
                 "sender_type": "user_id",

synapse/push/push_rule_evaluator.py

@@ -190,7 +190,7 @@ def matches(
             return _sender_notification_permission(
                 self._event, condition, self._sender_power_level, self._power_levels
             )
-        elif condition["kind"] == "relation_match":
+        elif condition["kind"] == "org.matrix.msc3772.relation_match":
             return self._relation_match(condition, user_id)
         else:
             return True

tests/push/test_push_rule_evaluator.py

@@ -289,37 +289,46 @@ def test_relations(self) -> None:
         )
 
         # Check just relation type.
-        condition = {"kind": "relation_match", "rel_type": "m.annotation"}
+        condition = {
+            "kind": "org.matrix.msc3772.relation_match",
+            "rel_type": "m.annotation",
+        }
         self.assertTrue(evaluator.matches(condition, "@user:test", "foo"))
 
         # Check relation type and sender.
         condition = {
-            "kind": "relation_match",
+            "kind": "org.matrix.msc3772.relation_match",
             "rel_type": "m.annotation",
             "sender": "@user:test",
         }
         self.assertTrue(evaluator.matches(condition, "@user:test", "foo"))
         condition = {
-            "kind": "relation_match",
+            "kind": "org.matrix.msc3772.relation_match",
             "rel_type": "m.annotation",
             "sender": "@other:test",
         }
         self.assertFalse(evaluator.matches(condition, "@user:test", "foo"))
 
         # Check relation type and event type.
         condition = {
-            "kind": "relation_match",
+            "kind": "org.matrix.msc3772.relation_match",
             "rel_type": "m.annotation",
             "type": "m.reaction",
         }
         self.assertTrue(evaluator.matches(condition, "@user:test", "foo"))
 
         # Check just sender.
-        condition = {"kind": "relation_match", "sender": "@user:test"}
+        condition = {
+            "kind": "org.matrix.msc3772.relation_match",
+            "sender": "@user:test",
+        }
         self.assertTrue(evaluator.matches(condition, "@user:test", "foo"))
-        condition = {"kind": "relation_match", "sender": "@other:test"}
+        condition = {
+            "kind": "org.matrix.msc3772.relation_match",
+            "sender": "@other:test",
+        }
         self.assertFalse(evaluator.matches(condition, "@user:test", "foo"))
 
         # Check glob.
-        condition = {"kind": "relation_match", "sender": "@*:test"}
+        condition = {"kind": "org.matrix.msc3772.relation_match", "sender": "@*:test"}
         self.assertTrue(evaluator.matches(condition, "@user:test", "foo"))