moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chats: rudimentary display of chat message notifications

This commit is contained in:
Alex Gleason 2020-08-27 14:33:03 -05:00
parent 14eec701cb
commit 859f340716
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/soapbox/features/notifications/components/notification.js
View File

@ -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 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__message'>
<div className='notification__favourite-icon-wrapper'> <div className='notification__favourite-icon-wrapper'>
<Icon id='chat' fixedWidth /> <Icon id='comment' fixedWidth />
</div> </div>
<span title={notification.get('created_at')}> <span title={notification.get('created_at')}>
@ -158,6 +158,13 @@ class Notification extends ImmutablePureComponent {
</span> </span>
</div> </div>
</div> </div>
<div className='chat-message'>
<span
className='chat-message__bubble'
dangerouslySetInnerHTML={{ __html: emojify(notification.getIn(['chat_message', 'content'])) }}
/>
</div>
</HotKeys> </HotKeys>
); );
} }
@ -310,7 +317,7 @@ class Notification extends ImmutablePureComponent {
case 'pleroma:emoji_reaction': case 'pleroma:emoji_reaction':
return this.renderEmojiReact(notification, link); return this.renderEmojiReact(notification, link);
case 'pleroma:chat_mention': case 'pleroma:chat_mention':
return this.renderChatMention(notification); return this.renderChatMention(notification, link);
} }
return null; return null;

1
app/soapbox/reducers/notifications.js
View File

@ -43,6 +43,7 @@ const notificationToMap = notification => ImmutableMap({
created_at: notification.created_at, created_at: notification.created_at,
status: notification.status ? notification.status.id : null, status: notification.status ? notification.status.id : null,
emoji: notification.emoji, emoji: notification.emoji,
chat_message: notification.chat_message,
is_seen: get(notification, ['pleroma', 'is_seen'], true), is_seen: get(notification, ['pleroma', 'is_seen'], true),
}); });