From 0867cb083eb469ae10cd48d424a51efb2fae4018 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Tue, 12 Nov 2019 17:19:46 -0800
Subject: [PATCH 1/2] Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.
Fixes #1412.
---
lib/pleroma/web/static_fe/static_fe_controller.ex | 15 +++++++++++++++
test/web/static_fe/static_fe_controller_test.exs | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index ba44b8a4f..b45d82c2d 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -119,11 +119,26 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
end
end
+ def show(%{assigns: %{object_id: _}} = conn, _params) do
+ url = Helpers.url(conn) <> conn.request_path
+ case Activity.get_create_by_object_ap_id_with_object(url) do
+ %Activity{} = activity ->
+ redirect(conn, to: "/notice/#{activity.id}")
+ _ ->
+ conn
+ |> put_status(404)
+ |> render("error.html", %{message: "Post not found.", meta: ""})
+ end
+ end
+
def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
do: assign(conn, :notice_id, notice_id)
def assign_id(%{path_info: ["users", user_id]} = conn, _opts),
do: assign(conn, :username_or_id, user_id)
+ def assign_id(%{path_info: ["objects", object_id]} = conn, _opts),
+ do: assign(conn, :object_id, object_id)
+
def assign_id(conn, _opts), do: conn
end
diff --git a/test/web/static_fe/static_fe_controller_test.exs b/test/web/static_fe/static_fe_controller_test.exs
index b8fb67b22..6ea8cea34 100644
--- a/test/web/static_fe/static_fe_controller_test.exs
+++ b/test/web/static_fe/static_fe_controller_test.exs
@@ -1,5 +1,6 @@
defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
use Pleroma.Web.ConnCase
+ alias Pleroma.Activity
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.CommonAPI
@@ -128,6 +129,20 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
assert html =~ "voyages"
end
+ test "redirect by AP object ID", %{conn: conn} do
+ user = insert(:user)
+
+ {:ok, %Activity{data: %{"object" => object_url}}} =
+ CommonAPI.post(user, %{"status" => "beam me up"})
+
+ conn =
+ conn
+ |> put_req_header("accept", "text/html")
+ |> get(URI.parse(object_url).path)
+
+ assert html_response(conn, 302) =~ "redirected"
+ end
+
test "404 when notice not found", %{conn: conn} do
conn =
conn
From 3c60adbc1f773c732458d68b4becaf9bb36d7062 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Tue, 12 Nov 2019 17:33:54 -0800
Subject: [PATCH 2/2] Support redirecting by activity UUID in static FE as
well.
---
.../web/static_fe/static_fe_controller.ex | 41 ++++++++++++++-----
.../static_fe/static_fe_controller_test.exs | 14 +++++++
2 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index b45d82c2d..8ccf15f4b 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -27,6 +27,12 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
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
%Object{data: data} = Object.normalize(activity)
@@ -83,9 +89,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|> redirect(external: data["url"] || data["external_url"] || data["id"])
_ ->
- conn
- |> put_status(404)
- |> render("error.html", %{message: "Post not found.", meta: ""})
+ not_found(conn, "Post not found.")
end
end
@@ -113,21 +117,33 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
})
_ ->
- conn
- |> put_status(404)
- |> render("error.html", %{message: "User not found.", meta: ""})
+ not_found(conn, "User not found.")
end
end
def show(%{assigns: %{object_id: _}} = conn, _params) do
url = Helpers.url(conn) <> conn.request_path
+
case Activity.get_create_by_object_ap_id_with_object(url) do
%Activity{} = activity ->
- redirect(conn, to: "/notice/#{activity.id}")
- _ ->
- conn
- |> put_status(404)
- |> render("error.html", %{message: "Post not found.", meta: ""})
+ to = Helpers.o_status_path(Pleroma.Web.Endpoint, :notice, activity)
+ redirect(conn, to: to)
+
+ _ ->
+ 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
@@ -140,5 +156,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
def assign_id(%{path_info: ["objects", object_id]} = conn, _opts),
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
end
diff --git a/test/web/static_fe/static_fe_controller_test.exs b/test/web/static_fe/static_fe_controller_test.exs
index 6ea8cea34..2ce8f9fa3 100644
--- a/test/web/static_fe/static_fe_controller_test.exs
+++ b/test/web/static_fe/static_fe_controller_test.exs
@@ -143,6 +143,20 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
assert html_response(conn, 302) =~ "redirected"
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
conn =
conn