mirror of
https://github.com/zulip/zulip.git
synced 2025-11-06 23:13:25 +00:00
Move get_private_message_recipient to message_store.js
This commit is contained in:
@@ -240,7 +240,7 @@ exports.process_from_server = function process_from_server(messages) {
|
|||||||
// so we might have to update the recipient bar and
|
// so we might have to update the recipient bar and
|
||||||
// internal data structures
|
// internal data structures
|
||||||
if (client_message.type === 'private') {
|
if (client_message.type === 'private') {
|
||||||
var reply_to = get_private_message_recipient(message, 'full_name', 'email');
|
var reply_to = message_store.get_private_message_recipient(message, 'full_name', 'email');
|
||||||
if (client_message.display_reply_to !== reply_to) {
|
if (client_message.display_reply_to !== reply_to) {
|
||||||
client_message.display_reply_to = reply_to;
|
client_message.display_reply_to = reply_to;
|
||||||
_.each(message.display_recipient, function (person) {
|
_.each(message.display_recipient, function (person) {
|
||||||
|
|||||||
@@ -16,6 +16,31 @@ exports.get = function get(message_id) {
|
|||||||
return stored_messages[message_id];
|
return stored_messages[message_id];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
exports.get_private_message_recipient = function (message, attr, fallback_attr) {
|
||||||
|
var recipient, i;
|
||||||
|
var other_recipients = _.filter(message.display_recipient,
|
||||||
|
function (element) {
|
||||||
|
return element.email !== page_params.email;
|
||||||
|
});
|
||||||
|
if (other_recipients.length === 0) {
|
||||||
|
// private message with oneself
|
||||||
|
return message.display_recipient[0][attr];
|
||||||
|
}
|
||||||
|
|
||||||
|
recipient = other_recipients[0][attr];
|
||||||
|
if (recipient === undefined && fallback_attr !== undefined) {
|
||||||
|
recipient = other_recipients[0][fallback_attr];
|
||||||
|
}
|
||||||
|
for (i = 1; i < other_recipients.length; i++) {
|
||||||
|
var attr_value = other_recipients[i][attr];
|
||||||
|
if (attr_value === undefined && fallback_attr !== undefined) {
|
||||||
|
attr_value = other_recipients[i][fallback_attr];
|
||||||
|
}
|
||||||
|
recipient += ', ' + attr_value;
|
||||||
|
}
|
||||||
|
return recipient;
|
||||||
|
};
|
||||||
|
|
||||||
exports.process_message_for_recent_subjects = function process_message_for_recent_subjects(message, remove_message) {
|
exports.process_message_for_recent_subjects = function process_message_for_recent_subjects(message, remove_message) {
|
||||||
var current_timestamp = 0;
|
var current_timestamp = 0;
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -137,8 +162,8 @@ function add_message_metadata(message) {
|
|||||||
case 'private':
|
case 'private':
|
||||||
message.is_private = true;
|
message.is_private = true;
|
||||||
message.reply_to = util.normalize_recipients(
|
message.reply_to = util.normalize_recipients(
|
||||||
get_private_message_recipient(message, 'email'));
|
exports.get_private_message_recipient(message, 'email'));
|
||||||
message.display_reply_to = get_private_message_recipient(message, 'full_name', 'email');
|
message.display_reply_to = exports.get_private_message_recipient(message, 'full_name', 'email');
|
||||||
|
|
||||||
exports.process_message_for_recent_private_messages(message);
|
exports.process_message_for_recent_private_messages(message);
|
||||||
involved_people = message.display_recipient;
|
involved_people = message.display_recipient;
|
||||||
|
|||||||
@@ -9,32 +9,6 @@ var queued_mark_as_read = [];
|
|||||||
var queued_flag_timer;
|
var queued_flag_timer;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function get_private_message_recipient(message, attr, fallback_attr) {
|
|
||||||
var recipient, i;
|
|
||||||
var other_recipients = _.filter(message.display_recipient,
|
|
||||||
function (element) {
|
|
||||||
return element.email !== page_params.email;
|
|
||||||
});
|
|
||||||
if (other_recipients.length === 0) {
|
|
||||||
// private message with oneself
|
|
||||||
return message.display_recipient[0][attr];
|
|
||||||
}
|
|
||||||
|
|
||||||
recipient = other_recipients[0][attr];
|
|
||||||
if (recipient === undefined && fallback_attr !== undefined) {
|
|
||||||
recipient = other_recipients[0][fallback_attr];
|
|
||||||
}
|
|
||||||
for (i = 1; i < other_recipients.length; i++) {
|
|
||||||
var attr_value = other_recipients[i][attr];
|
|
||||||
if (attr_value === undefined && fallback_attr !== undefined) {
|
|
||||||
attr_value = other_recipients[i][fallback_attr];
|
|
||||||
}
|
|
||||||
recipient += ', ' + attr_value;
|
|
||||||
}
|
|
||||||
return recipient;
|
|
||||||
}
|
|
||||||
|
|
||||||
function respond_to_message(opts) {
|
function respond_to_message(opts) {
|
||||||
var message, msg_type;
|
var message, msg_type;
|
||||||
// Before initiating a reply to a message, if there's an
|
// Before initiating a reply to a message, if there's an
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ var globals =
|
|||||||
// zulip.js
|
// zulip.js
|
||||||
+ ' home_msg_list current_msg_list'
|
+ ' home_msg_list current_msg_list'
|
||||||
+ ' respond_to_message'
|
+ ' respond_to_message'
|
||||||
+ ' get_private_message_recipient'
|
|
||||||
+ ' process_loaded_for_unread'
|
+ ' process_loaded_for_unread'
|
||||||
+ ' recent_subjects unread_subjects'
|
+ ' recent_subjects unread_subjects'
|
||||||
;
|
;
|
||||||
|
|||||||
Reference in New Issue
Block a user