aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-04 21:12:37 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-04 21:12:37 -0500
commit3be08e7c2ec8b77e02e3d0572227221d68163df0 (patch)
tree0f1d9ab79c29060edd3f95c4795e634a10d1a5a3 /lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
parent1c3fe43d231428fee392afd726363193fdcb8008 (diff)
parent94687e23938b808a3fff95c92956ec337160cd0b (diff)
downloadpleroma-3be08e7c2ec8b77e02e3d0572227221d68163df0.tar.gz
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
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)