mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 06:23:38 +00:00
We had a bug where if your peer mentioned you in message, but then edited the message not to mention you, the latter wouldn't reset your unread counts for "Mentions". And the same problem would happen vice versa. The fix basically extracts `update_message_for_mention` and makes sure it handles all combinations of unread/mentioned flags, instead of assuming any invariants about which directions of change are possible. And then we call that new function from `message_events.js` whenever we get message edit events. Fixes #14544
337 lines
14 KiB
JavaScript
337 lines
14 KiB
JavaScript
const util = require("./util");
|
|
function maybe_add_narrowed_messages(messages, msg_list) {
|
|
const ids = [];
|
|
|
|
for (const elem of messages) {
|
|
ids.push(elem.id);
|
|
}
|
|
|
|
channel.get({
|
|
url: '/json/messages/matches_narrow',
|
|
data: {msg_ids: JSON.stringify(ids),
|
|
narrow: JSON.stringify(narrow_state.public_operators())},
|
|
timeout: 5000,
|
|
success: function (data) {
|
|
if (msg_list !== current_msg_list) {
|
|
// We unnarrowed in the mean time
|
|
return;
|
|
}
|
|
|
|
let new_messages = [];
|
|
const elsewhere_messages = [];
|
|
|
|
for (const elem of messages) {
|
|
if (data.messages.hasOwnProperty(elem.id)) {
|
|
util.set_match_data(elem, data.messages[elem.id]);
|
|
new_messages.push(elem);
|
|
} else {
|
|
elsewhere_messages.push(elem);
|
|
}
|
|
}
|
|
|
|
// This second call to add_message_metadata in the
|
|
// insert_new_messages code path helps in very rare race
|
|
// conditions, where e.g. the current user's name was
|
|
// edited in between when they sent the message and when
|
|
// we hear back from the server and can echo the new
|
|
// message. Arguably, it's counterproductive complexity.
|
|
new_messages = new_messages.map(message_store.add_message_metadata);
|
|
|
|
message_util.add_new_messages(new_messages, msg_list);
|
|
unread_ops.process_visible();
|
|
notifications.notify_messages_outside_current_search(elsewhere_messages);
|
|
},
|
|
error: function () {
|
|
// We might want to be more clever here
|
|
setTimeout(function () {
|
|
if (msg_list === current_msg_list) {
|
|
// Don't actually try again if we unnarrowed
|
|
// while waiting
|
|
maybe_add_narrowed_messages(messages, msg_list);
|
|
}
|
|
}, 5000);
|
|
}});
|
|
}
|
|
|
|
|
|
exports.insert_new_messages = function insert_new_messages(messages, sent_by_this_client) {
|
|
messages = messages.map(message_store.add_message_metadata);
|
|
|
|
unread.process_loaded_messages(messages);
|
|
|
|
// message_list.all is a data-only list that we use to populate
|
|
// other lists, so we always update this
|
|
message_util.add_new_messages(messages, message_list.all);
|
|
|
|
let render_info;
|
|
|
|
if (narrow_state.active()) {
|
|
// We do this NOW even though the home view is not active,
|
|
// because we want the home view to load fast later.
|
|
message_util.add_new_messages(messages, home_msg_list);
|
|
|
|
if (narrow_state.filter().can_apply_locally()) {
|
|
render_info = message_util.add_new_messages(messages, message_list.narrowed);
|
|
} else {
|
|
// if we cannot apply locally, we have to wait for this callback to happen to notify
|
|
maybe_add_narrowed_messages(messages, message_list.narrowed);
|
|
}
|
|
} else {
|
|
// we're in the home view, so update its list
|
|
render_info = message_util.add_new_messages(messages, home_msg_list);
|
|
}
|
|
|
|
|
|
if (sent_by_this_client) {
|
|
const need_user_to_scroll = render_info && render_info.need_user_to_scroll;
|
|
// sent_by_this_client will be true if ANY of the messages
|
|
// were sent by this client; notifications.notify_local_mixes
|
|
// will filter out any not sent by us.
|
|
notifications.notify_local_mixes(messages, need_user_to_scroll);
|
|
}
|
|
|
|
activity.process_loaded_messages(messages);
|
|
|
|
unread_ui.update_unread_counts();
|
|
resize.resize_page_components();
|
|
|
|
unread_ops.process_visible();
|
|
notifications.received_messages(messages);
|
|
stream_list.update_streams_sidebar();
|
|
pm_list.update_private_messages();
|
|
};
|
|
|
|
exports.update_messages = function update_messages(events) {
|
|
const msgs_to_rerender = [];
|
|
let topic_edited = false;
|
|
let changed_narrow = false;
|
|
let changed_compose = false;
|
|
let message_content_edited = false;
|
|
let stream_changed = false;
|
|
|
|
for (const event of events) {
|
|
const msg = message_store.get(event.message_id);
|
|
if (msg === undefined) {
|
|
continue;
|
|
}
|
|
|
|
delete msg.local_edit_timestamp;
|
|
|
|
msgs_to_rerender.push(msg);
|
|
|
|
message_store.update_booleans(msg, event.flags);
|
|
|
|
unread.update_message_for_mention(msg);
|
|
|
|
condense.un_cache_message_content_height(msg.id);
|
|
|
|
if (event.rendered_content !== undefined) {
|
|
msg.content = event.rendered_content;
|
|
}
|
|
|
|
if (event.is_me_message !== undefined) {
|
|
msg.is_me_message = event.is_me_message;
|
|
}
|
|
|
|
const row = current_msg_list.get_row(event.message_id);
|
|
if (row.length > 0) {
|
|
message_edit.end(row);
|
|
}
|
|
|
|
const new_topic = util.get_edit_event_topic(event);
|
|
|
|
const {new_stream_id} = event;
|
|
|
|
// A topic edit may affect multiple messages, listed in
|
|
// event.message_ids. event.message_id is still the first message
|
|
// where the user initiated the edit.
|
|
topic_edited = new_topic !== undefined;
|
|
stream_changed = new_stream_id !== undefined;
|
|
if (topic_edited || stream_changed) {
|
|
const going_forward_change = ['change_later', 'change_all'].includes(event.propagate_mode);
|
|
|
|
const stream_name = stream_data.get_sub_by_id(event.stream_id).name;
|
|
const compose_stream_name = compose_state.stream_name();
|
|
const orig_topic = util.get_edit_event_orig_topic(event);
|
|
|
|
if (going_forward_change && stream_name && compose_stream_name) {
|
|
if (stream_name.toLowerCase() === compose_stream_name.toLowerCase()) {
|
|
if (orig_topic === compose_state.topic()) {
|
|
changed_compose = true;
|
|
compose_state.topic(new_topic);
|
|
compose_fade.set_focused_recipient("stream");
|
|
}
|
|
}
|
|
}
|
|
|
|
const current_filter = narrow_state.filter();
|
|
if (going_forward_change) {
|
|
// This logic is a bit awkward. What we're trying to
|
|
// accomplish is two things:
|
|
//
|
|
// * If we're currently narrowed to a topic that was just moved,
|
|
// renarrow to the new location.
|
|
// * We determine whether enough of the topic was moved to justify
|
|
// renarrowing by checking if the currently selected message is moved.
|
|
//
|
|
// Corner cases around only moving some messages in a topic
|
|
// need to be thought about carefully when making changes.
|
|
//
|
|
// Code further down takes care of the actual rerendering of
|
|
// messages within a narrow.
|
|
const current_id = current_msg_list.selected_id();
|
|
const selection_changed_topic = event.message_ids.includes(current_id);
|
|
if (selection_changed_topic) {
|
|
if (current_filter && current_filter.has_topic(stream_name, orig_topic)) {
|
|
let new_filter = current_filter;
|
|
if (new_filter && stream_changed) {
|
|
// TODO: This logic doesn't handle the
|
|
// case where we're a guest user and the
|
|
// message moves to a stream we cannot
|
|
// access, which would cause the
|
|
// stream_data lookup here to fail.
|
|
//
|
|
// The fix is likely somewhat involved, so punting for now.
|
|
const new_stream_name = stream_data.get_sub_by_id(new_stream_id).name;
|
|
new_filter = new_filter.filter_with_new_params({
|
|
operator: 'stream',
|
|
operand: new_stream_name,
|
|
});
|
|
changed_narrow = true;
|
|
}
|
|
|
|
if (new_filter && topic_edited) {
|
|
new_filter = new_filter.filter_with_new_params({
|
|
operator: 'topic',
|
|
operand: new_topic,
|
|
});
|
|
changed_narrow = true;
|
|
}
|
|
|
|
if (changed_narrow) {
|
|
const operators = new_filter.operators();
|
|
const opts = {
|
|
trigger: 'stream/topic change',
|
|
then_select_id: current_id,
|
|
};
|
|
narrow.activate(operators, opts);
|
|
changed_narrow = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
for (const id of event.message_ids) {
|
|
const msg = message_store.get(id);
|
|
if (msg === undefined) {
|
|
continue;
|
|
}
|
|
|
|
// Remove the recent topics entry for the old topics;
|
|
// must be called before we call set_message_topic.
|
|
topic_data.remove_message({
|
|
stream_id: msg.stream_id,
|
|
topic_name: msg.topic,
|
|
});
|
|
|
|
// Update the unread counts; again, this must be called
|
|
// before we modify the topic field on the message.
|
|
unread.update_unread_topics(msg, event);
|
|
|
|
// Now edit the attributes of our message object.
|
|
if (topic_edited) {
|
|
msg.topic = new_topic;
|
|
msg.topic_links = event.topic_links;
|
|
}
|
|
if (stream_changed) {
|
|
const new_stream_name = stream_data.get_sub_by_id(new_stream_id).name;
|
|
msg.stream_id = event.new_stream_id;
|
|
msg.stream = new_stream_name;
|
|
msg.display_recipient = new_stream_name;
|
|
}
|
|
|
|
// Add the recent topics entry for the new stream/topics.
|
|
topic_data.add_message({
|
|
stream_id: msg.stream_id,
|
|
topic_name: msg.topic,
|
|
message_id: msg.id,
|
|
});
|
|
|
|
if (!changed_narrow && current_filter && current_filter.can_apply_locally() &&
|
|
!current_filter.predicate()(msg)) {
|
|
// This topic edit makes this message leave the
|
|
// current narrow, which is not being changed as
|
|
// part of processing this event. So we should
|
|
// remove the message from the current/narrowed message list.
|
|
const cur_row = current_msg_list.get_row(id);
|
|
if (cur_row !== undefined) {
|
|
current_msg_list.remove_and_rerender([{id: id}]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (event.orig_content !== undefined) {
|
|
if (page_params.realm_allow_edit_history) {
|
|
// Most correctly, we should do this for topic edits as
|
|
// well; but we don't use the data except for content
|
|
// edits anyway.
|
|
const edit_history_entry = {
|
|
edited_by: event.edited_by,
|
|
prev_content: event.orig_content,
|
|
prev_rendered_content: event.orig_rendered_content,
|
|
prev_rendered_content_version: event.prev_rendered_content_version,
|
|
timestamp: event.edit_timestamp,
|
|
};
|
|
// Add message's edit_history in message dict
|
|
// For messages that are edited, edit_history needs to
|
|
// be added to message in frontend.
|
|
if (msg.edit_history === undefined) {
|
|
msg.edit_history = [];
|
|
}
|
|
msg.edit_history = [edit_history_entry].concat(msg.edit_history);
|
|
}
|
|
message_content_edited = true;
|
|
|
|
// Update raw_content, so that editing a few times in a row is fast.
|
|
msg.raw_content = event.content;
|
|
}
|
|
|
|
msg.last_edit_timestamp = event.edit_timestamp;
|
|
delete msg.last_edit_timestr;
|
|
|
|
notifications.received_messages([msg]);
|
|
alert_words.process_message(msg);
|
|
}
|
|
|
|
// If a topic was edited, we re-render the whole view to get any
|
|
// propagated edits to be updated (since the topic edits can have
|
|
// changed the correct grouping of messages).
|
|
if (topic_edited || stream_changed) {
|
|
home_msg_list.update_muting_and_rerender();
|
|
// However, we don't need to rerender message_list.narrowed if
|
|
// we just changed the narrow earlier in this function.
|
|
if (!changed_narrow && current_msg_list === message_list.narrowed) {
|
|
message_list.narrowed.update_muting_and_rerender();
|
|
}
|
|
} else {
|
|
// If the content of the message was edited, we do a special animation.
|
|
current_msg_list.view.rerender_messages(msgs_to_rerender, message_content_edited);
|
|
if (current_msg_list === message_list.narrowed) {
|
|
home_msg_list.view.rerender_messages(msgs_to_rerender);
|
|
}
|
|
}
|
|
|
|
if (changed_compose) {
|
|
// We need to do this after we rerender the message list, to
|
|
// produce correct results.
|
|
compose_fade.update_message_list();
|
|
}
|
|
|
|
unread_ui.update_unread_counts();
|
|
stream_list.update_streams_sidebar();
|
|
pm_list.update_private_messages();
|
|
};
|
|
|
|
window.message_events = exports;
|