From 859f340716ec27a15c88d6e9d6708c3455dae024 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 27 Aug 2020 14:33:03 -0500
Subject: [PATCH] Chats: rudimentary display of chat message notifications

---
 .../features/notifications/components/notification.js | 11 +++++++++--
 app/soapbox/reducers/notifications.js                 |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/notifications/components/notification.js b/app/soapbox/features/notifications/components/notification.js
index 3703f13f0..73fa00629 100644
--- a/app/soapbox/features/notifications/components/notification.js
+++ b/app/soapbox/features/notifications/components/notification.js
@@ -150,7 +150,7 @@ class Notification extends ImmutablePureComponent {
         <div className='notification notification-chat-mention focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.chat_mention', defaultMessage: '{name} sent you a message' }, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
-              <Icon id='chat' fixedWidth />
+              <Icon id='comment' fixedWidth />
             </div>
 
             <span title={notification.get('created_at')}>
@@ -158,6 +158,13 @@ class Notification extends ImmutablePureComponent {
             </span>
           </div>
         </div>
+
+        <div className='chat-message'>
+          <span
+            className='chat-message__bubble'
+            dangerouslySetInnerHTML={{ __html: emojify(notification.getIn(['chat_message', 'content'])) }}
+          />
+        </div>
       </HotKeys>
     );
   }
@@ -310,7 +317,7 @@ class Notification extends ImmutablePureComponent {
     case 'pleroma:emoji_reaction':
       return this.renderEmojiReact(notification, link);
     case 'pleroma:chat_mention':
-      return this.renderChatMention(notification);
+      return this.renderChatMention(notification, link);
     }
 
     return null;
diff --git a/app/soapbox/reducers/notifications.js b/app/soapbox/reducers/notifications.js
index cbf9ef5d5..e49d5dc11 100644
--- a/app/soapbox/reducers/notifications.js
+++ b/app/soapbox/reducers/notifications.js
@@ -43,6 +43,7 @@ const notificationToMap = notification => ImmutableMap({
   created_at: notification.created_at,
   status: notification.status ? notification.status.id : null,
   emoji: notification.emoji,
+  chat_message: notification.chat_message,
   is_seen: get(notification, ['pleroma', 'is_seen'], true),
 });