Browse Source

不对不可转嘟问显示转嘟数,private嘟文强制请求context

pull/4/head
欧醚 4 years ago
parent
commit
ec25fe716e
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/javascript/mastodon/components/status.js
  2. +1
    -1
      app/javascript/mastodon/components/status_action_bar.js

+ 1
- 1
app/javascript/mastodon/components/status.js View File

@ -190,7 +190,7 @@ class Status extends ImmutablePureComponent {
}
const { status } = this.props;
const r_status = status.get('reblog') || status;
if(this.props.showThread && this.state.noStartPD && (r_status.get('replies_count') || r_status.get('in_reply_to_id'))) {
if(this.props.showThread && this.state.noStartPD && (r_status.get('replies_count') || r_status.get('in_reply_to_id') || r_status.get('visibility') == 'private')) {
this.setState({noStartPD: false});
this.props.onPreview(r_status.get('id'));
}

+ 1
- 1
app/javascript/mastodon/components/status_action_bar.js View File

@ -250,7 +250,7 @@ class StatusActionBar extends ImmutablePureComponent {
return (
<div className='status__action-bar'>
<div className='status__action-bar__counter'><IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'comments-o' : replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
<div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={!publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('reblogs_count'))}</span></div>
<div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={!publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /><span className='status__action-bar__counter__label' >{publicStatus? obfuscatedCount(status.get('reblogs_count')) : ''}</span></div>
<div className='status__action-bar__counter'><IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='thumbs-up' onClick={this.handleFavouriteClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('favourites_count'))}</span></div>
{shareButton}

Loading…
Cancel
Save