squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'users' into 'develop'

Browse Source 
Fix users lookup/return type

See merge request pleroma/pleroma!201
This commit is contained in:
lambda 2018-06-08 11:10:10 +00:00
commit 45a935f0bd
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View File

@ -15,6 +15,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
conn conn
|> put_resp_header("content-type", "application/activity+json") |> put_resp_header("content-type", "application/activity+json")
|> json(UserView.render("user.json", %{user: user})) |> json(UserView.render("user.json", %{user: user}))
else
nil -> {:error, :not_found}
end end
end end

21
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -12,19 +12,24 @@ defmodule Pleroma.Web.OStatus.OStatusController do
action_fallback(:errors) action_fallback(:errors)
def feed_redirect(conn, %{"nickname" => nickname}) do def feed_redirect(conn, %{"nickname" => nickname}) do
with {_, %User{} = user} <- {:user, User.get_cached_by_nickname(nickname)} do
case get_format(conn) do case get_format(conn) do
"html" -> Fallback.RedirectController.redirector(conn, nil) "html" ->
"activity+json" -> ActivityPubController.call(conn, :user) Fallback.RedirectController.redirector(conn, nil)
_ -> redirect(conn, external: OStatus.feed_path(user))
end "activity+json" ->
ActivityPubController.call(conn, :user)
_ ->
with %User{} = user <- User.get_cached_by_nickname(nickname) do
redirect(conn, external: OStatus.feed_path(user))
else else
{:user, nil} -> {:error, :not_found} nil -> {:error, :not_found}
end
end end
end end
def feed(conn, %{"nickname" => nickname} = params) do def feed(conn, %{"nickname" => nickname} = params) do
with {_, %User{} = user} <- {:user, User.get_cached_by_nickname(nickname)} do with %User{} = user <- User.get_cached_by_nickname(nickname) do
query_params = query_params =
Map.take(params, ["max_id"]) Map.take(params, ["max_id"])
|> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id}) |> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id})
@ -43,7 +48,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
|> put_resp_content_type("application/atom+xml") |> put_resp_content_type("application/atom+xml")
|> send_resp(200, response) |> send_resp(200, response)
else else
{:user, nil} -> {:error, :not_found} nil -> {:error, :not_found}
end end
end end