]> cat aescling's git repositories - mastodon.git/commit
Break out nested relationship API keys (#5887)
authoraschmitz <andy.schmitz@gmail.com>
Wed, 6 Dec 2017 15:10:54 +0000 (09:10 -0600)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 6 Dec 2017 15:10:54 +0000 (16:10 +0100)
commit4de211b80abe7ea5578988040f004ea1f78d4628
tree814edc2f576206ec42782911943e0d45ff9838df
parent063a1c2a8bfaa76215537a8ce7d433cda5ce9755
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.
app/javascript/mastodon/components/account.js
app/javascript/mastodon/features/account/components/action_bar.js
app/javascript/mastodon/features/account_timeline/containers/header_container.js
app/serializers/rest/relationship_serializer.rb
spec/controllers/api/v1/accounts/relationships_controller_spec.rb
spec/controllers/api/v1/accounts_controller_spec.rb