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.
Showing
- app/javascript/mastodon/components/account.js 2 additions, 2 deletionsapp/javascript/mastodon/components/account.js
- app/javascript/mastodon/features/account/components/action_bar.js 2 additions, 3 deletions...script/mastodon/features/account/components/action_bar.js
- app/javascript/mastodon/features/account_timeline/containers/header_container.js 1 addition, 1 deletion.../features/account_timeline/containers/header_container.js
- app/serializers/rest/relationship_serializer.rb 15 additions, 5 deletionsapp/serializers/rest/relationship_serializer.rb
- spec/controllers/api/v1/accounts/relationships_controller_spec.rb 4 additions, 2 deletions...trollers/api/v1/accounts/relationships_controller_spec.rb
- spec/controllers/api/v1/accounts_controller_spec.rb 4 additions, 4 deletionsspec/controllers/api/v1/accounts_controller_spec.rb
Loading
Please register or sign in to comment