]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix the conditions for incomplete remote content
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Wed, 1 Jul 2020 21:38:44 +0000 (06:38 +0900)
committerThibaut Girka <thib@sitedethib.com>
Thu, 2 Jul 2020 11:58:50 +0000 (13:58 +0200)
Port 7548a474a5f07f152e6fc0dac55bef78ac5ab1dd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/account_timeline/index.js
app/javascript/flavours/glitch/features/followers/index.js
app/javascript/flavours/glitch/features/following/index.js

index a8e8aa7a8841a7d951b0bd0dfc38781780dbf29d..5558ba2a3086dcfaa7a523b7634c4d6b103b9793 100644 (file)
@@ -21,7 +21,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'], ImmutableList()),
index 8ae46be942f8d53067856e13c727fec164d9ea0e..25f7f05b48196f751bf0348c6bd0f43441f44a93 100644 (file)
@@ -20,7 +20,7 @@ import ScrollableList from 'flavours/glitch/components/scrollable_list';
 import TimelineHint from 'flavours/glitch/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 e06eaa8a6807c5b754ce7cb8b0b614c3cb09a8ea..968829fd5b12d95ca9b4b858a83c0098092d4e89 100644 (file)
@@ -20,7 +20,7 @@ import ScrollableList from 'flavours/glitch/components/scrollable_list';
 import TimelineHint from 'flavours/glitch/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']),