presence: Rename type Presence to clearer UserPresence.

There are lots of different types involved in the presence system, and
it's not particularly obvious which one the name `Presence` would go
to in preference to the others.  Be explicit.

Author: gnprice

src/account-info/AccountDetails.js

@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 import { View, Dimensions, StyleSheet } from 'react-native';
 
-import type { Dispatch, Presence, User } from '../types';
+import type { Dispatch, UserPresence, User } from '../types';
 import { Avatar, ComponentList, RawLabel, ZulipButton } from '../common';
 import { IconPrivateChat } from '../common/Icons';
 import { privateNarrow } from '../utils/narrow';
@@ -26,7 +26,7 @@ const componentStyles = StyleSheet.create({
 type Props = {|
   dispatch: Dispatch,
   user: User,
-  presence: Presence,
+  presence: UserPresence,
 |};
 
 export default class AccountDetails extends PureComponent<Props, void> {

src/actionTypes.js

@@ -86,7 +86,7 @@ import type {
   Subscription,
   Topic,
   PresenceState,
-  Presence,
+  UserPresence,
   RealmEmojiState,
   SettingsState,
   CaughtUpState,
@@ -390,7 +390,7 @@ export type EventPresenceAction = {|
   ...ServerEvent,
   type: typeof EVENT_PRESENCE,
   email: string,
-  presence: Presence,
+  presence: UserPresence,
   server_timestamp: number,
 |};
 

src/common/Avatar.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
 
-import type { GlobalState, Presence } from '../types';
+import type { GlobalState, UserPresence } from '../types';
 import { nullFunction } from '../nullObjects';
 import { getCurrentRealm } from '../selectors';
 import ImageAvatar from './ImageAvatar';
@@ -26,7 +26,7 @@ type Props = {|
   email: string,
   name: string,
   size: number,
-  presence?: Presence,
+  presence?: UserPresence,
   realm: string,
   shape: 'square' | 'rounded' | 'circle',
   onPress?: () => void,

src/common/UserStatusIndicator.js

@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import type { Style, Presence } from '../types';
+import type { Style, UserPresence } from '../types';
 import { statusFromPresence } from '../utils/presence';
 
 const styles = StyleSheet.create({
@@ -27,7 +27,7 @@ const styles = StyleSheet.create({
 
 type Props = {|
   style?: Style,
-  presence?: Presence,
+  presence?: UserPresence,
   hideIfOffline: boolean,
 |};
 
@@ -38,7 +38,7 @@ type Props = {|
  * * gray if 'offline'
  *
  * @prop [style] - Style object for additional customization.
- * @prop [presence] - Presence object used to determine the status from.
+ * @prop [presence] - UserPresence object used to determine the status from.
  * @prop hideIfOffline - Do not render for 'offline' state.
  */
 export default class UserStatusIndicator extends PureComponent<Props> {

src/nullObjects.js

@@ -2,7 +2,7 @@
 import type {
   User,
   Subscription,
-  Presence,
+  UserPresence,
   PresenceAggregated,
   CaughtUp,
   Fetching,
@@ -61,7 +61,7 @@ export const NULL_PRESENCE_AGGREGATED: PresenceAggregated = {
 };
 
 /** DEPRECATED; don't add new uses.  See block comment above definition. */
-export const NULL_PRESENCE: Presence = {
+export const NULL_PRESENCE: UserPresence = {
   aggregated: NULL_PRESENCE_AGGREGATED,
 };
 

src/title/ActivityText.js

@@ -3,14 +3,14 @@ import { connect } from 'react-redux';
 
 import React, { PureComponent } from 'react';
 
-import type { Presence, Style } from '../types';
+import type { UserPresence, Style } from '../types';
 import { getPresence } from '../selectors';
 import { presenceToHumanTime } from '../utils/presence';
 import { RawLabel } from '../common';
 
 type Props = {
   color?: string,
-  presence: Presence,
+  presence: UserPresence,
   style: Style,
 };
 

src/title/TitlePrivate.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import React, { PureComponent } from 'react';
 import { Text, View } from 'react-native';
 
-import type { Presence, User } from '../types';
+import type { UserPresence, User } from '../types';
 import { Avatar, ViewPlaceholder } from '../common';
 import ActivityText from './ActivityText';
 import { getPresence } from '../directSelectors';
@@ -14,7 +14,7 @@ import styles from '../styles';
 type Props = {
   user: User,
   color: string,
-  presence: Presence,
+  presence: UserPresence,
 };
 
 class TitlePrivate extends PureComponent<Props> {

src/types.js

@@ -159,7 +159,7 @@ export type PresenceAggregated = {|
  *   to display the user's presence status.
  * @prop (client) - The information reported by each of the user's clients.
  */
-export type Presence = {|
+export type UserPresence = {|
   aggregated: PresenceAggregated,
   [client: string]: ClientPresence,
 |};
@@ -399,7 +399,7 @@ export type UserGroupsState = UserGroup[];
  *   presence status.
  */
 export type PresenceState = {|
-  [email: string]: Presence,
+  [email: string]: UserPresence,
 |};
 
 export type OutboxState = Outbox[];

src/users/UserItem.js

@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import type { Presence } from '../types';
+import type { UserPresence } from '../types';
 import { Avatar, RawLabel, Touchable, UnreadCount } from '../common';
 import styles, { BRAND_COLOR } from '../styles';
 
@@ -29,7 +29,7 @@ type Props = {|
   email: string,
   fullName: string,
   avatarUrl: ?string,
-  presence?: Presence,
+  presence?: UserPresence,
   isSelected: boolean,
   showEmail: boolean,
   unreadCount?: number,

src/users/userHelpers.js

@@ -1,7 +1,7 @@
 /* @flow */
 import uniqby from 'lodash.uniqby';
 
-import type { Presence, User, UserGroup, PresenceState } from '../types';
+import type { UserPresence, User, UserGroup, PresenceState } from '../types';
 import { NULL_USER } from '../nullObjects';
 import { statusFromPresence } from '../utils/presence';
 
@@ -31,7 +31,7 @@ export const groupUsersByStatus = (users: User[], presences: PresenceState): Obj
     { active: [], idle: [], offline: [] },
   );
 
-const statusOrder = (presence: Presence): number => {
+const statusOrder = (presence: UserPresence): number => {
   const status = statusFromPresence(presence);
   switch (status) {
     case 'active':

src/utils/presence.js

@@ -2,7 +2,7 @@
 import differenceInSeconds from 'date-fns/difference_in_seconds';
 import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 
-import type { PresenceAggregated, Presence, UserStatus } from '../types';
+import type { PresenceAggregated, UserPresence, UserStatus } from '../types';
 
 const OFFLINE_THRESHOLD_SECS = 140;
 
@@ -16,7 +16,7 @@ const OFFLINE_THRESHOLD_SECS = 140;
  * This logic should match `status_from_timestamp` in the web app's
  * `static/js/presence.js`.
  */
-export const getAggregatedPresence = (presence: Presence): PresenceAggregated =>
+export const getAggregatedPresence = (presence: UserPresence): PresenceAggregated =>
   /* Out of the ClientPresence objects found in `presence`, we consider only
    * those with a timestamp newer than OFFLINE_THRESHOLD_SECS; then of
    * those, return the one that has the greatest UserStatus, where
@@ -53,7 +53,7 @@ export const getAggregatedPresence = (presence: Presence): PresenceAggregated =>
       { client: '', status: 'offline', timestamp: 0 },
     );
 
-export const presenceToHumanTime = (presence: Presence): string => {
+export const presenceToHumanTime = (presence: UserPresence): string => {
   if (!presence || !presence.aggregated) {
     return 'never';
   }
@@ -64,7 +64,7 @@ export const presenceToHumanTime = (presence: Presence): string => {
     : `${distanceInWordsToNow(lastTimeActive)} ago`;
 };
 
-export const statusFromPresence = (presence?: Presence): UserStatus => {
+export const statusFromPresence = (presence?: UserPresence): UserStatus => {
   if (!presence || !presence.aggregated) {
     return 'offline';
   }