Handle messaging self (zulip#250)

Fixes zulip#231

src/chat/__tests__/chatReducers-test.js

@@ -80,6 +80,36 @@ describe('chatReducers', () => {
     });
   });
 
+  test('Message sent to self is stored correctly', () => {
+    const narrowWithSelfStr = JSON.stringify(privateNarrow('[email protected]'));
+    const initialState = {
+      messages: {
+        [homeNarrowStr]: [],
+        [narrowWithSelfStr]: [],
+      }
+    };
+    const message = {
+      id: 1,
+      display_recipient: [{ email: '[email protected]' }]
+    };
+    const action = {
+      type: EVENT_NEW_MESSAGE,
+      selfEmail: '[email protected]',
+      message,
+    };
+    const expectedState = {
+      messages: {
+        [homeNarrowStr]: [message],
+        [narrowWithSelfStr]: [message],
+      }
+    };
+
+    const newState = chatReducers(initialState, action);
+
+    expect(newState).toEqual(expectedState);
+    expect(newState).not.toBe(initialState);
+  });
+
   test('appends stream message to all cached narrows that match', () => {
     const initialState = {
       messages: {

src/message/headers/MessageHeader.js

@@ -48,7 +48,9 @@ export default class MessageHeader extends React.PureComponent {
 
     if (item.type === 'private' &&
       !isPrivateNarrow(narrow) && !isGroupNarrow(narrow) && !isTopicNarrow(narrow)) {
-      const recipients = item.display_recipient.filter(r => r.email !== auth.email);
+      const recipients = item.display_recipient.length > 1 ?
+        item.display_recipient.filter(r => r.email !== auth.email) :
+        item.display_recipient;
       return (
         <PrivateMessageHeader
           key={`section_${item.id}`}

src/utils/__tests__/narrow-test.js

@@ -147,6 +147,18 @@ describe('isMessageInNarrow', () => {
     expect(isMessageInNarrow(message, narrow, '[email protected]')).toBe(true);
   });
 
+  test('message to self is in "private" narrow with self', () => {
+    const message = {
+      type: 'private',
+      display_recipient: [
+        { email: '[email protected]' },
+      ],
+    };
+    const narrow = privateNarrow('[email protected]');
+
+    expect(isMessageInNarrow(message, narrow, '[email protected]')).toBe(true);
+  });
+
   test('message with type "private" is in group narrow if all recipients match ', () => {
     const message = {
       type: 'private',

src/utils/narrow.js

@@ -86,11 +86,12 @@ export const isMessageInNarrow = (message: Message, narrow: Narrow, selfEmail: s
     return true;
   }
 
-  if ((isPrivateNarrow(narrow) || isGroupNarrow(narrow)) &&
-    normalizeRecipients(message.display_recipient) ===
-    [...narrow[0].operand.split(','), selfEmail].sort().join(',')
-  ) {
-    return true;
+
+  if (isPrivateNarrow(narrow) || isGroupNarrow(narrow)) {
+    const normalizedRecipients = normalizeRecipients(message.display_recipient);
+    const normalizedNarrow = [...narrow[0].operand.split(','), selfEmail].sort().join(',');
+
+    return normalizedRecipients === selfEmail || normalizedRecipients === normalizedNarrow;
   }
 
   if (isSpecialNarrow(narrow) &&