Support redirecting by activity UUID in static FE as well.

This commit is contained in:
Phil Hagelberg 2019-11-12 17:33:54 -08:00
parent 0867cb083e
commit 3c60adbc1f
2 changed files with 44 additions and 11 deletions

View File

@ -27,6 +27,12 @@ defp get_title(%Object{data: %{"summary" => summary}}) when is_binary(summary),
defp get_title(_), do: nil defp get_title(_), do: nil
defp not_found(conn, message) do
conn
|> put_status(404)
|> render("error.html", %{message: message, meta: ""})
end
def get_counts(%Activity{} = activity) do def get_counts(%Activity{} = activity) do
%Object{data: data} = Object.normalize(activity) %Object{data: data} = Object.normalize(activity)
@ -83,9 +89,7 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
|> redirect(external: data["url"] || data["external_url"] || data["id"]) |> redirect(external: data["url"] || data["external_url"] || data["id"])
_ -> _ ->
conn not_found(conn, "Post not found.")
|> put_status(404)
|> render("error.html", %{message: "Post not found.", meta: ""})
end end
end end
@ -113,21 +117,33 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
}) })
_ -> _ ->
conn not_found(conn, "User not found.")
|> put_status(404)
|> render("error.html", %{message: "User not found.", meta: ""})
end end
end end
def show(%{assigns: %{object_id: _}} = conn, _params) do def show(%{assigns: %{object_id: _}} = conn, _params) do
url = Helpers.url(conn) <> conn.request_path url = Helpers.url(conn) <> conn.request_path
case Activity.get_create_by_object_ap_id_with_object(url) do case Activity.get_create_by_object_ap_id_with_object(url) do
%Activity{} = activity -> %Activity{} = activity ->
redirect(conn, to: "/notice/#{activity.id}") to = Helpers.o_status_path(Pleroma.Web.Endpoint, :notice, activity)
_ -> redirect(conn, to: to)
conn
|> put_status(404) _ ->
|> render("error.html", %{message: "Post not found.", meta: ""}) not_found(conn, "Post not found.")
end
end
def show(%{assigns: %{activity_id: _}} = conn, _params) do
url = Helpers.url(conn) <> conn.request_path
case Activity.get_by_ap_id(url) do
%Activity{} = activity ->
to = Helpers.o_status_path(Pleroma.Web.Endpoint, :notice, activity)
redirect(conn, to: to)
_ ->
not_found(conn, "Post not found.")
end end
end end
@ -140,5 +156,8 @@ def assign_id(%{path_info: ["users", user_id]} = conn, _opts),
def assign_id(%{path_info: ["objects", object_id]} = conn, _opts), def assign_id(%{path_info: ["objects", object_id]} = conn, _opts),
do: assign(conn, :object_id, object_id) do: assign(conn, :object_id, object_id)
def assign_id(%{path_info: ["activities", activity_id]} = conn, _opts),
do: assign(conn, :activity_id, activity_id)
def assign_id(conn, _opts), do: conn def assign_id(conn, _opts), do: conn
end end

View File

@ -143,6 +143,20 @@ test "redirect by AP object ID", %{conn: conn} do
assert html_response(conn, 302) =~ "redirected" assert html_response(conn, 302) =~ "redirected"
end end
test "redirect by activity ID", %{conn: conn} do
user = insert(:user)
{:ok, %Activity{data: %{"id" => id}}} =
CommonAPI.post(user, %{"status" => "I'm a doctor, not a devops!"})
conn =
conn
|> put_req_header("accept", "text/html")
|> get(URI.parse(id).path)
assert html_response(conn, 302) =~ "redirected"
end
test "404 when notice not found", %{conn: conn} do test "404 when notice not found", %{conn: conn} do
conn = conn =
conn conn