Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move .m.rule.roomnotif before .m.rule.tombstone #1421

Merged
merged 1 commit into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correct the order of the default override pushrules in the spec.
62 changes: 31 additions & 31 deletions content/client-server-api/modules/push.md
Original file line number Diff line number Diff line change
Expand Up @@ -524,29 +524,27 @@ Definition:
}
```

**<a name="mruletombstone"></a>`.m.rule.tombstone`**
**`.m.rule.roomnotif`**

Matches any state 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.
Matches any message whose content is unencrypted and contains the text
`@room`, signifying the whole room should be notified of the event.

Definition:

```json
{
"rule_id": ".m.rule.tombstone",
"rule_id": ".m.rule.roomnotif",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
"key": "type",
"pattern": "m.room.tombstone"
"key": "content.body",
"pattern": "@room"
},
{
"kind": "event_match",
"key": "state_key",
"pattern": ""
"kind": "sender_notification_permission",
"key": "room"
}
],
"actions": [
Expand All @@ -558,64 +556,66 @@ Definition:
}
```

**`.m.rule.room.server_acl`**

{{% added-in v="1.4" %}}
**<a name="mruletombstone"></a>`.m.rule.tombstone`**

Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.
Matches any state 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:

```json
{
"rule_id": ".m.rule.room.server_acl",
"rule_id": ".m.rule.tombstone",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
"key": "type",
"pattern": "m.room.server_acl"
"pattern": "m.room.tombstone"
},
{
"kind": "event_match",
"key": "state_key",
"pattern": ""
}
],
"actions": []
"actions": [
"notify",
{
"set_tweak": "highlight"
}
]
}
```

**`.m.rule.roomnotif`**
**`.m.rule.room.server_acl`**

Matches any message whose content is unencrypted and contains the text
`@room`, signifying the whole room should be notified of the event.
{{% added-in v="1.4" %}}

Suppresses notifications for [`m.room.server_acl`](#mroomserver_acl) events.

Definition:

```json
{
"rule_id": ".m.rule.roomnotif",
"rule_id": ".m.rule.room.server_acl",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_match",
"key": "content.body",
"pattern": "@room"
"key": "type",
"pattern": "m.room.server_acl"
},
{
"kind": "sender_notification_permission",
"key": "room"
"kind": "event_match",
"key": "state_key",
"pattern": ""
}
],
"actions": [
"notify",
{
"set_tweak": "highlight"
}
]
"actions": []
}
```

Expand Down