|
|
|
@ -246,7 +246,11 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
renderStatus (notification, link) { |
|
|
|
|
const { intl, unread } = this.props; |
|
|
|
|
const { intl, unread, status } = this.props; |
|
|
|
|
|
|
|
|
|
if (!status) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
<HotKeys handlers={this.getHandlers()}> |
|
|
|
@ -264,6 +268,7 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<StatusContainer |
|
|
|
|
id={notification.get('status')} |
|
|
|
|
account={notification.get('account')} |
|
|
|
|
contextType='notifications' |
|
|
|
|
muted |
|
|
|
|
withDismiss |
|
|
|
|
hidden={this.props.hidden} |
|
|
|
@ -278,7 +283,11 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
renderUpdate (notification, link) { |
|
|
|
|
const { intl, unread } = this.props; |
|
|
|
|
const { intl, unread, status } = this.props; |
|
|
|
|
|
|
|
|
|
if (!status) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
<HotKeys handlers={this.getHandlers()}> |
|
|
|
@ -296,6 +305,7 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<StatusContainer |
|
|
|
|
id={notification.get('status')} |
|
|
|
|
account={notification.get('account')} |
|
|
|
|
contextType='notifications' |
|
|
|
|
muted |
|
|
|
|
withDismiss |
|
|
|
|
hidden={this.props.hidden} |
|
|
|
@ -310,10 +320,14 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
renderPoll (notification, account) { |
|
|
|
|
const { intl, unread } = this.props; |
|
|
|
|
const { intl, unread, status } = this.props; |
|
|
|
|
const ownPoll = me === account.get('id'); |
|
|
|
|
const message = ownPoll ? intl.formatMessage(messages.ownPoll) : intl.formatMessage(messages.poll); |
|
|
|
|
|
|
|
|
|
if (!status) { |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
<HotKeys handlers={this.getHandlers()}> |
|
|
|
|
<div className={classNames('notification notification-poll focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, message, notification.get('created_at'))}> |
|
|
|
@ -334,6 +348,7 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<StatusContainer |
|
|
|
|
id={notification.get('status')} |
|
|
|
|
account={account} |
|
|
|
|
contextType='notifications' |
|
|
|
|
muted |
|
|
|
|
withDismiss |
|
|
|
|
hidden={this.props.hidden} |
|
|
|
|