|
|
@ -192,9 +192,11 @@ export default class DetailedStatus extends ImmutablePureComponent { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (status.get('application')) { |
|
|
|
if (status.get('application')) { |
|
|
|
applicationLink = <span> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></span>; |
|
|
|
applicationLink = <React.Fragment> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></React.Fragment>; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const visibilityLink = <React.Fragment> · <VisibilityIcon visibility={status.get('visibility')} /></React.Fragment>; |
|
|
|
|
|
|
|
|
|
|
|
if (status.get('visibility') === 'direct') { |
|
|
|
if (status.get('visibility') === 'direct') { |
|
|
|
reblogIcon = 'envelope'; |
|
|
|
reblogIcon = 'envelope'; |
|
|
|
} else if (status.get('visibility') === 'private') { |
|
|
|
} else if (status.get('visibility') === 'private') { |
|
|
@ -205,21 +207,27 @@ export default class DetailedStatus extends ImmutablePureComponent { |
|
|
|
reblogLink = null; |
|
|
|
reblogLink = null; |
|
|
|
} else if (this.context.router) { |
|
|
|
} else if (this.context.router) { |
|
|
|
reblogLink = ( |
|
|
|
reblogLink = ( |
|
|
|
|
|
|
|
<React.Fragment> |
|
|
|
|
|
|
|
<React.Fragment> · </React.Fragment> |
|
|
|
<Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'> |
|
|
|
<Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'> |
|
|
|
<Icon id={reblogIcon} /> |
|
|
|
<Icon id={reblogIcon} /> |
|
|
|
<span className='detailed-status__reblogs'> |
|
|
|
<span className='detailed-status__reblogs'> |
|
|
|
<AnimatedNumber value={status.get('reblogs_count')} /> |
|
|
|
<AnimatedNumber value={status.get('reblogs_count')} /> |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
</Link> |
|
|
|
</Link> |
|
|
|
|
|
|
|
</React.Fragment> |
|
|
|
); |
|
|
|
); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
reblogLink = ( |
|
|
|
reblogLink = ( |
|
|
|
|
|
|
|
<React.Fragment> |
|
|
|
|
|
|
|
<React.Fragment> · </React.Fragment> |
|
|
|
<a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}> |
|
|
|
<a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}> |
|
|
|
<Icon id={reblogIcon} /> |
|
|
|
<Icon id={reblogIcon} /> |
|
|
|
<span className='detailed-status__reblogs'> |
|
|
|
<span className='detailed-status__reblogs'> |
|
|
|
<AnimatedNumber value={status.get('reblogs_count')} /> |
|
|
|
<AnimatedNumber value={status.get('reblogs_count')} /> |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
</a> |
|
|
|
</a> |
|
|
|
|
|
|
|
</React.Fragment> |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -245,7 +253,7 @@ export default class DetailedStatus extends ImmutablePureComponent { |
|
|
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
return ( |
|
|
|
<div style={outerStyle}> |
|
|
|
<div style={outerStyle}> |
|
|
|
<div ref={this.setRef} className={classNames('detailed-status', { compact })} data-status-by={status.getIn(['account', 'acct'])}> |
|
|
|
<div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })} data-status-by={status.getIn(['account', 'acct'])}> |
|
|
|
<a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'> |
|
|
|
<a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name'> |
|
|
|
<div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div> |
|
|
|
<div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div> |
|
|
|
<DisplayName account={status.get('account')} localDomain={this.props.domain} /> |
|
|
|
<DisplayName account={status.get('account')} localDomain={this.props.domain} /> |
|
|
@ -268,7 +276,7 @@ export default class DetailedStatus extends ImmutablePureComponent { |
|
|
|
<div className='detailed-status__meta'> |
|
|
|
<div className='detailed-status__meta'> |
|
|
|
<a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'> |
|
|
|
<a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'> |
|
|
|
<FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /> |
|
|
|
<FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /> |
|
|
|
</a>{applicationLink} {!!reblogLink && ['·', reblogLink]} · {favouriteLink} · <VisibilityIcon visibility={status.get('visibility')} /> |
|
|
|
</a>{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|