Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

buddy_list: Fix users who should be hidden being added back.

Shubham Padia63a07eab50bc
diff --git a/web/src/activity_ui.ts b/web/src/activity_ui.ts
index 823eb4e36cc..b695b610c08 100644
--- a/web/src/activity_ui.ts
+++ b/web/src/activity_ui.ts
@@ -86,13 +86,7 @@ export function redraw_user(user_id: number): void {
return;
}
- const filter_text = get_filter_text();
-
- if (!buddy_data.matches_filter(filter_text, user_id)) {
- return;
- }
-
- buddy_list.insert_or_move([user_id]);
+ buddy_list.insert_or_move([user_id], get_filter_text());
buddy_list_presence.update_indicators();
}
@@ -101,7 +95,7 @@ export function rerender_user_sidebar_participants(): void {
return;
}
- buddy_list.rerender_participants();
+ buddy_list.rerender_participants(get_filter_text());
}
export function check_should_redraw_new_user(user_id: number): boolean {
diff --git a/web/src/buddy_list.ts b/web/src/buddy_list.ts
index 31b1e51d9be..e9cb8cf3e24 100644
--- a/web/src/buddy_list.ts
+++ b/web/src/buddy_list.ts
@@ -1094,7 +1094,7 @@ export class BuddyList extends BuddyListConf {
this.update_padding();
}
- insert_or_move(user_ids: number[]): void {
+ insert_or_move(user_ids: number[], user_filter_text: string): void {
// TODO: Further optimize this function by clubbing DOM updates from
// multiple insertions/movements into a single update.
@@ -1105,6 +1105,10 @@ export class BuddyList extends BuddyListConf {
this.maybe_remove_user_id({user_id});
+ if (!buddy_data.matches_filter(user_filter_text, user_id)) {
+ continue;
+ }
+
const new_pos_in_all_users = this.find_position({
user_id,
user_id_list: this.all_user_ids,
@@ -1155,7 +1159,7 @@ export class BuddyList extends BuddyListConf {
background_task.run_async_function_without_await(this.render_section_headers.bind(this));
}
- rerender_participants(): void {
+ rerender_participants(user_filter_text: string): void {
if (page_params.is_spectator) {
return;
}
@@ -1166,7 +1170,10 @@ export class BuddyList extends BuddyListConf {
// We are just moving the users around since we still want to show the
// user in buddy list regardless of if they are a participant, so we
// call `insert_or_move` on both removed and added users.
- this.insert_or_move([...existing_participant_ids.symmetricDifference(all_participant_ids)]);
+ this.insert_or_move(
+ [...existing_participant_ids.symmetricDifference(all_participant_ids)],
+ user_filter_text,
+ );
}
fill_screen_with_content(): void {
diff --git a/web/src/user_events.ts b/web/src/user_events.ts
index 32985a469da..87dcb14339f 100644
--- a/web/src/user_events.ts
+++ b/web/src/user_events.ts
@@ -208,7 +208,7 @@ export const update_person = function update(event: UserUpdate): void {
}
message_live_update.update_avatar(user.user_id, event.avatar_url);
- buddy_list.insert_or_move([event.user_id]);
+ buddy_list.insert_or_move([event.user_id], activity_ui.get_filter_text());
user_profile.update_profile_modal_ui(user, event);
}
@@ -290,7 +290,7 @@ export const update_person = function update(event: UserUpdate): void {
user_group_edit.remove_deactivated_user_from_all_groups(event.user_id);
settings_users.update_view_on_deactivate(event.user_id, is_bot_user);
}
- buddy_list.insert_or_move([event.user_id]);
+ buddy_list.insert_or_move([event.user_id], activity_ui.get_filter_text());
// Update UI elements to reflect the user's deactivated/reactivated status
pm_list.update_private_messages();
compose_pm_pill.update_user_pill_active_status(user, event.is_active);
diff --git a/web/tests/activity.test.cjs b/web/tests/activity.test.cjs
index 174069049ee..ea6d635dcb8 100644
--- a/web/tests/activity.test.cjs
+++ b/web/tests/activity.test.cjs
@@ -549,13 +549,35 @@ test("insert_fred_then_alice_then_rename, both as other users", ({override}) =>
people.add_active_user(fred);
});
-test("insert_unfiltered_user_with_filter", () => {
- // This test only tests that we do not explode when
- // try to insert Fred into a list where he does not
- // match the search filter.
+test("redraw_user_not_matching_filter", ({override}) => {
+ add_sub_and_set_as_current_narrow(rome_sub);
+ peer_data.set_subscribers(rome_sub.stream_id, []);
+
+ let other_users_appended;
+ override(buddy_list.$other_users_list[0], "append", (element) => {
+ other_users_appended = element;
+ });
+ override(padded_widget, "update_padding", noop);
+ override(buddy_list_presence, "update_indicators", noop);
+
+ buddy_list_add_other_user(fred.user_id, $fred_stub);
+ let fred_removed = false;
+ override($fred_stub[0], "remove", () => {
+ fred_removed = true;
+ });
+
const $user_filter = $("input.user-list-filter");
+ $user_filter.val("fre");
+ activity_ui.redraw_user(fred.user_id);
+ assert.ok(other_users_appended.innerHTML.includes(`data-user-id="${fred.user_id}"`));
+ assert.ok(buddy_list.all_user_ids.includes(fred.user_id));
+
+ other_users_appended = undefined;
$user_filter.val("do-not-match-filter");
activity_ui.redraw_user(fred.user_id);
+ assert.ok(fred_removed);
+ assert.equal(other_users_appended, undefined);
+ assert.ok(!buddy_list.all_user_ids.includes(fred.user_id));
});
test("realm_presence_disabled", ({override}) => {
@@ -565,9 +587,78 @@ test("realm_presence_disabled", ({override}) => {
activity_ui.build_user_sidebar();
});
-test("redraw_muted_user", () => {
+test("redraw_muted_user", ({override}) => {
+ override(buddy_list_presence, "update_indicators", noop);
+
muted_users.add_muted_user(mark.user_id);
activity_ui.redraw_user(mark.user_id);
+ assert.ok(!buddy_list.all_user_ids.includes(mark.user_id));
+});
+
+function insert_mark_then_check_removed_when_ineligible(override, make_mark_ineligible) {
+ add_sub_and_set_as_current_narrow(rome_sub);
+ peer_data.set_subscribers(rome_sub.stream_id, []);
+
+ let other_users_appended;
+ override(buddy_list.$other_users_list[0], "append", (element) => {
+ other_users_appended = element;
+ });
+ override(padded_widget, "update_padding", noop);
+
+ const $mark_stub = $.create("mark stub");
+ buddy_list_add_other_user(mark.user_id, $mark_stub);
+ let mark_removed = false;
+ $mark_stub[0].remove = () => {
+ mark_removed = true;
+ };
+
+ buddy_list.insert_or_move([mark.user_id], "");
+ assert.ok(other_users_appended.innerHTML.includes(`data-user-id="${mark.user_id}"`));
+ assert.ok(buddy_list.all_user_ids.includes(mark.user_id));
+
+ other_users_appended = undefined;
+ make_mark_ineligible();
+ buddy_list.insert_or_move([mark.user_id], "");
+ assert.ok(mark_removed);
+ assert.equal(other_users_appended, undefined);
+ assert.ok(!buddy_list.all_user_ids.includes(mark.user_id));
+}
+
+test("insert_or_move_deactivated_user", ({override}) => {
+ insert_mark_then_check_removed_when_ineligible(override, () => {
+ people.deactivate(mark);
+ });
+ people.add_active_user(mark);
+});
+
+test("insert_or_move_muted_user", ({override}) => {
+ insert_mark_then_check_removed_when_ineligible(override, () => {
+ muted_users.add_muted_user(mark.user_id);
+ });
+});
+
+test("insert_or_move_user_not_matching_filter", () => {
+ add_sub_and_set_as_current_narrow(rome_sub);
+ peer_data.set_subscribers(rome_sub.stream_id, []);
+
+ buddy_list.insert_or_move([mark.user_id], "do-not-match-filter");
+ assert.ok(!buddy_list.all_user_ids.includes(mark.user_id));
+});
+
+test("insert_or_move_bot", () => {
+ add_sub_and_set_as_current_narrow(rome_sub);
+ peer_data.set_subscribers(rome_sub.stream_id, []);
+
+ const bot = make_user({
+ email: "[email protected]",
+ user_id: 8,
+ full_name: "Bot",
+ is_bot: true,
+ });
+ people.add_active_user(bot);
+
+ buddy_list.insert_or_move([bot.user_id], "");
+ assert.ok(!buddy_list.all_user_ids.includes(bot.user_id));
});
test("update_presence_info", ({override}) => {
diff --git a/web/tests/buddy_data.test.cjs b/web/tests/buddy_data.test.cjs
index bb357a90091..b1e14b343ff 100644
--- a/web/tests/buddy_data.test.cjs
+++ b/web/tests/buddy_data.test.cjs
@@ -480,6 +480,7 @@ test("get_conversation_participants", () => {
}),
);
+ activity_ui.set_cursor_and_filter();
activity_ui.rerender_user_sidebar_participants();
assert.deepEqual(
buddy_data.get_conversation_participants_callback()(),
diff --git a/web/tests/user_events.test.cjs b/web/tests/user_events.test.cjs
index 4833308f403..71d34d1002c 100644
--- a/web/tests/user_events.test.cjs
+++ b/web/tests/user_events.test.cjs
@@ -68,6 +68,7 @@ buddy_list.buddy_list = buddy_data;
mock_esm("../src/activity_ui", {
redraw() {},
+ get_filter_text: () => "",
});
mock_esm("../src/settings", {
update_lock_icon_in_sidebar() {},