From 3542b63bb77f59390cc37cbc0c6ab755924503b3 Mon Sep 17 00:00:00 2001
From: acrefoot <acrefoot@zulip.com>
Date: Mon, 9 Dec 2013 17:13:33 -0500
Subject: [PATCH] show notification for @-mentions in muted topics and muted
 streams

(imported from commit 7c6303a083f1f7d364920462e42360b71d7159b5)
---
 static/js/notifications.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/static/js/notifications.js b/static/js/notifications.js
index 2c500b1357..985e3afc45 100644
--- a/static/js/notifications.js
+++ b/static/js/notifications.js
@@ -321,6 +321,10 @@ function message_is_notifiable(message) {
     if (message.sent_by_me) {
         return false;
     }
+    // @-mentions take precent over muted-ness. See Trac #1929
+    if (exports.speaking_at_me(message)) {
+        return true;
+    }
     if ((message.type === "stream") &&
         !stream_data.in_home_view(message.stream)) {
         return false;
@@ -334,9 +338,6 @@ function message_is_notifiable(message) {
     if (message.type === "private") {
         return true;
     }
-    if (exports.speaking_at_me(message)) {
-        return true;
-    }
     if ((message.type === "stream") &&
         subs.receives_notifications(message.stream)) {
         return true;