aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-22 10:31:04 -0600
committerAlex Gleason <alex@alexgleason.me>2021-12-22 10:31:04 -0600
commit07c30c9e6ef5eae5e2c5d0e919750884409a5fc8 (patch)
tree1d617aa06947e565f72b31517f28a6fd3d88adae /lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
parent682f0aa2597bec4ef80691daddae1d87ddeeae0a (diff)
parent9c1cb87eff1fdd20f47355971831545a79c7cd3a (diff)
downloadpleroma-07c30c9e6ef5eae5e2c5d0e919750884409a5fc8.tar.gz
Merge remote-tracking branch 'origin/develop' into 2061-chat-deletion
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
index 8af557b61..84621500e 100644
--- a/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FallbackController do
@@ -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)