Add emoji icon support on notification (expects custom)

This commit is contained in:
KMY 2023-02-27 14:16:29 +09:00
parent b242a89e63
commit 1df6e80ee0
5 changed files with 17 additions and 4 deletions

View file

@ -52,7 +52,6 @@ class EmojiReactions extends ImmutablePureComponent {
render () {
const { intl, accountIds, multiColumn } = this.props;
console.dir(accountIds);
if (!accountIds) {
return (

View file

@ -12,6 +12,7 @@ import FollowRequestContainer from '../containers/follow_request_container';
import Icon from 'mastodon/components/icon';
import { Link } from 'react-router-dom';
import classNames from 'classnames';
import EmojiView from '../../../components/emoji_view';
const messages = defineMessages({
favourite: { id: 'notification.favourite', defaultMessage: '{name} favourited your status' },
@ -215,14 +216,16 @@ class Notification extends ImmutablePureComponent {
}
renderEmojiReaction (notification, link) {
console.dir(notification)
const { intl, unread } = this.props;
const emoji_reaction = notification.get('emoji_reaction');
return (
<HotKeys handlers={this.getHandlers()}>
<div className={classNames('notification notification-emoji_reaction focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.emojiReaction, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
<div className='notification__message'>
<div className='notification__emoji_reaction-icon-wrapper'>
<Icon id='star' className='star-icon' fixedWidth />
<EmojiView name={emoji_reaction.get('name')} url={emoji_reaction.get('url')} staticUrl={emoji_reaction.get('static_url')} className='star-icon' fixedWidth />
</div>
<span title={notification.get('created_at')}>

View file

@ -50,6 +50,7 @@ const notificationToMap = notification => ImmutableMap({
id: notification.id,
type: notification.type,
account: notification.account.id,
emoji_reaction: ImmutableMap(notification.emoji_reaction),
created_at: notification.created_at,
status: notification.status ? notification.status.id : null,
report: notification.report ? fromJS(notification.report) : null,