From 33beb51da423f5f80311453ad9025aa66984eb12 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 3 Nov 2017 08:23:31 +0100
Subject: [PATCH] MastoAPI: Add blocking to AccountView.

---
 lib/pleroma/web/mastodon_api/views/account_view.ex | 2 +-
 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