paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

buddy list: Remove buggy check preventing updates to me.

Browse Source 
This check doesn't work with the `me` user, because that
user is always at the top of the all users list, and
therefore `new_pos_in_all_users` will always be 0 and
never `render_count`. It's possible this was already
broken before the split buddy list change.

We can remove this check because `insert_new_html` is only
called when we definitely want to insert html. It's only
called from `insert_or_move`, and for moves we always
remove the user we're moving/replacing before the insert.
This commit is contained in:
evykassirer
2024-06-11 12:20:28 -07:00
committed by Tim Abbott
parent c5b8255d42
commit fea4b2f65d
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/src/buddy_list.ts
View File

@@ -686,35 +686,27 @@ export class BuddyList extends BuddyListConf {
insert_new_html(opts: {
new_user_id: number | undefined;
html: string;
new_pos_in_all_users: number;
is_subscribed_user: boolean;
}): void {
const user_id_following_insertion = opts.new_user_id;
const html = opts.html;
const new_pos_in_all_users = opts.new_pos_in_all_users;
const is_subscribed_user = opts.is_subscribed_user;
// This means we're inserting at the end
if (user_id_following_insertion === undefined) {
if (new_pos_in_all_users === this.render_count) {
this.render_count += 1;
if (is_subscribed_user) {
this.$users_matching_view_container.append($(html));
} else {
this.$other_users_container.append($(html));
}
this.update_padding();
if (is_subscribed_user) {
this.$users_matching_view_container.append($(html));
} else {
this.$other_users_container.append($(html));
}
return;
}
if (new_pos_in_all_users < this.render_count) {
this.render_count += 1;
} else {
const $li = this.find_li({key: user_id_following_insertion});
assert($li !== undefined);
$li.before($(html));
this.update_padding();
}
this.render_count += 1;
this.update_padding();
}
insert_or_move(opts: {user_id: number; item: BuddyUserInfo}): void {
@@ -753,7 +745,6 @@ export class BuddyList extends BuddyListConf {
const html = this.item_to_html({item});
this.insert_new_html({
new_pos_in_all_users,
html,
new_user_id,
is_subscribed_user,