From ec25fe716ed5e20da910c246b8334ee8195a9654 Mon Sep 17 00:00:00 2001
From: Z <tdxdxoz@gmail.com>
Date: Fri, 27 Dec 2019 17:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E4=B8=8D=E5=8F=AF=E8=BD=AC?=
 =?UTF-8?q?=E5=98=9F=E9=97=AE=E6=98=BE=E7=A4=BA=E8=BD=AC=E5=98=9F=E6=95=B0?=
 =?UTF-8?q?,private=E5=98=9F=E6=96=87=E5=BC=BA=E5=88=B6=E8=AF=B7=E6=B1=82c?=
 =?UTF-8?q?ontext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/status.js            | 2 +-
 app/javascript/mastodon/components/status_action_bar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 56dfd932b..f43dbb2fc 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -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'));
     }
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 6546d2b58..c36c8d9a2 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -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}