projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'add-blocked-by-to-relationship' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
subscription_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/subscription_controller.ex
b/lib/pleroma/web/mastodon_api/subscription_controller.ex
index b6c8ff808ba5888532bd9f9e24cd0d305c63edeb..255ee2f18bd9d941748ed3e43b16718a5ceffb23 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/subscription_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/subscription_controller.ex
@@
-59,13
+59,13
@@
defmodule Pleroma.Web.MastodonAPI.SubscriptionController do
#
def errors(conn, {:error, :not_found}) do
conn
#
def errors(conn, {:error, :not_found}) do
conn
- |> put_status(
404
)
- |> json(
"Not found"
)
+ |> put_status(
:not_found
)
+ |> json(
dgettext("errors", "Not found")
)
end
def errors(conn, _) do
conn
end
def errors(conn, _) do
conn
- |> put_status(
500
)
- |> json(
"Something went wrong"
)
+ |> put_status(
:internal_server_error
)
+ |> json(
dgettext("errors", "Something went wrong")
)
end
end
end
end