sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 21:25:20 +01:00
Code Issues Releases Wiki Activity

Fix users lookup/return type

Browse Source 
* Allow viewing user in frontend by id on pageload
This commit is contained in:
Rachel H 2018-06-07 21:23:30 -07:00
parent 595ca3bb3a
commit fa0c2727d8
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
|> put_resp_header("content-type", "application/activity+json")
|> json(UserView.render("user.json", %{user: user}))
else
nil -> {:error, :not_found}
end
end

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

@ -12,19 +12,24 @@ defmodule Pleroma.Web.OStatus.OStatusController do
action_fallback(:errors)
def feed_redirect(conn, %{"nickname" => nickname}) do
with {_, %User{} = user} <- {:user, User.get_cached_by_nickname(nickname)} do
case get_format(conn) do
"html" -> Fallback.RedirectController.redirector(conn, nil)
"activity+json" -> ActivityPubController.call(conn, :user)
_ -> redirect(conn, external: OStatus.feed_path(user))
end
else
{:user, nil} -> {:error, :not_found}
case get_format(conn) do
"html" ->
Fallback.RedirectController.redirector(conn, nil)
"activity+json" ->
ActivityPubController.call(conn, :user)
_ ->
with %User{} = user <- User.get_cached_by_nickname(nickname) do
redirect(conn, external: OStatus.feed_path(user))
else
nil -> {:error, :not_found}
end
end
end
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 =
Map.take(params, ["max_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")
|> send_resp(200, response)
else
{:user, nil} -> {:error, :not_found}
nil -> {:error, :not_found}
end
end