paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 18:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_feed: Fix edited notice to appear for disabled edit_history.

Browse Source 
This commit fixes the bug where the edited notice is not displayed
for edited/moved messages when the edit_history is disabled for
the organization. However, this is incorrect because the edited
notice should still be shown for messages that are edited/moved,
even if the edit_history is disabled. This issue occurred because
the edit_history variable was not set in the message object when
the edit_history is disabled. Therefore, in this case, we check
for the availability of last_edit_timestr. If it is available, we
display the edited notice. Since we cannot determine if the message
was moved or edited, we show the edited notice for both cases.
This commit is contained in:
Palash Baderia
2022-10-11 17:50:27 +05:30
committed by Tim Abbott
parent 632191b8c4
commit 987bbb641f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/message_list_view.js
View File

@@ -58,7 +58,7 @@ function same_recipient(a, b) {
return util.same_recipient(a.msg, b.msg); return util.same_recipient(a.msg, b.msg);
} }
function analyze_edit_history(message) { function analyze_edit_history(message, last_edit_timestr) {
// Returns a dict of booleans that describe the message's history: // Returns a dict of booleans that describe the message's history:
// * edited: if the message has had its content edited // * edited: if the message has had its content edited
// * moved: if the message has had its stream/topic edited // * moved: if the message has had its stream/topic edited
@@ -100,6 +100,12 @@ function analyze_edit_history(message) {
moved = true; moved = true;
} }
} }
} else if (last_edit_timestr !== undefined) {
// When the edit_history is disabled for the organization, we do not receive the edit_history
// variable in the message object. In this case, we will check if the last_edit_timestr is
// available or not. Since we don't have the edit_history, we can't determine if the message
// was moved or edited. Therefore, we simply mark the messages as edited.
edited = true;
} }
return {edited, moved, resolve_toggled}; return {edited, moved, resolve_toggled};
} }
@@ -307,7 +313,7 @@ export class MessageListView {
const include_sender = message_container.include_sender; const include_sender = message_container.include_sender;
const is_hidden = message_container.is_hidden; const is_hidden = message_container.is_hidden;
const status_message = Boolean(message_container.status_message); const status_message = Boolean(message_container.status_message);
const edit_history_details = analyze_edit_history(message_container.msg); const edit_history_details = analyze_edit_history(message_container.msg, last_edit_timestr);
if ( if (
last_edit_timestr === undefined || last_edit_timestr === undefined ||