From fa0c2727d86f63136b88d65e3bb876dd17f316aa Mon Sep 17 00:00:00 2001 From: Rachel H Date: Thu, 7 Jun 2018 21:23:30 -0700 Subject: [PATCH] Fix users lookup/return type * Allow viewing user in frontend by id on pageload --- .../activity_pub/activity_pub_controller.ex | 2 ++ lib/pleroma/web/ostatus/ostatus_controller.ex | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index ee5d319a7..d337532d0 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -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 diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index f346cc9af..2f72fdb16 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -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