projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/digest-email
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index aff76e2eabf65d908786e36670848ce7d9113a81..e8b43e475dbde05edc9b5088713416f2f4129088 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-440,7
+440,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
end
def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
- with %User{} = user <- User.get_cached_by_id(params["id"]) do
+ with %User{} = user <- User.get_cached_by_
nickname_or_
id(params["id"]) do
params =
params
|> Map.put("tag", params["tagged"])
params =
params
|> Map.put("tag", params["tagged"])
@@
-1826,10
+1826,10
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|> json("")
else
{:error, "unknown user"} ->
|> json("")
else
{:error, "unknown user"} ->
-
put_status(conn, :not_found
)
+
send_resp(conn, :not_found, ""
)
{:error, _} ->
{:error, _} ->
-
put_status(conn, :bad_request
)
+
send_resp(conn, :bad_request, ""
)
end
end
end
end