ActionSheets: Remove message arg from constructHeaderActionButtons

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.

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.

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';
@@ -58,21 +59,19 @@ 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({
       backgroundData: { ...baseBackgroundData, mute },
-      message,
+      stream: 'electron issues',
+      topic: 'issue #556',
     });
     expect(buttonTitles(buttons)).toContain('Unmute topic');
   });
 
   test('show mute topic option if topic is not muted', () => {
     const buttons = constructHeaderActionButtons({
       backgroundData: { ...baseBackgroundData, mute: [] },
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Mute topic');
   });
@@ -81,7 +80,8 @@ describe('constructHeaderActionButtons', () => {
     const subscriptions = [{ ...eg.subscription, in_home_view: false }];
     const buttons = constructHeaderActionButtons({
       backgroundData: { ...baseBackgroundData, subscriptions },
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Unmute stream');
   });
@@ -90,7 +90,8 @@ describe('constructHeaderActionButtons', () => {
     const subscriptions = [{ ...eg.subscription, in_home_view: true }];
     const buttons = constructHeaderActionButtons({
       backgroundData: { ...baseBackgroundData, subscriptions },
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Mute stream');
   });
@@ -99,15 +100,17 @@ describe('constructHeaderActionButtons', () => {
     const ownUser = { ...eg.selfUser, is_admin: true };
     const buttons = constructHeaderActionButtons({
       backgroundData: { ...baseBackgroundData, ownUser },
-      message: eg.streamMessage(),
+      stream: streamNameOfStreamMessage(eg.streamMessage()),
+      topic: eg.streamMessage().subject,
     });
     expect(buttonTitles(buttons)).toContain('Delete topic');
   });
 
   test('do not show delete topic option if current user is not an admin', () => {
     const buttons = constructHeaderActionButtons({
       backgroundData: baseBackgroundData,
-      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';
 
@@ -220,33 +220,32 @@ cancel.errorMessage = 'Failed to hide menu';
 
 export const constructHeaderActionButtons = ({
   backgroundData: { mute, subscriptions, ownUser },
-  message,
+  stream,
+  topic,
 }: {|
   backgroundData: $ReadOnly<{
     mute: MuteState,
     subscriptions: Subscription[],
     ownUser: User,
     ...
   }>,
-  message: Message | Outbox,
+  stream: string,
+  topic: string,
 |}): Button<HeaderArgs>[] => {
   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;
@@ -329,19 +328,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}`;
-  }
-};
-
 export const showMessageActionSheet = ({
   showActionSheetWithOptions,
   callbacks,
@@ -410,7 +396,12 @@ export const showHeaderActionSheet = ({
   }>,
   message: Message | Outbox,
 |}): void => {
-  const buttonList = constructHeaderActionButtons({ backgroundData, message });
+  invariant(message.type === 'stream', 'showHeaderActionSheet: got PM');
+  const buttonList = constructHeaderActionButtons({
+    backgroundData,
+    stream: streamNameOfStreamMessage(message),
+    topic: message.subject,
+  });
   const callback = buttonIndex => {
     (async () => {
       const pressedButton: Button<HeaderArgs> = buttonList[buttonIndex];
@@ -427,7 +418,7 @@ export const showHeaderActionSheet = ({
   };
   showActionSheetWithOptions(
     {
-      title: getActionSheetTitle(message, backgroundData.ownUser),
+      title: `#${streamNameOfStreamMessage(message)} > ${message.subject}`,
       options: buttonList.map(button => callbacks._(button.title)),
       cancelButtonIndex: buttonList.length - 1,
     },