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.

Sign up for GitHub

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

Jump to bottom

Clarify .m.rule.room_one_to_one push rule #2152

Merged
merged 2 commits into from Jul 3, 2019
Merged

Clarify .m.rule.room_one_to_one push rule #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c65660
Clarify `.m.rule.room_one_to_one` push rule
jryans Jul 3, 2019
9208c5c
Add changelog
jryans Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions api/client-server/pushrules.yaml
View file
Open in desktop
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/2152.clarification
View file
Open in desktop
@@ -0,0 +1 @@
Clarify the conditions for the ``.m.rule.room_one_to_one`` push rule.
9 changes: 7 additions & 2 deletions event-schemas/examples/m.push_rules
View file
Open in desktop
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions specification/modules/push.rst
View file
Open in desktop
Expand Up @@ -563,6 +563,11 @@ Definition:
{
"kind": "room_member_count",
"is": "2"
},
{
"kind": "event_match",
"key": "type",
"pattern": "m.room.message"
}
],
"actions": [
Expand Down