Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-04-25 12:04:09 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1745 from jryans/encrypted-rule-clarify

Browse source 
Clarify encrypted push rules
This commit is contained in:
Travis Ralston 2018-12-11 09:28:29 -07:00 committed by GitHub
parent 55ebf7dc32 d197a5761f
commit 9aff2583c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
specification/modules/push.rst
View file

@ -485,6 +485,11 @@ Definition:
{ {
"kind": "room_member_count", "kind": "room_member_count",
"is": "2" "is": "2"
},
{
"kind": "event_match",
"key": "type",
"pattern": "m.room.encrypted"
} }
], ],
"actions": [ "actions": [
@ -496,11 +501,6 @@ Definition:
{ {
"set_tweak": "highlight", "set_tweak": "highlight",
"value": false "value": false
},
{
"kind": "event_match",
"key": "type",
"pattern": "m.room.encrypted"
} }
] ]
} }
@ -569,7 +569,7 @@ Definition:
Matches all encrypted events. Unlike other push rules, this rule cannot Matches all encrypted events. Unlike other push rules, this rule cannot
be matched against the content of the event by nature of it being encrypted. be matched against the content of the event by nature of it being encrypted.
This causes the rule to be an "all or nothing" match where it either This causes the rule to be an "all or nothing" match where it either
matches *all* events that are encrypted (in 1:1 rooms) or none. matches *all* events that are encrypted (in group rooms) or none.
Definition: Definition: