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

narrow: Adjust for moved message with canonical terms. 

In narrow.activate, the adjusted_terms_if_moved helper uses the
raw terms from the URL for checking if a message was moved. If a
non-canoncial operator was in the URL for a narrow (e.g. "subject"
instead of "topic" and now "stream" instead of "channel"), then
the view wasn't updated correctly.

Update adjusted_terms_if_moved to use the canonical version of the
operator in the URL when adjusting the message history.
This commit is contained in:
Lauryn Menard 2024-04-26 12:44:00 +02:00 committed by Tim Abbott
parent 5c0cccc807
commit e54047f9cf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/narrow.js
View File

@ -226,14 +226,14 @@ export function activate(raw_terms, opts) {
if (id_info.target_id && filter.has_operator("channel") && filter.has_operator("topic")) {
const target_message = message_store.get(id_info.target_id);
function adjusted_terms_if_moved(terms, message) {
function adjusted_terms_if_moved(raw_terms, message) {
const adjusted_terms = [];
let terms_changed = false;
for (const term of terms) {
for (const term of raw_terms) {
const adjusted_term = {...term};
if (
term.operator === "channel" &&
Filter.canonicalize_operator(term.operator) === "channel" &&
!util.lower_same(term.operand, message.display_recipient)
) {
adjusted_term.operand = message.display_recipient;
@ -241,7 +241,7 @@ export function activate(raw_terms, opts) {
}
if (
term.operator === "topic" &&
Filter.canonicalize_operator(term.operator) === "topic" &&
!util.lower_same(term.operand, message.topic)
) {
adjusted_term.operand = message.topic;
@ -268,9 +268,9 @@ export function activate(raw_terms, opts) {
const narrow_stream_name = filter.operands("channel")[0];
const narrow_stream_data = stream_data.get_sub(narrow_stream_name);
if (!narrow_stream_data) {
// The id of the target message is correct but the stream name is
// incorrect in the URL. We reconstruct the narrow with the correct
// stream name and narrow.
// The stream name is invalid or incorrect in the URL.
// We reconstruct the narrow with the data from the
// target message ID that we have.
const adjusted_terms = adjusted_terms_if_moved(raw_terms, target_message);
if (adjusted_terms === null) {