aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2021-04-16 09:53:47 +0000
committerrinpatch <rin@patch.cx>2021-04-16 09:53:47 +0000
commit79376b4afb8bba0766cb3d04179aeaf4c0b7000b (patch)
treef154defcd60036f76fbaf92154f0649c2e4892f3 /lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
parent0ababdc068f0fd7655b5f8440a5a8c9759a32fea (diff)
parent1885268c9c242aca2a51bd15ed839bd65d6a52dc (diff)
downloadpleroma-79376b4afb8bba0766cb3d04179aeaf4c0b7000b.tar.gz
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
index d25f84837..84621500e 100644
--- a/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
@@ -30,6 +30,12 @@ defmodule Pleroma.Web.MastodonAPI.FallbackController do
|> json(%{error: error_message})
end
+ def call(conn, {:error, status, message}) do
+ conn
+ |> put_status(status)
+ |> json(%{error: message})
+ end
+
def call(conn, _) do
conn
|> put_status(:internal_server_error)