ActionSheets: Have constructHeaderActionButtons stop taking message arg

This changes the constructHeaderActionButtons function to take a stream
and topic, instead of a message, since that is conceptually closer to
what it's doing. Since the webview code previously called this path even
for PMs, which don't have a "topic", I've changed the webview code show
a toast when the user long-presses on a PM header. This way, they'll
still be able to see the list of all recipients, but we'll avoid the
somewhat silly action sheet with only a "Cancel" action.

I haven't routed this through to showHeaderActionButton yet, since all
of the button callbacks currently still require a Message, but that's
the goal in the future.

I've manually tested long-pressing a PM header, which correctly shows a
toast displaying the users in the PM.

Author: WesleyAC

src/message/__tests__/messageActionSheet-test.js

@@ -1,6 +1,7 @@
 // @flow strict-local
 import deepFreeze from 'deep-freeze';
 import { HOME_NARROW } from '../../utils/narrow';
+import { streamNameOfStreamMessage } from '../../utils/recipient';
 
 import * as eg from '../../__tests__/lib/exampleData';
 import { constructMessageActionButtons, constructHeaderActionButtons } from '../messageActionSheet';
@@ -48,15 +49,12 @@ describe('constructActionButtons', () => {
 describe('constructHeaderActionButtons', () => {
   test('show Unmute topic option if topic is muted', () => {
     const mute = deepFreeze([['electron issues', 'issue #556']]);
-    const message = eg.streamMessage({
-      display_recipient: 'electron issues',
-      subject: 'issue #556',
-    });
     const buttons = constructHeaderActionButtons({
       mute,
       subscriptions: [],
       ownUser: eg.selfUser,
-      message,
+      stream: 'electron issues',
+      topic: 'issue #556',
     });
     expect(buttonTitles(buttons)).toContain('Unmute topic');
   });
@@ -66,7 +64,8 @@ describe('constructHeaderActionButtons', () => {
       mute: [],
       subscriptions: [],
       ownUser: eg.selfUser,
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Mute topic');
   });
@@ -77,7 +76,8 @@ describe('constructHeaderActionButtons', () => {
       mute: [],
       subscriptions,
       ownUser: eg.selfUser,
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Unmute stream');
   });
@@ -88,7 +88,8 @@ describe('constructHeaderActionButtons', () => {
       mute: [],
       subscriptions,
       ownUser: eg.selfUser,
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Mute stream');
   });
@@ -99,7 +100,8 @@ describe('constructHeaderActionButtons', () => {
       mute: [],
       subscriptions: [],
       ownUser,
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Delete topic');
   });
@@ -109,7 +111,8 @@ describe('constructHeaderActionButtons', () => {
       mute: [],
       subscriptions: [],
       ownUser: eg.selfUser,
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).not.toContain('Delete topic');
   });

src/message/messageActionSheet.js

@@ -27,7 +27,7 @@ import * as api from '../api';
 import { showToast } from '../utils/info';
 import { doNarrow, deleteOutboxMessage, navigateToEmojiPicker } from '../actions';
 import { navigateToMessageReactionScreen } from '../nav/navActions';
-import { pmUiRecipientsFromMessage, streamNameOfStreamMessage } from '../utils/recipient';
+import { streamNameOfStreamMessage } from '../utils/recipient';
 import { deleteMessagesForTopic } from '../topics/topicActions';
 import * as logging from '../utils/logging';
 
@@ -228,30 +228,29 @@ export const constructHeaderActionButtons = ({
   mute,
   subscriptions,
   ownUser,
-  message,
+  stream,
+  topic,
 }: {|
   mute: MuteState,
   subscriptions: Subscription[],
   ownUser: User,
-  message: Message | Outbox,
+  stream: string,
+  topic: string,
 |}): HeaderButton[] => {
   const buttons = [];
-  if (message.type === 'stream') {
-    if (ownUser.is_admin) {
-      buttons.push(deleteTopic);
-    }
-    const streamName = streamNameOfStreamMessage(message);
-    if (isTopicMuted(streamName, message.subject, mute)) {
-      buttons.push(unmuteTopic);
-    } else {
-      buttons.push(muteTopic);
-    }
-    const sub = subscriptions.find(x => x.name === streamName);
-    if (sub && !sub.in_home_view) {
-      buttons.push(unmuteStream);
-    } else {
-      buttons.push(muteStream);
-    }
+  if (ownUser.is_admin) {
+    buttons.push(deleteTopic);
+  }
+  if (isTopicMuted(stream, topic, mute)) {
+    buttons.push(unmuteTopic);
+  } else {
+    buttons.push(muteTopic);
+  }
+  const sub = subscriptions.find(x => x.name === stream);
+  if (sub && !sub.in_home_view) {
+    buttons.push(unmuteStream);
+  } else {
+    buttons.push(muteStream);
   }
   buttons.push(cancel);
   return buttons;
@@ -331,19 +330,6 @@ export const constructNonHeaderActionButtons = ({
   }
 };
 
-/** Returns the title for the action sheet. */
-const getActionSheetTitle = (message: Message | Outbox, ownUser: User): string => {
-  if (message.type === 'private') {
-    const recipients = pmUiRecipientsFromMessage(message, ownUser.user_id);
-    return recipients
-      .map(r => r.full_name)
-      .sort()
-      .join(', ');
-  } else {
-    return `#${streamNameOfStreamMessage(message)} > ${message.subject}`;
-  }
-};
-
 function makeButtonCallback<ButtonType: HeaderButton | MessageButton>({
   buttonList,
   auth,
@@ -439,15 +425,17 @@ export const showHeaderActionSheet = (
   }>,
   message: Message | Outbox,
 ): void => {
+  invariant(message.type === 'stream', 'showHeaderActionSheet: got PM');
   const buttonList = constructHeaderActionButtons({
     mute: params.mute,
     subscriptions: params.subscriptions,
     ownUser: params.ownUser,
-    message,
+    stream: streamNameOfStreamMessage(message),
+    topic: message.subject,
   });
   showActionSheetWithOptions(
     {
-      title: getActionSheetTitle(message, params.ownUser),
+      title: `#${streamNameOfStreamMessage(message)} > ${message.subject}`,
       options: buttonList.map(button => callbacks._(button.title)),
       cancelButtonIndex: buttonList.length - 1,
     },

src/webview/handleOutboundEvents.js

@@ -9,6 +9,7 @@ import type { BackgroundData } from './MessageList';
 import type { ShowActionSheetWithOptions } from '../message/messageActionSheet';
 import type { JSONableDict } from '../utils/jsonable';
 import { showToast } from '../utils/info';
+import { pmUiRecipientsFromMessage } from '../utils/recipient';
 import { isUrlAnImage } from '../utils/url';
 import * as logging from '../utils/logging';
 import { filterUnreadMessagesInRange } from '../utils/unread';
@@ -212,12 +213,20 @@ const handleLongPress = (
   }
   const { dispatch, showActionSheetWithOptions, backgroundData, narrow, startEditMessage } = props;
   if (target === 'header') {
-    showHeaderActionSheet(
-      showActionSheetWithOptions,
-      { dispatch, startEditMessage, _ },
-      backgroundData,
-      message,
-    );
+    if (message.type === 'stream') {
+      showHeaderActionSheet(
+        showActionSheetWithOptions,
+        { dispatch, _ },
+        backgroundData,
+        message,
+      );
+    } else if (message.type === 'private') {
+      const label = pmUiRecipientsFromMessage(message, backgroundData.ownUser.user_id)
+        .map(r => r.full_name)
+        .sort()
+        .join(', ');
+      showToast(label);
+    }
   } else if (target === 'message') {
     showMessageActionSheet(
       showActionSheetWithOptions,