]> cat aescling's git repositories - mastodon.git/commitdiff
Fix the conditions for incomplete remote content (#14195)
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Wed, 1 Jul 2020 21:38:44 +0000 (06:38 +0900)
committerGitHub <noreply@github.com>
Wed, 1 Jul 2020 21:38:44 +0000 (23:38 +0200)
app/javascript/mastodon/features/account_timeline/index.js
app/javascript/mastodon/features/followers/index.js
app/javascript/mastodon/features/following/index.js

index 6740e8adb34d974bdf03179887095fbe394a151e..5ea907a1f11fd6c4799c333d4cdc5c594e5695f6 100644 (file)
@@ -22,7 +22,7 @@ const mapStateToProps = (state, { params: { accountId }, withReplies = false })
   const path = withReplies ? `${accountId}:with_replies` : accountId;
 
   return {
-    remote: !!state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username']),
+    remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
     remoteUrl: state.getIn(['accounts', accountId, 'url']),
     isAccount: !!state.getIn(['accounts', accountId]),
     statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
index 4391611188baabb1b56b495d9fc7a3ad8b0522fe..ae00d13d3b2967012ccd83530ace854e636272ee 100644 (file)
@@ -20,7 +20,7 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
 
 const mapStateToProps = (state, props) => ({
-  remote: !!state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username']),
+  remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
   remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
   isAccount: !!state.getIn(['accounts', props.params.accountId]),
   accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
index 2d2ed7be4f79ebcb1cc178a409a2f69ca68d3397..666ec7a7f661ee85d6bfb882de8027974e07666e 100644 (file)
@@ -20,7 +20,7 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
 
 const mapStateToProps = (state, props) => ({
-  remote: !!state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username']),
+  remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
   remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
   isAccount: !!state.getIn(['accounts', props.params.accountId]),
   accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),