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

PushRules settings: Fixed triage of matrix content rules into the unique Vector rule

This commit is contained in:
manuroe 2016-01-12 16:46:27 +01:00
parent 7f95362dd2
commit b9080c770d
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ module.exports = React.createClass({
// HS default rules
var defaultRules = {master: [], vector: {}, additional: [], fallthrough: [], suppression: []};
// Content/keyword rules
var contentRules = {on: [], strong: [], off: [], other: []};
var contentRules = {on: [], on_but_disabled:[], strong: [], strong_but_disabled: [], other: []};
for (var kind in rulesets.global) {
for (var i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
@ -180,7 +180,6 @@ module.exports = React.createClass({
}
}
else if (kind === 'content') {
if (r.enabled) {
// Count tweaks to determine if it is a ON or STRONG rule
var tweaks = 0;
for (var j in r.actions) {
@ -193,20 +192,26 @@ module.exports = React.createClass({
switch (tweaks) {
case 0:
if (r.enabled) {
contentRules.on.push(r);
}
else {
contentRules.on_but_disabled.push(r);
}
break;
case 2:
if (r.enabled) {
contentRules.strong.push(r);
}
else {
contentRules.strong_but_disabled.push(r);
}
break;
default:
contentRules.other.push(r);
break;
}
}
else {
contentRules.off.push(r);
}
}
}
}
@ -228,21 +233,31 @@ module.exports = React.createClass({
state: PushRuleState.STRONG,
rules: contentRules.strong
}
self.state.externalContentRules = [].concat(contentRules.on, contentRules.other, contentRules.off);
self.state.externalContentRules = [].concat(contentRules.strong_but_disabled, contentRules.on, contentRules.on_but_disabled, contentRules.other);
}
else if (contentRules.strong_but_disabled.length) {
self.state.vectorContentRules = {
state: PushRuleState.OFF,
rules: contentRules.strong_but_disabled
}
self.state.externalContentRules = [].concat(contentRules.on, contentRules.on_but_disabled, contentRules.other);
}
else if (contentRules.on.length) {
self.state.vectorContentRules = {
state: PushRuleState.ON,
rules: contentRules.on
}
self.state.externalContentRules = [].concat(contentRules.strong, contentRules.other, contentRules.off);
self.state.externalContentRules = [].concat(contentRules.on_but_disabled, contentRules.other);
}
else if (contentRules.off.length) {
else if (contentRules.on_but_disabled.length) {
self.state.vectorContentRules = {
state: PushRuleState.OFF,
rules: contentRules.off
rules: contentRules.on_but_disabled
}
self.state.externalContentRules = [].concat(contentRules.strong, contentRules.on, contentRules.other);
self.state.externalContentRules = contentRules.other;
}
else {
self.state.externalContentRules = contentRules.other;
}
// Build the rules displayed by Vector UI