Merge pull request #2152 from matrix-org/jryans/room-one-to-one-push-rule

Clarify `.m.rule.room_one_to_one` push rule
5 years ago · db5ce0c69e
parent ad5d46d331 9208c5cd13
commit db5ce0c69e
4 changed files with 20 additions and 4 deletions
--- a/api/client-server/pushrules.yaml
+++ b/api/client-server/pushrules.yaml
@ -159,8 +159,13 @@ paths:
                            ],
                            "conditions": [
                                {
-                                    "is": "2",
-                                    "kind": "room_member_count"
+                                    "kind": "room_member_count",
+                                    "is": "2"
+                                },
+                                {
+                                    "kind": "event_match",
+                                    "key": "type",
+                                    "pattern": "m.room.message"
                                }
                            ],
                            "default": true,
--- a/changelogs/client_server/newsfragments/2152.clarification
+++ b/changelogs/client_server/newsfragments/2152.clarification
@ -0,0 +1 @@
+Clarify the conditions for the ``.m.rule.room_one_to_one`` push rule.
--- a/event-schemas/examples/m.push_rules
+++ b/event-schemas/examples/m.push_rules
@ -107,8 +107,13 @@
          ],
          "conditions": [
            {
-              "is": "2",
-              "kind": "room_member_count"
+              "kind": "room_member_count",
+              "is": "2"
+            },
+            {
+              "kind": "event_match",
+              "key": "type",
+              "pattern": "m.room.message"
            }
          ],
          "default": true,
--- a/specification/modules/push.rst
+++ b/specification/modules/push.rst
@ -563,6 +563,11 @@ Definition:
            {
                "kind": "room_member_count",
                "is": "2"
+            },
+            {
+                "kind": "event_match",
+                "key": "type",
+                "pattern": "m.room.message"
            }
        ],
        "actions": [
				`@ -0,0 +1 @@`
				Clarify the conditions for the ``.m.rule.room_one_to_one`` push rule.