user [nfc]: Handle name fallback to message within getFullNameText an…

…d friends
chrisbobbe · Jan 5, 2024 · eb3fb95 · eb3fb95
1 parent 0c29df4
commit eb3fb95
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 33 deletions.
diff --git a/src/lightbox/LightboxHeader.js b/src/lightbox/LightboxHeader.js
@@ -67,15 +67,15 @@ export default function LightboxHeader(props: Props): Node {
       <SafeAreaView mode="padding" edges={['right', 'left']} style={styles.contentArea}>
         <UserAvatarWithPresence size={36} userId={senderId} />
         <View style={styles.text}>
-          {sender != null ? (
-            <ZulipTextIntl
-              style={styles.name}
-              numberOfLines={1}
-              text={getFullNameReactText({ user: sender, enableGuestUserIndicator })}
-            />
-          ) : (
-            <ZulipText style={styles.name} numberOfLines={1} text={message.sender_full_name} />
-          )}
+          <ZulipTextIntl
+            style={styles.name}
+            numberOfLines={1}
+            text={getFullNameReactText({
+              user: sender,
+              enableGuestUserIndicator,
+              fallback: message.sender_full_name,
+            })}
+          />
           <ZulipText style={styles.subheader} numberOfLines={1}>
             {subheader}
           </ZulipText>

diff --git a/src/users/userSelectors.js b/src/users/userSelectors.js
@@ -338,7 +338,8 @@ export function getDisplayEmailForUser(realm: RealmState, user: UserOrBot): stri
 /**
  * Display text for a user's name, ignoring muting, as LocalizableText.
  *
- * Accepts `null` for the `user` argument; in that case, the text is
+ * Accepts `null` for the `user` argument; in that case, the name is
+ * taken from `fallback` if present, and otherwise the text is
  * "(unknown user)".
  *
  * For the same text as LocalizableReactText, see getFullNameReactText.
@@ -349,11 +350,12 @@ export function getDisplayEmailForUser(realm: RealmState, user: UserOrBot): stri
 export function getFullNameText(args: {|
   user: UserOrBot | null,
   enableGuestUserIndicator: boolean,
+  fallback?: string,
 |}): LocalizableText {
-  const { user, enableGuestUserIndicator } = args;
+  const { user, enableGuestUserIndicator, fallback } = args;
 
   if (user == null) {
-    return '(unknown user)';
+    return fallback != null ? noTranslation(fallback) : '(unknown user)';
   }
 
   if (user.role === Role.Guest && enableGuestUserIndicator) {
@@ -373,11 +375,12 @@ const italicTextStyle = { fontStyle: 'italic' };
 export function getFullNameReactText(args: {|
   +user: UserOrBot | null,
   +enableGuestUserIndicator: boolean,
+  +fallback?: string,
 |}): LocalizableReactText {
-  const { user, enableGuestUserIndicator } = args;
+  const { user, enableGuestUserIndicator, fallback } = args;
 
   if (user == null) {
-    return '(unknown user)';
+    return fallback != null ? noTranslation(fallback) : '(unknown user)';
   }
 
   if (user.role === Role.Guest && enableGuestUserIndicator) {
@@ -400,7 +403,8 @@ export function getFullNameReactText(args: {|
 /**
  * Display text for a user's name, as LocalizableText.
  *
- * Accepts `null` for the `user` argument; in that case, the text is
+ * Accepts `null` for the `user` argument; in that case, the name is
+ * taken from `fallback` if present, and otherwise the text is
  * "(unknown user)".
  *
  * If the user is muted, gives "Muted user".
@@ -414,11 +418,12 @@ export function getFullNameOrMutedUserText(args: {|
   user: UserOrBot | null,
   mutedUsers: MutedUsersState,
   enableGuestUserIndicator: boolean,
+  fallback?: string,
 |}): LocalizableText {
-  const { user, mutedUsers, enableGuestUserIndicator } = args;
+  const { user, mutedUsers, enableGuestUserIndicator, fallback } = args;
 
   if (user == null) {
-    return '(unknown user)';
+    return fallback != null ? noTranslation(fallback) : '(unknown user)';
   }
 
   if (mutedUsers.has(user.user_id)) {
@@ -437,11 +442,12 @@ export function getFullNameOrMutedUserReactText(args: {|
   user: UserOrBot | null,
   mutedUsers: MutedUsersState,
   enableGuestUserIndicator: boolean,
+  fallback?: string,
 |}): LocalizableReactText {
-  const { user, mutedUsers, enableGuestUserIndicator } = args;
+  const { user, mutedUsers, enableGuestUserIndicator, fallback } = args;
 
   if (user == null) {
-    return '(unknown user)';
+    return fallback != null ? noTranslation(fallback) : '(unknown user)';
   }
 
   if (mutedUsers.has(user.user_id)) {

diff --git a/src/webview/html/header.js b/src/webview/html/header.js
@@ -107,11 +107,16 @@ export default (
 >
   ${uiRecipients
     .map(r => {
-      const user = allUsersById.get(r.id);
+      const user = allUsersById.get(r.id) ?? null;
       // TODO use italics for "(guest)"
-      return user != null
-        ? _(getFullNameOrMutedUserText({ user, mutedUsers, enableGuestUserIndicator }))
-        : r.full_name;
+      return _(
+        getFullNameOrMutedUserText({
+          user,
+          mutedUsers,
+          enableGuestUserIndicator,
+          fallback: r.full_name,
+        }),
+      );
     })
     .sort()
     .join(', ')}

diff --git a/src/webview/html/message.js b/src/webview/html/message.js
@@ -282,16 +282,14 @@ $!${divOpenHtml}
 
   const { sender_id } = message;
   const sender = backgroundData.allUsersById.get(sender_id) ?? null;
-  const senderFullName =
-    sender != null
-      ? _(
-          // TODO use italics for "(guest)"
-          getFullNameText({
-            user: sender,
-            enableGuestUserIndicator: backgroundData.enableGuestUserIndicator,
-          }),
-        )
-      : message.sender_full_name;
+  const senderFullName = _(
+    // TODO use italics for "(guest)"
+    getFullNameText({
+      user: sender,
+      enableGuestUserIndicator: backgroundData.enableGuestUserIndicator,
+      fallback: message.sender_full_name,
+    }),
+  );
   const avatarUrl = message.avatar_url
     .get(
       // 48 logical pixels; see `.avatar` and `.avatar img` in