Merge branch 'static-fe-object-id' into 'develop'

Redirect object/activity ID to notice in static-fe

Closes #1412

See merge request pleroma/pleroma!1977

lib/pleroma/web/static_fe/static_fe_controller.ex

@@ -27,6 +27,12 @@ defp get_title(%Object{data: %{"summary" => summary}}) when is_binary(summary),
 
   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 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
         |> 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
 
@@ -113,9 +117,33 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
         })
 
       _ ->
-        conn
+        not_found(conn, "User not found.")
-        |> put_status(404)
+    end
-        |> render("error.html", %{message: "User not found.", meta: ""})
+  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 ->
+        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
 
@@ -125,5 +153,11 @@ def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
   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(%{path_info: ["activities", activity_id]} = conn, _opts),
+    do: assign(conn, :activity_id, activity_id)
+
   def assign_id(conn, _opts), do: conn
 end

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,34 @@ test "shows the whole thread", %{conn: conn} 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 "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