presence: Use server's offline threshold in last-active string

Author: gnprice

src/presence/__tests__/presenceModel-test.js

@@ -140,11 +140,17 @@ describe('getUserLastActiveAsRelativeTimeString', () => {
     userPresence: UserPresence,
     userStatus: UserStatus,
     zulipFeatureLevel?: number,
+    offlineThresholdSeconds?: number,
   }): string | null {
-    const { userPresence, userStatus, zulipFeatureLevel = eg.recentZulipFeatureLevel } = args;
+    const {
+      userPresence,
+      userStatus,
+      zulipFeatureLevel = eg.recentZulipFeatureLevel,
+      offlineThresholdSeconds, // eslint-disable-line no-shadow
+    } = args;
     return getUserLastActiveAsRelativeTimeString(
       eg.reduxStatePlus({
-        presence: makePresenceState([[eg.otherUser, userPresence]]),
+        presence: makePresenceState([[eg.otherUser, userPresence]], { offlineThresholdSeconds }),
         userStatuses: Immutable.Map([[eg.otherUser.user_id, userStatus]]),
         accounts: [{ ...eg.plusReduxState.accounts[0], zulipFeatureLevel }],
       }),
@@ -169,6 +175,16 @@ describe('getUserLastActiveAsRelativeTimeString', () => {
     expect(lastActiveString({ userPresence, userStatus })).toBe('now');
   });
 
+  test('Use specified offline threshold', () => {
+    const userPresence = {
+      aggregated: { client: 'website', status: 'active', timestamp: currentTimestamp - 100 },
+    };
+    const userStatus = { away: false, status_text: null, status_emoji: null };
+    expect(lastActiveString({ userPresence, userStatus, offlineThresholdSeconds: 80 })).toBe(
+      '2 minutes ago',
+    );
+  });
+
   // TODO(server-6.0): Remove
   test('Pre-FL 148: if less than a day and user is "away", use imprecise "today"', () => {
     const userPresence = {

src/presence/presenceModel.js

@@ -120,7 +120,8 @@ export function getUserLastActiveAsRelativeTimeString(
   user: UserOrBot,
   dateNow: number,
 ): string | null {
-  const presence = getUserPresenceByEmail(getPresence(state), user.email);
+  const presenceState = getPresence(state);
+  const presence = getUserPresenceByEmail(presenceState, user.email);
   if (!presence) {
     return null;
   }
@@ -142,7 +143,7 @@ export function getUserLastActiveAsRelativeTimeString(
     return 'today';
   }
 
-  return differenceInSeconds(dateNow, lastTimeActive) < OFFLINE_THRESHOLD_SECS
+  return differenceInSeconds(dateNow, lastTimeActive) < presenceState.offlineThresholdSeconds
     ? 'now'
     : `${formatDistanceToNow(lastTimeActive)} ago`;
 }