From e5b7a47fee1170c809c50612206bbc0030750bad Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Wed, 13 Jan 2016 12:00:04 +0100
Subject: [PATCH] PushRules settings: if a newly typed keyword was part of a
 push rule not managed by the Vector UI, delete the rule and create it
 compliant with Vector parameters

---
 .../views/settings/Notifications.js           | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index db3e2879..0fee4ac3 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -167,7 +167,7 @@ module.exports = React.createClass({
 
                 if (should_leave && self.newKeywords) {
                     var cli = MatrixClientPeg.get();
-                    var deferreds = [];
+                    var removeDeferreds = [];
 
                     var newKeywords = self.newKeywords.split(',');
                     for (var i in newKeywords) {
@@ -185,31 +185,46 @@ module.exports = React.createClass({
                         vectorContentRulesPatterns.push(rule.pattern);
 
                         if (-1 === newKeywords.indexOf(rule.pattern)) {
-                            deferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
+                            removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
                         }
                     }
 
-                    // Add the new ones
-                    for (var i in newKeywords) {
-                        var keyword = newKeywords[i];
+                    // If the keyword is part of `externalContentRules`, remove the rule
+                    // before recreating it in the right Vector path
+                    for (var i in self.state.externalContentRules) {
+                        var rule = self.state.externalContentRules[i];
 
-                        if (-1 === vectorContentRulesPatterns.indexOf(keyword)) {
-                            deferreds.push(cli.addPushRule('global', 'content', keyword, {
-                                actions: self._actionsFor(self.state.vectorContentRules.state),
-                                pattern: keyword
-                            }));
+                        if (-1 !== newKeywords.indexOf(rule.pattern)) {
+                            removeDeferreds.push(cli.deletePushRule('global', rule.kind, rule.rule_id));
                         }
                     }
 
-                    q.all(deferreds).done(function(resps) {
-                        self._refreshFromServer();
-                    }, function(error) {
+                    var onError = function(error) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         Modal.createDialog(ErrorDialog, {
                             title: "Can't update keywords",
                             description: error.toString()
                         });
-                    });
+                    }
+
+                    // Then, add the new ones
+                    q.all(removeDeferreds).done(function(resps) {
+                        var deferreds = [];
+                        for (var i in newKeywords) {
+                            var keyword = newKeywords[i];
+
+                            if (-1 === vectorContentRulesPatterns.indexOf(keyword)) {
+                                deferreds.push(cli.addPushRule('global', 'content', keyword, {
+                                    actions: self._actionsFor(self.state.vectorContentRules.state),
+                                    pattern: keyword
+                                }));
+                            }
+                        }
+
+                        q.all(deferreds).done(function(resps) {
+                            self._refreshFromServer();
+                        }, onError);
+                    }, onError);
                 }
             }
         });