paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_list_view: Simplify type of mention_classname.

Browse Source
This commit is contained in:
evykassirer
2024-09-11 20:12:16 -07:00
committed by Tim Abbott
parent 0c4186d91f
commit c19b3b0826
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/message_list_view.ts
View File

@@ -53,7 +53,7 @@ export type MessageContainer = {
include_sender: boolean; include_sender: boolean;
is_hidden: boolean; is_hidden: boolean;
last_edit_timestr: string | undefined; last_edit_timestr: string | undefined;
mention_classname: string | null; mention_classname: string | undefined;
message_edit_notices_in_left_col: boolean; message_edit_notices_in_left_col: boolean;
message_edit_notices_alongside_sender: boolean; message_edit_notices_alongside_sender: boolean;
message_edit_notices_for_status_message: boolean; message_edit_notices_for_status_message: boolean;
@@ -653,7 +653,7 @@ export class MessageListView {
sender_is_guest: boolean; sender_is_guest: boolean;
should_add_guest_indicator_for_sender: boolean; should_add_guest_indicator_for_sender: boolean;
is_hidden: boolean; is_hidden: boolean;
mention_classname?: string | null; mention_classname: string | undefined;
include_sender: boolean; include_sender: boolean;
status_message: string | false; status_message: string | false;
last_edit_timestr: string | undefined; last_edit_timestr: string | undefined;
@@ -704,14 +704,14 @@ export class MessageListView {
stream_data.is_user_subscribed(message.stream_id, people.my_current_user_id()) stream_data.is_user_subscribed(message.stream_id, people.my_current_user_id())
) { ) {
mention_classname = "direct_mention"; mention_classname = "direct_mention";
} else {
mention_classname = undefined;
} }
} else { } else {
mention_classname = "group_mention"; mention_classname = "group_mention";
} }
} else { } else {
// If there are no mentions, the classname might need to be updated (i.e. mention_classname = undefined;
// removed) to reflect this.
mention_classname = null;
} }
let include_sender = existing_include_sender && !is_hidden; let include_sender = existing_include_sender && !is_hidden;
if (is_revealed) { if (is_revealed) {
@@ -742,8 +742,7 @@ export class MessageListView {
sender_is_guest, sender_is_guest,
should_add_guest_indicator_for_sender, should_add_guest_indicator_for_sender,
is_hidden, is_hidden,
// don't set this unless we found a new value for it. mention_classname,
...(mention_classname !== undefined && {mention_classname}),
include_sender, include_sender,
...this._maybe_get_me_message(is_hidden, message), ...this._maybe_get_me_message(is_hidden, message),
...this._get_message_edited_vars(message), ...this._get_message_edited_vars(message),
@@ -905,7 +904,6 @@ export class MessageListView {
...(pm_with_url && {pm_with_url}), ...(pm_with_url && {pm_with_url}),
want_date_divider, want_date_divider,
date_divider_html, date_divider_html,
mention_classname: null,
...calculated_variables, ...calculated_variables,
...this.get_edited_notice_locations( ...this.get_edited_notice_locations(
include_sender, include_sender,

4
web/tests/message_list_view.test.js
View File

@@ -402,7 +402,7 @@ test("muted_message_vars", () => {
// Additionally test that, both there is no mention classname even on that message // Additionally test that, both there is no mention classname even on that message
// which has a mention, since we don't want to display muted mentions so visibly. // which has a mention, since we don't want to display muted mentions so visibly.
assert.equal(result[1].mention_classname, null); assert.equal(result[1].mention_classname, undefined);
// Now, reveal the hidden messages. // Now, reveal the hidden messages.
let is_revealed = true; let is_revealed = true;
@@ -435,7 +435,7 @@ test("muted_message_vars", () => {
// Additionally test that, both there is no mention classname even on that message // Additionally test that, both there is no mention classname even on that message
// which has a mention, since we don't want to display hidden mentions so visibly. // which has a mention, since we don't want to display hidden mentions so visibly.
assert.equal(result[1].mention_classname, null); assert.equal(result[1].mention_classname, undefined);
})(); })();
}); });