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.

settings_users: Sort "Last active" by the date shown for each user.

Evy Kassirer773b0dc4ba87
diff --git a/web/src/settings_users.ts b/web/src/settings_users.ts
index 5645a27af65..f5de765331a 100644
--- a/web/src/settings_users.ts
+++ b/web/src/settings_users.ts
@@ -87,10 +87,19 @@ const imported_section: UserSettingsSection = {
list_widget: undefined,
};
+// We use the join date for users who don't have presence data.
+function get_last_active_date(user: User): Date | undefined {
+ const last_active_date = presence.last_active_date(user.user_id);
+ if (!last_active_date && presence_data_fetched) {
+ return new Date(user.date_joined);
+ }
+ return last_active_date;
+}
+
function sort_last_active(a: User, b: User): number {
return util.compare_a_b(
- presence.last_active_date(a.user_id) ?? 0,
- presence.last_active_date(b.user_id) ?? 0,
+ get_last_active_date(a)?.getTime() ?? 0,
+ get_last_active_date(b)?.getTime() ?? 0,
);
}
@@ -378,10 +387,7 @@ function reset_scrollbar($sel: JQuery): () => void {
}
function get_last_active(user: User): string {
- const last_active_date = presence.last_active_date(user.user_id);
- if (!last_active_date && presence_data_fetched) {
- return timerender.render_now(new Date(user.date_joined)).time_str;
- }
+ const last_active_date = get_last_active_date(user);
if (!last_active_date) {
setTimeout(() => {
loading.make_indicator(