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

message_events: Use new_stream_id consistently and add comments.

This commit is contained in:
Tim Abbott 2022-08-05 17:15:17 -07:00
parent 95c1f3b696
commit 675c42f40b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/message_events.js
View File

@ -181,11 +181,14 @@ export function update_messages(events) {
message_edit.end_message_row_edit($row); message_edit.end_message_row_edit($row);
} }
// new_topic will be undefined if the topic is unchanged.
const new_topic = util.get_edit_event_topic(event); const new_topic = util.get_edit_event_topic(event);
// new_stream_id will be undefined if the stream is unchanged.
const new_stream_id = event.new_stream_id; const new_stream_id = event.new_stream_id;
// old_stream_id will be present and valid for all stream messages.
const old_stream_id = event.stream_id; const old_stream_id = event.stream_id;
// Note: old_stream will be undefined if the message was moved // old_stream will be undefined if the message was moved from
// from a stream that the current user doesn't have access to. // a stream that the current user doesn't have access to.
const old_stream = sub_store.get(event.stream_id); const old_stream = sub_store.get(event.stream_id);
// Save the content edit to the front end msg.edit_history // Save the content edit to the front end msg.edit_history
@ -274,7 +277,7 @@ export function update_messages(events) {
timestamp: event.edit_timestamp, timestamp: event.edit_timestamp,
}; };
if (stream_changed) { if (stream_changed) {
edit_history_entry.stream = event.new_stream_id; edit_history_entry.stream = new_stream_id;
edit_history_entry.prev_stream = old_stream_id; edit_history_entry.prev_stream = old_stream_id;
} }
if (topic_edited) { if (topic_edited) {
@ -316,7 +319,7 @@ export function update_messages(events) {
} }
if (stream_changed) { if (stream_changed) {
const new_stream_name = sub_store.get(new_stream_id).name; const new_stream_name = sub_store.get(new_stream_id).name;
msg.stream_id = event.new_stream_id; msg.stream_id = new_stream_id;
msg.stream = new_stream_name; msg.stream = new_stream_name;
msg.display_recipient = new_stream_name; msg.display_recipient = new_stream_name;
} }