Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

show notification for @-mentions in muted topics and muted streams 

(imported from commit 7c6303a083f1f7d364920462e42360b71d7159b5)
This commit is contained in:
acrefoot 2013-12-09 17:13:33 -05:00
parent e1a9a71759
commit 3542b63bb7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/notifications.js
View File

@ -321,6 +321,10 @@ function message_is_notifiable(message) {
if (message.sent_by_me) { if (message.sent_by_me) {
return false; return false;
} }
// @-mentions take precent over muted-ness. See Trac #1929
if (exports.speaking_at_me(message)) {
return true;
}
if ((message.type === "stream") && if ((message.type === "stream") &&
!stream_data.in_home_view(message.stream)) { !stream_data.in_home_view(message.stream)) {
return false; return false;
@ -334,9 +338,6 @@ function message_is_notifiable(message) {
if (message.type === "private") { if (message.type === "private") {
return true; return true;
} }
if (exports.speaking_at_me(message)) {
return true;
}
if ((message.type === "stream") && if ((message.type === "stream") &&
subs.receives_notifications(message.stream)) { subs.receives_notifications(message.stream)) {
return true; return true;