diff options
author | aschmitz <andy.schmitz@gmail.com> | 2017-12-06 09:10:54 -0600 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-06 16:10:54 +0100 |
commit | 4de211b80abe7ea5578988040f004ea1f78d4628 (patch) | |
tree | 814edc2f576206ec42782911943e0d45ff9838df /app/javascript/mastodon/features/account_timeline/containers/header_container.js | |
parent | 063a1c2a8bfaa76215537a8ce7d433cda5ce9755 (diff) |
Break out nested relationship API keys (#5887)
* Break out nested relationship API keys This closes #5856 by restoring the existing behavior of the `muting` and `following` keys (returning booleans rather than truthy or false). It adds `showing_reblogs` and `muting_notifications` keys: * `showing_reblogs` returns true if: 1. You've requested to follow the user, with reblogs shown, or 2. You are following the user, with reblogs shown. * `muting_notifications` returns true if you have muted the user and their notifications as well. * Rubocop fix * Fix pulling reblog/mute status from relationships I could swear this had passed tests before, but apparently not. Works now. * More test fixes Really, you'd expect this to be more straightforward.
Diffstat (limited to 'app/javascript/mastodon/features/account_timeline/containers/header_container.js')
-rw-r--r-- | app/javascript/mastodon/features/account_timeline/containers/header_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js index b41eb19d4..775610032 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js @@ -68,7 +68,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, onReblogToggle (account) { - if (account.getIn(['relationship', 'following', 'reblogs'])) { + if (account.getIn(['relationship', 'show_reblogs'])) { dispatch(followAccount(account.get('id'), false)); } else { dispatch(followAccount(account.get('id'), true)); |