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

subject -> topic: Fix notifications.js.

This commit is contained in:
Steve Howell 2018-12-22 22:15:04 +00:00 committed by Tim Abbott
parent 56a893cd94
commit 053a41d816
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend_tests/node_tests/notifications.js
View File

@ -15,8 +15,9 @@ set_global('page_params', {
zrequire('muting'); zrequire('muting');
zrequire('stream_data'); zrequire('stream_data');
zrequire('ui');
zrequire('people'); zrequire('people');
zrequire('ui');
zrequire('util');
zrequire('notifications'); zrequire('notifications');

14
static/js/notifications.js
View File

@ -290,6 +290,8 @@ function process_notification(notification) {
ui.replace_emoji_with_text(content); ui.replace_emoji_with_text(content);
content = content.text(); content = content.text();
var topic = util.get_message_topic(message);
if (message.is_me_message) { if (message.is_me_message) {
content = message.sender_full_name + content.slice(3); content = message.sender_full_name + content.slice(3);
} }
@ -307,7 +309,7 @@ function process_notification(notification) {
notification_source = 'pm'; notification_source = 'pm';
} else { } else {
key = message.sender_full_name + " to " + key = message.sender_full_name + " to " +
message.stream + " > " + message.subject; message.stream + " > " + topic;
if (message.mentioned) { if (message.mentioned) {
notification_source = 'mention'; notification_source = 'mention';
} else if (message.alerted) { } else if (message.alerted) {
@ -355,10 +357,10 @@ function process_notification(notification) {
} }
if (message.type === "stream") { if (message.type === "stream") {
title += " (to " + message.stream + " > " + message.subject + ")"; title += " (to " + message.stream + " > " + topic + ")";
raw_operators = [ raw_operators = [
{operator: "stream", operand: message.stream}, {operator: "stream", operand: message.stream},
{operator: "topic", operand: message.subject}, {operator: "topic", operand: topic},
]; ];
} }
@ -446,7 +448,7 @@ exports.message_is_notifiable = function (message) {
} }
if (message.type === "stream" && if (message.type === "stream" &&
muting.is_topic_muted(message.stream_id, message.subject)) { muting.is_topic_muted(message.stream_id, util.get_message_topic(message))) {
return false; return false;
} }
@ -549,7 +551,7 @@ exports.received_messages = function (messages) {
function get_message_header(message) { function get_message_header(message) {
if (message.type === "stream") { if (message.type === "stream") {
return message.stream + " > " + message.subject; return message.stream + " > " + util.get_message_topic(message);
} }
if (message.display_recipient.length > 2) { if (message.display_recipient.length > 2) {
return i18n.t("group private messages with __recipient__", return i18n.t("group private messages with __recipient__",
@ -579,7 +581,7 @@ exports.get_local_notify_mix_reason = function (message) {
return; return;
} }
if (message.type === "stream" && muting.is_topic_muted(message.stream_id, message.subject)) { if (message.type === "stream" && muting.is_topic_muted(message.stream_id, util.get_message_topic(message))) {
return i18n.t("Sent! Your message was sent to a topic you have muted."); return i18n.t("Sent! Your message was sent to a topic you have muted.");
} }