aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
committerAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
commit44ede0657f2da0a761de76b1f9822a293430d497 (patch)
tree387a8915bdb6ff1295f4f0872b2e6bc97e177831 /lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
parent1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff)
parentd8a986c9e893de8eed3aa336a557695669b1ffee (diff)
downloadpleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz
Merge remote-tracking branch 'pleroma/develop' into staff-plug
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)