diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 17:16:58 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 17:16:58 +0200 |
commit | 2c9e672ee2437677d6e39383e5f8e8e0837024b9 (patch) | |
tree | e6f3f4b2844e4717070a6e41ee9ca71c57ff5517 /app/controllers | |
parent | 9d59d7b463e7f31ceedf27775a7ee3e8e071b4a1 (diff) |
Integrating block relationships into the API (read-only for now)
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index 6d3857675..850d00d2e 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -40,7 +40,7 @@ class Api::V1::AccountsController < ApiController @accounts = Account.find(ids) @following = Account.following_map(ids, current_user.account_id) @followed_by = Account.followed_by_map(ids, current_user.account_id) - @blocking = {} + @blocking = Account.blocking_map(ids, current_user.account_id) end private @@ -52,6 +52,6 @@ class Api::V1::AccountsController < ApiController def set_relationship @following = Account.following_map([@account.id], current_user.account_id) @followed_by = Account.followed_by_map([@account.id], current_user.account_id) - @blocking = {} + @blocking = Account.blocking_map([@account.id], current_user.account_id) end end |