gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #721 from vector-im/push-rules-dont-notify 

Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF
This commit is contained in:
manuroe 2016-01-22 11:37:58 +01:00
parent a76167d175 ce45f0b1e6
commit 87f3603047
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/views/settings/Notifications.js
View File

@ -94,23 +94,29 @@ var VectorPushRulesDefinitions = {
"set_tweak": "sound", "set_tweak": "sound",
"value": "default" "value": "default"
} }
],
off: [
"dont_notify"
] ]
}, },
vectorStateToHsDefaultRuleEnabled: { vectorStateToHsDefaultRuleEnabled: {
on: undefined, on: undefined,
loud: true, loud: true,
off: false off: undefined
} }
}, },
// Messages just sent to a group chat room // Messages just sent to a group chat room
"im.vector.rule.room_group": { // 1:1 room messages are catched by the .m.rule.room_one_to_one rule if any defined
// By opposition, all other room messages are from group chat rooms.
"im.vector.rule.room_message": {
description: "Messages in group chats", description: "Messages in group chats",
conditions: [{ conditions: [{
"is": ">2", "pattern": "m.room.message",
"kind": "room_member_count" "kind": "event_match",
"key": "type"
}], }],
hsDefaultRuleId: undefined, // Matrix does not define a default hs push rule for group hsDefaultRuleId: ".m.rule.message",
vectorStateToActions: { vectorStateToActions: {
on: [ on: [
"notify" "notify"
@ -121,12 +127,15 @@ var VectorPushRulesDefinitions = {
"set_tweak": "sound", "set_tweak": "sound",
"value": "default" "value": "default"
} }
],
off: [
"dont_notify"
] ]
}, },
vectorStateToHsDefaultRuleEnabled: { vectorStateToHsDefaultRuleEnabled: {
on: true, on: true,
loud: undefined, loud: undefined,
off: false off: undefined
} }
}, },
@ -664,6 +673,7 @@ module.exports = React.createClass({
// XXX: .m.rule.contains_user_name is not managed (not a fancy rule for Vector?) // XXX: .m.rule.contains_user_name is not managed (not a fancy rule for Vector?)
'.m.rule.contains_display_name': 'vector', '.m.rule.contains_display_name': 'vector',
'.m.rule.room_one_to_one': 'vector', '.m.rule.room_one_to_one': 'vector',
'.m.rule.message': 'vector',
'.m.rule.invite_for_me': 'vector', '.m.rule.invite_for_me': 'vector',
//'.m.rule.member_event': 'vector', //'.m.rule.member_event': 'vector',
'.m.rule.call': 'vector', '.m.rule.call': 'vector',
@ -791,7 +801,7 @@ module.exports = React.createClass({
'im.vector.rule.contains_display_name', 'im.vector.rule.contains_display_name',
'_keywords', '_keywords',
'im.vector.rule.room_one_to_one', 'im.vector.rule.room_one_to_one',
'im.vector.rule.room_group', 'im.vector.rule.room_message',
'im.vector.rule.invite_for_me', 'im.vector.rule.invite_for_me',
//'im.vector.rule.member_event', //'im.vector.rule.member_event',
'im.vector.rule.call', 'im.vector.rule.call',