paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

presence: Fix exception on trying to get user from ID.

Browse Source 
We don't always know about every user id. So, our code should
reflect the same.

Fixed by refactoring the function to use User object a function
parameter and let the called get the user object if possible.
This reduces duplicate calculation to get user object too.
This commit is contained in:
Aman Agrawal
2025-03-03 06:50:49 +00:00
committed by Tim Abbott
parent 0a2d17f7fa
commit f7a6d6467b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/presence.ts
View File

@@ -1,6 +1,7 @@
import {z} from "zod";
import * as people from "./people.ts";
import type {User} from "./people.ts";
import type {StateData, presence_schema} from "./state_data.ts";
import {realm} from "./state_data.ts";
import {user_settings} from "./user_settings.ts";
@@ -75,7 +76,7 @@ export function get_active_or_idle_user_ids(): number[] {
.map((entry) => entry[0]);
}
export function status_from_raw(raw: RawPresence, user_id: number): PresenceStatus {
export function status_from_raw(raw: RawPresence, user: User | undefined): PresenceStatus {
/*
Example of `raw`:
@@ -133,7 +134,6 @@ export function status_from_raw(raw: RawPresence, user_id: number): PresenceStat
who've never logged in, we fall back to when they joined.
*/
const user = people.get_by_user_id(user_id);
let date_joined_timestamp = 0;
if (user?.date_joined) {
date_joined_timestamp = new Date(user.date_joined).getTime() / 1000;
@@ -189,7 +189,9 @@ export function update_info_from_event(
raw_info.set(user_id, raw);
const status = status_from_raw(raw, user_id);
const ignore_missing = true;
const user = people.maybe_get_user_by_id(user_id, ignore_missing);
const status = status_from_raw(raw, user);
presence_info.set(user_id, status);
}
@@ -256,7 +258,7 @@ export function set_info(
raw_info.set(user_id, raw);
const status = status_from_raw(raw, user_id);
const status = status_from_raw(raw, person);
presence_info.set(user_id, status);
}
for (const user_id of all_active_or_idle_user_ids) {

8
web/tests/presence.test.cjs
View File

@@ -115,7 +115,7 @@ test("status_from_raw", () => {
active_timestamp: now - OFFLINE_THRESHOLD_SECS / 2,
};
assert.deepEqual(status_from_raw(raw, alice.user_id), {
assert.deepEqual(status_from_raw(raw, alice), {
status: "active",
last_active: raw.active_timestamp,
});
@@ -125,7 +125,7 @@ test("status_from_raw", () => {
active_timestamp: now - OFFLINE_THRESHOLD_SECS * 2,
};
assert.deepEqual(status_from_raw(raw, alice.user_id), {
assert.deepEqual(status_from_raw(raw, alice), {
status: "offline",
last_active: raw.active_timestamp,
});
@@ -135,7 +135,7 @@ test("status_from_raw", () => {
idle_timestamp: now - OFFLINE_THRESHOLD_SECS / 2,
};
assert.deepEqual(status_from_raw(raw, alice.user_id), {
assert.deepEqual(status_from_raw(raw, alice), {
status: "idle",
last_active: raw.idle_timestamp,
});
@@ -148,7 +148,7 @@ test("status_from_raw", () => {
active_timestamp: now - OFFLINE_THRESHOLD_SECS * 200,
idle_timestamp: now - OFFLINE_THRESHOLD_SECS * 100,
};
assert.deepEqual(status_from_raw(raw, alice.user_id), {
assert.deepEqual(status_from_raw(raw, alice), {
status: "offline",
last_active: raw.active_timestamp,
});