diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-11-03 08:23:31 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-11-03 08:23:31 +0100 |
| commit | 33beb51da423f5f80311453ad9025aa66984eb12 (patch) | |
| tree | 1760e2b3210f919f414702c2517eed49cd12a416 | |
| parent | 9b63647aff337d8510dd7fc3ad838a365baa480f (diff) | |
| download | pleroma-33beb51da423f5f80311453ad9025aa66984eb12.tar.gz | |
MastoAPI: Add blocking to AccountView.
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index ff02587d6..cf97ab746 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -55,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do id: target.id, following: User.following?(user, target), followed_by: User.following?(target, user), - blocking: false, + blocking: User.blocks?(user, target), muting: false, requested: false, domain_blocking: false diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index aa74ed966..c62cb4f36 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -51,12 +51,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do other_user = insert(:user) {:ok, user} = User.follow(user, other_user) + {:ok, user} = User.block(user, other_user) expected = %{ id: other_user.id, following: true, followed_by: false, - blocking: false, + blocking: true, muting: false, requested: false, domain_blocking: false |