presence: Replace "unavailable" status with "invisible mode"

Fixes: #5445

Author: chrisbobbe

src/account-info/ProfileScreen.js

@@ -14,8 +14,9 @@ import ZulipButton from '../common/ZulipButton';
 import { logout } from '../account/logoutActions';
 import { tryStopNotifications } from '../notification/notifTokens';
 import AccountDetails from './AccountDetails';
+import { getRealm } from '../directSelectors';
 import { getOwnUser, getOwnUserId } from '../users/userSelectors';
-import { getAuth, getIdentity } from '../account/accountsSelectors';
+import { getAuth, getIdentity, getZulipFeatureLevel } from '../account/accountsSelectors';
 import { useNavigation } from '../react-navigation';
 import { showConfirmationDialog } from '../utils/info';
 import { OfflineNoticePlaceholder } from '../boot/OfflineNoticeProvider';
@@ -128,22 +129,37 @@ type Props = $ReadOnly<{|
  */
 export default function ProfileScreen(props: Props): Node {
   const auth = useSelector(getAuth);
+  const zulipFeatureLevel = useSelector(getZulipFeatureLevel);
   const ownUser = useSelector(getOwnUser);
   const ownUserId = useSelector(getOwnUserId);
+  const presenceEnabled = useSelector(state => getRealm(state).presenceEnabled);
   const awayStatus = useSelector(state => getUserStatus(state, ownUserId).away);
 
   return (
     <SafeAreaView mode="padding" edges={['top']} style={{ flex: 1 }}>
       <OfflineNoticePlaceholder />
       <ScrollView>
         <AccountDetails user={ownUser} showEmail={false} />
-        <SwitchRow
-          label="Set yourself to away"
-          value={awayStatus}
-          onValueChange={(away: boolean) => {
-            api.updateUserStatus(auth, { away });
-          }}
-        />
+        {zulipFeatureLevel >= 148 ? (
+          <SwitchRow
+            label="Invisible mode"
+            /* $FlowIgnore[incompatible-cast] - Only null when FL is <89;
+               see comment on RealmState['presenceEnabled'] */
+            value={!(presenceEnabled: boolean)}
+            onValueChange={(newValue: boolean) => {
+              api.updateUserSettings(auth, { presence_enabled: !newValue }, zulipFeatureLevel);
+            }}
+          />
+        ) : (
+          // TODO(server-6.0): Remove.
+          <SwitchRow
+            label="Set yourself to away"
+            value={awayStatus}
+            onValueChange={(away: boolean) => {
+              api.updateUserStatus(auth, { away });
+            }}
+          />
+        )}
         <View style={styles.buttonRow}>
           <SetStatusButton />
         </View>

src/api/modelTypes.js

@@ -446,6 +446,11 @@ export type UserGroup = $ReadOnly<{|
  */
 export type UserStatus = $ReadOnly<{|
   // true/false: User unavailable/available.
+  //
+  // Deprecated: "invisible mode", new in FL 148, doesn't involve this:
+  //   https://chat.zulip.org/#narrow/stream/2-general/topic/.22unavailable.22.20status/near/1454779
+  // Don't use it except for servers <148.
+  // TODO(server-6.0): Remove.
   away: boolean,
 
   // "foo": User's status text is "foo".

src/common/PresenceStatusIndicator.js

@@ -96,6 +96,7 @@ function PresenceStatusIndicatorOffline() {
   return <View style={[styles.offline, styles.common]} />;
 }
 
+// TODO(server-6.0): Remove; this status was made obsolete in FL 148.
 function PresenceStatusIndicatorUnavailable() {
   return (
     <View style={[styles.unavailableWrapper, styles.common]}>

src/title/ActivityText.js

@@ -6,7 +6,7 @@ import type { TextStyleProp } from 'react-native/Libraries/StyleSheet/StyleSheet
 
 import type { UserOrBot } from '../types';
 import { useSelector } from '../react-redux';
-import { getPresence } from '../selectors';
+import { getPresence, getZulipFeatureLevel } from '../selectors';
 import { getUserStatus } from '../user-statuses/userStatusesModel';
 import { presenceToHumanTime } from '../utils/presence';
 import ZulipText from '../common/ZulipText';
@@ -18,14 +18,16 @@ type Props = $ReadOnly<{|
 
 export default function ActivityText(props: Props): Node {
   const { style } = props;
+
+  const zulipFeatureLevel = useSelector(getZulipFeatureLevel);
   const presence = useSelector(state => getPresence(state)[props.user.email]);
   const userStatus = useSelector(state => getUserStatus(state, props.user.user_id));
 
   if (!presence) {
     return null;
   }
 
-  const activity = presenceToHumanTime(presence, userStatus);
+  const activity = presenceToHumanTime(presence, userStatus, zulipFeatureLevel);
 
   return <ZulipText style={style} text={`Active ${activity}`} />;
 }

src/utils/__tests__/presence-test.js

@@ -6,6 +6,7 @@ import {
   statusFromPresence,
   statusFromPresenceAndUserStatus,
 } from '../presence';
+import * as eg from '../../__tests__/lib/exampleData';
 
 const currentTimestamp = Date.now() / 1000;
 
@@ -87,6 +88,7 @@ describe('presenceToHumanTime', () => {
           aggregated: { client: 'website', status: 'active', timestamp: currentTimestamp - 240 },
         },
         { away: false, status_text: null, status_emoji: null },
+        eg.recentZulipFeatureLevel,
       ),
     ).toBe('4 minutes ago');
   });
@@ -98,18 +100,33 @@ describe('presenceToHumanTime', () => {
           aggregated: { client: 'website', status: 'active', timestamp: currentTimestamp - 100 },
         },
         { away: false, status_text: null, status_emoji: null },
+        eg.recentZulipFeatureLevel,
       ),
     ).toBe('now');
   });
 
-  test('if less than a day, and the user is "away" the user is ...', () => {
+  // TODO(server-6.0): Remove
+  test('Pre-FL 148: if less than a day and user is "away", use imprecise "today"', () => {
     expect(
       presenceToHumanTime(
         { aggregated: { client: 'website', status: 'active', timestamp: currentTimestamp - 100 } },
         { away: true, status_text: null, status_emoji: null },
+        147,
       ),
     ).toBe('today');
   });
+
+  // TODO(server-6.0): Remove, once this test case is redundant with those
+  //   above after the status parameter is gone.
+  test('FL 148: if less than a day and user is "away", *don\'t* use imprecise "today"', () => {
+    expect(
+      presenceToHumanTime(
+        { aggregated: { client: 'website', status: 'active', timestamp: currentTimestamp - 100 } },
+        { away: true, status_text: null, status_emoji: null },
+        148,
+      ),
+    ).not.toBe('today');
+  });
 });
 
 describe('statusFromPresence', () => {

src/utils/presence.js

@@ -11,6 +11,7 @@ import type { UserId } from '../api/idTypes';
 import { getPresence } from '../directSelectors';
 import { tryGetUserForId } from '../users/userSelectors';
 import { getUserStatus } from '../user-statuses/userStatusesModel';
+import { getZulipFeatureLevel } from '../account/accountsSelectors';
 
 /** The relation `>=`, where `active` > `idle` > `offline`. */
 const presenceStatusGeq = (a: PresenceStatus, b: PresenceStatus): boolean => {
@@ -81,14 +82,21 @@ export const getAggregatedPresence = (presence: UserPresence): ClientPresence =>
   return { client, status, timestamp };
 };
 
-export const presenceToHumanTime = (presence: UserPresence, status: UserStatus): string => {
+export const presenceToHumanTime = (
+  presence: UserPresence,
+  status: UserStatus,
+  zulipFeatureLevel: number,
+): string => {
   if (!presence || !presence.aggregated) {
     return 'never';
   }
 
   const lastTimeActive = new Date(presence.aggregated.timestamp * 1000);
 
-  if (status.away && differenceInDays(Date.now(), lastTimeActive) < 1) {
+  // "Invisible mode", new in FL 148, doesn't involve UserStatus['away']:
+  //   https://chat.zulip.org/#narrow/stream/2-general/topic/.22unavailable.22.20status/near/1454779
+  // TODO(server-6.0): Remove this `if` block and the `status` parameter.
+  if (zulipFeatureLevel < 148 && status.away && differenceInDays(Date.now(), lastTimeActive) < 1) {
     // Be vague when an unavailable user is recently online.
     // TODO: This phrasing doesn't really match the logic and can be misleading.
     return 'today';
@@ -118,6 +126,7 @@ export const statusFromPresence = (presence: UserPresence | void): PresenceStatu
   return presence.aggregated.status;
 };
 
+// TODO(server-6.0): Remove; UserStatus['away'] was deprecated at FL 148.
 export const statusFromPresenceAndUserStatus = (
   presence: UserPresence | void,
   userStatus: UserStatus,
@@ -145,5 +154,10 @@ export const getPresenceStatusForUserId = (
   }
   const userStatus = getUserStatus(state, userId);
 
-  return statusFromPresenceAndUserStatus(userPresence, userStatus);
+  // "Invisible mode", new in FL 148, doesn't involve UserStatus['away']:
+  //   https://chat.zulip.org/#narrow/stream/2-general/topic/.22unavailable.22.20status/near/1454779
+  // TODO(server-6.0): Simplify to just statusFromPresence.
+  return getZulipFeatureLevel(state) >= 148
+    ? statusFromPresence(userPresence)
+    : statusFromPresenceAndUserStatus(userPresence, userStatus);
 };

static/translations/messages_en.json

@@ -1,4 +1,5 @@
 {
+  "Invisible mode": "Invisible mode",
   "{num_of_people, plural,\n  one {This message has been <z-link>read</z-link> by {num_of_people} person:}\n  other {This message has been <z-link>read</z-link> by {num_of_people} people:}}": "{num_of_people, plural,\n  one {This message has been <z-link>read</z-link> by {num_of_people} person:}\n  other {This message has been <z-link>read</z-link> by {num_of_people} people:}}",
   "View read receipts": "View read receipts",
   "Failed to show read receipts": "Failed to show read receipts",