mirror of
https://github.com/zulip/zulip.git
synced 2025-11-10 08:56:10 +00:00
Allow filtering to alerted messages with is:alerted
(imported from commit 99834f1ee1b9b2e0f5c7427afa1494bf404e3626)
This commit is contained in:
@@ -239,6 +239,10 @@ Filter.prototype = {
|
|||||||
if (!message.mentioned) {
|
if (!message.mentioned) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
} else if (operand === 'alerted') {
|
||||||
|
if (!message.alerted) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -57,6 +57,8 @@ function describe(operators) {
|
|||||||
return 'Narrow to starred messages';
|
return 'Narrow to starred messages';
|
||||||
} else if (operand === 'mentioned') {
|
} else if (operand === 'mentioned') {
|
||||||
return 'Narrow to mentioned messages';
|
return 'Narrow to mentioned messages';
|
||||||
|
} else if (operand === 'alerted') {
|
||||||
|
return 'Narrow to alerted messages';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -367,6 +369,10 @@ function get_special_filter_suggestions(query, operators) {
|
|||||||
search_string: 'is:mentioned',
|
search_string: 'is:mentioned',
|
||||||
description: '@-mentions'
|
description: '@-mentions'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
search_string: 'is:alerted',
|
||||||
|
description: 'Alerted messages'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
search_string: 'sender:' + page_params.email,
|
search_string: 'sender:' + page_params.email,
|
||||||
description: 'Sent by me'
|
description: 'Sent by me'
|
||||||
|
|||||||
@@ -552,6 +552,7 @@ function add_message_metadata(message) {
|
|||||||
message.mentioned = message.flags.indexOf("mentioned") !== -1 ||
|
message.mentioned = message.flags.indexOf("mentioned") !== -1 ||
|
||||||
message.flags.indexOf("wildcard_mentioned") !== -1;
|
message.flags.indexOf("wildcard_mentioned") !== -1;
|
||||||
message.collapsed = message.flags.indexOf("collapsed") !== -1;
|
message.collapsed = message.flags.indexOf("collapsed") !== -1;
|
||||||
|
message.alerted = message.flags.indexOf("has_alert_word") !== -1;
|
||||||
|
|
||||||
switch (message.type) {
|
switch (message.type) {
|
||||||
case 'stream':
|
case 'stream':
|
||||||
|
|||||||
@@ -150,6 +150,7 @@ set_global('narrow', {});
|
|||||||
"is:private",
|
"is:private",
|
||||||
"is:starred",
|
"is:starred",
|
||||||
"is:mentioned",
|
"is:mentioned",
|
||||||
|
"is:alerted",
|
||||||
"sender:bob@zulip.com",
|
"sender:bob@zulip.com",
|
||||||
"stream:devel",
|
"stream:devel",
|
||||||
"stream:office"
|
"stream:office"
|
||||||
@@ -164,6 +165,7 @@ set_global('narrow', {});
|
|||||||
assert.equal(describe('is:private'), 'Private messages');
|
assert.equal(describe('is:private'), 'Private messages');
|
||||||
assert.equal(describe('is:starred'), 'Starred messages');
|
assert.equal(describe('is:starred'), 'Starred messages');
|
||||||
assert.equal(describe('is:mentioned'), '@-mentions');
|
assert.equal(describe('is:mentioned'), '@-mentions');
|
||||||
|
assert.equal(describe('is:alerted'), 'Alerted messages');
|
||||||
assert.equal(describe('sender:bob@zulip.com'), 'Sent by me');
|
assert.equal(describe('sender:bob@zulip.com'), 'Sent by me');
|
||||||
assert.equal(describe('stream:devel'), 'Narrow to stream <strong>devel</strong>');
|
assert.equal(describe('stream:devel'), 'Narrow to stream <strong>devel</strong>');
|
||||||
}());
|
}());
|
||||||
|
|||||||
@@ -846,6 +846,8 @@ class NarrowBuilder(object):
|
|||||||
return Q(flags=UserMessage.flags.starred)
|
return Q(flags=UserMessage.flags.starred)
|
||||||
elif operand == 'mentioned':
|
elif operand == 'mentioned':
|
||||||
return Q(flags=UserMessage.flags.mentioned)
|
return Q(flags=UserMessage.flags.mentioned)
|
||||||
|
elif operand == 'alerted':
|
||||||
|
return Q(flags=UserMessage.flags.mentioned)
|
||||||
raise BadNarrowOperator("unknown 'is' operand " + operand)
|
raise BadNarrowOperator("unknown 'is' operand " + operand)
|
||||||
|
|
||||||
def by_stream(self, operand):
|
def by_stream(self, operand):
|
||||||
|
|||||||
Reference in New Issue
Block a user