From f24cad16536caa9ae7cdb64977f67c8de1590ad6 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 2 Aug 2022 23:53:00 +0100
Subject: [PATCH] Add push rule for `m.room.server_acl` (#1190)

* Add push rule for `m.room.server_acl`

... per MSC3786.

* Update changelogs/client_server/newsfragments/1190.feature

Co-authored-by: Travis Ralston <travisr@matrix.org>
---
 .../client_server/newsfragments/1190.feature  |  1 +
 content/client-server-api/modules/push.md     | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 changelogs/client_server/newsfragments/1190.feature

diff --git a/changelogs/client_server/newsfragments/1190.feature b/changelogs/client_server/newsfragments/1190.feature
new file mode 100644
index 000000000..ca206eb28
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1190.feature
@@ -0,0 +1 @@
+Add a `.m.rule.room.server_acl` push rule to match `m.room.server_acl` events, as per [MSC3786](https://github.com/matrix-org/matrix-spec-proposals/pull/3786).
diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index bd7be800e..99150d260 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -520,6 +520,33 @@ Definition:
 }
 ```
 
+**`.m.rule.room.server_acl`**
+
+Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.
+
+Definition:
+
+```json
+{
+    "rule_id": ".m.rule.room.server_acl",
+    "default": true,
+    "enabled": true,
+    "conditions": [
+        {
+            "kind": "event_match",
+            "key": "type",
+            "pattern": "m.room.server_acl"
+        },
+        {
+            "kind": "event_match",
+            "key": "state_key",
+            "pattern": ""
+        }
+    ],
+    "actions": []
+}
+```
+
 **`.m.rule.roomnotif`**
 
 Matches any message whose content is unencrypted and contains the text