PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3334 from turt2live/travis/notifs

Browse source 
Expose notification option for username/MXID
This commit is contained in:
David Baker 2017-03-02 18:26:53 +00:00 committed by GitHub
commit c6da4d93f1
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/settings/Notifications.js
View file

@ -458,8 +458,8 @@ module.exports = React.createClass({
'.m.rule.master': 'master', '.m.rule.master': 'master',
// The default push rules displayed by Vector UI // The default push rules displayed by Vector UI
// 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.contains_user_name': 'vector',
'.m.rule.room_one_to_one': 'vector', '.m.rule.room_one_to_one': 'vector',
'.m.rule.message': 'vector', '.m.rule.message': 'vector',
'.m.rule.invite_for_me': 'vector', '.m.rule.invite_for_me': 'vector',
@ -512,6 +512,7 @@ module.exports = React.createClass({
var vectorRuleIds = [ var vectorRuleIds = [
'.m.rule.contains_display_name', '.m.rule.contains_display_name',
'.m.rule.contains_user_name',
'_keywords', '_keywords',
'.m.rule.room_one_to_one', '.m.rule.room_one_to_one',
'.m.rule.message', '.m.rule.message',

14
src/notifications/VectorPushRulesDefinitions.js
View file

@ -63,10 +63,20 @@ class VectorPushRuleDefinition {
*/ */
module.exports = { module.exports = {
// Messages containing user's display name // Messages containing user's display name
// (skip contains_user_name which is too geeky)
".m.rule.contains_display_name": new VectorPushRuleDefinition({ ".m.rule.contains_display_name": new VectorPushRuleDefinition({
kind: "override", kind: "override",
description: "Messages containing my name", description: "Messages containing my display name",
vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
on: StandardActions.ACTION_NOTIFY,
loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
off: StandardActions.ACTION_DISABLED
}
}),
// Messages containing user's username (localpart/MXID)
".m.rule.contains_user_name": new VectorPushRuleDefinition({
kind: "override",
description: "Messages containing my user name",
vectorStateToActions: { // The actions for each vector state, or null to disable the rule. vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
on: StandardActions.ACTION_NOTIFY, on: StandardActions.ACTION_NOTIFY,
loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND, loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,