From: eal <eal@waifu.club>
Date: Wed, 25 Oct 2017 18:25:37 +0000 (+0300)
Subject: Return error message on errors
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=11d2287476fe9518cd0a3721a0fe7a0a1fd937fd;p=akkoma

Return error message on errors
---

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index ea85e5bce..5032c735d 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -275,7 +275,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
          {:ok, activity} <- ActivityPub.follow(follower, followed) do
       render conn, AccountView, "relationship.json", %{user: follower, target: followed}
     else
-      err -> err
+      {:error, message} = err ->
+        conn
+        |> put_resp_content_type("application/json")
+        |> send_resp(403, Poison.encode!(%{"error" => message}))
     end
   end