hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/remote-user-atom' into 'develop'

Browse source 
feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811
This commit is contained in:
lain 2020-07-29 12:16:20 +00:00
commit de5c7e20a3
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/feed/user_controller.ex
View file

@ -47,7 +47,7 @@ defmodule Pleroma.Web.Feed.UserController do
"atom"
end
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
with {_, %User{local: true} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
type: ["Create"],
@ -71,6 +71,7 @@ defmodule Pleroma.Web.Feed.UserController do
render_error(conn, :not_found, "Not found")
end
def errors(conn, {:fetch_user, %User{local: false}}), do: errors(conn, {:error, :not_found})
def errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found})
def errors(conn, _) do