From 8ce5404777e3ba8c535e9e1829f9441720e6f4a3 Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@zulip.com>
Date: Thu, 13 Feb 2014 18:06:50 -0500
Subject: [PATCH] Describe negated search terms correctly.

This changes Filter.describe and Filter.operator_to_prefix
to handle negated terms correctly.

(imported from commit 673c0d3a5a77784e95772c14e12534ad2daecda2)
---
 static/js/filter.js                  | 16 ++++++++++------
 zerver/tests/frontend/node/filter.js | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/static/js/filter.js b/static/js/filter.js
index 5801d8380a..63a709decc 100644
--- a/static/js/filter.js
+++ b/static/js/filter.js
@@ -357,14 +357,14 @@ Filter.prototype = {
     }
 };
 
-Filter.operator_to_prefix = function (operator) {
+Filter.operator_to_prefix = function (operator, negated) {
     var verb;
 
     if (operator === 'search') {
-        return 'Search for';
+        return negated ? 'Exclude' : 'Search for';
     }
 
-    verb = 'Narrow to ';
+    verb = negated ? 'Exclude ' : 'Narrow to ';
 
     switch (operator) {
     case 'stream':
@@ -400,7 +400,11 @@ Filter.describe = function (operators) {
     var parts = [];
 
     if (operators.length >= 2) {
-        if (operators[0].operator === 'stream' && operators[1].operator === 'topic') {
+        var is = function (term, expected) {
+            return (term.operator === expected) && !term.negated;
+        };
+
+        if (is(operators[0], 'stream') && is(operators[1], 'topic')) {
             var stream = operators[0].operand;
             var topic = operators[1].operand;
             var part = 'Narrow to ' + stream + ' > ' + topic;
@@ -413,7 +417,7 @@ Filter.describe = function (operators) {
         var operand = elem.operand;
         var canonicalized_operator = Filter.canonicalize_operator(elem.operator);
         if (canonicalized_operator ==='is') {
-            var verb = 'Narrow to ';
+            var verb = elem.negated ? 'Exclude ' : 'Narrow to ';
             if (operand === 'private') {
                 return verb + 'all private messages';
             } else if (operand === 'starred') {
@@ -424,7 +428,7 @@ Filter.describe = function (operators) {
                 return verb + 'alerted messages';
             }
         } else {
-            var prefix_for_operator = Filter.operator_to_prefix(canonicalized_operator);
+            var prefix_for_operator = Filter.operator_to_prefix(canonicalized_operator, elem.negated);
             if (prefix_for_operator !== '') {
                 return prefix_for_operator + ' ' + operand;
             }
diff --git a/zerver/tests/frontend/node/filter.js b/zerver/tests/frontend/node/filter.js
index 144ee916a0..2653ff0e0d 100644
--- a/zerver/tests/frontend/node/filter.js
+++ b/zerver/tests/frontend/node/filter.js
@@ -373,5 +373,26 @@ function get_predicate(operators) {
     string = 'Narrow to all private messages, Search for lunch';
     assert.equal(Filter.describe(narrow), string);
 
+    narrow = [
+        {operator: 'stream', operand: 'devel'},
+        {operator: 'topic', operand: 'JS', negated: true}
+    ];
+    string = 'Narrow to stream devel, Exclude topic JS';
+    assert.equal(Filter.describe(narrow), string);
+
+    narrow = [
+        {operator: 'is', operand: 'private'},
+        {operator: 'search', operand: 'lunch', negated: true}
+    ];
+    string = 'Narrow to all private messages, Exclude lunch';
+    assert.equal(Filter.describe(narrow), string);
+
+    narrow = [
+        {operator: 'stream', operand: 'devel'},
+        {operator: 'is', operand: 'starred', negated: true}
+    ];
+    string = 'Narrow to stream devel, Exclude starred messages';
+    assert.equal(Filter.describe(narrow), string);
+
 }());