X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fstatic_fe%2Fstatic_fe_controller.ex;h=8ccf15f4bb21c9b252975158eb45eaad597f40a1;hb=0f386110c6e15148ff1ff5ea3451885485fcb7ff;hp=10bd3fecd4ed8ac4ef3420d91c0bebd1c810f352;hpb=bfd5d798262f0ecc7ebc260d92c766d39c0766de;p=akkoma

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 10bd3fecd..8ccf15f4b 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
   alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Visibility
   alias Pleroma.Web.Metadata
   alias Pleroma.Web.Router.Helpers
 
@@ -26,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)
 
@@ -62,23 +69,27 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
   end
 
   def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
-    case Activity.get_by_id_with_object(notice_id) do
-      %Activity{} = activity ->
-        %User{} = user = User.get_by_ap_id(activity.object.data["actor"])
-        meta = Metadata.build_tags(%{activity_id: notice_id, object: activity.object, user: user})
-
-        timeline =
-          activity.object.data["context"]
-          |> ActivityPub.fetch_activities_for_context(%{})
-          |> Enum.reverse()
-          |> Enum.map(&represent(&1, &1.object.id == activity.object.id))
-
-        render(conn, "conversation.html", %{activities: timeline, meta: meta})
+    with %Activity{local: true} = activity <-
+           Activity.get_by_id_with_object(notice_id),
+         true <- Visibility.is_public?(activity.object),
+         %User{} = user <- User.get_by_ap_id(activity.object.data["actor"]) do
+      meta = Metadata.build_tags(%{activity_id: notice_id, object: activity.object, user: user})
+
+      timeline =
+        activity.object.data["context"]
+        |> ActivityPub.fetch_activities_for_context(%{})
+        |> Enum.reverse()
+        |> Enum.map(&represent(&1, &1.object.id == activity.object.id))
+
+      render(conn, "conversation.html", %{activities: timeline, meta: meta})
+    else
+      %Activity{object: %Object{data: data}} ->
+        conn
+        |> put_status(:found)
+        |> redirect(external: data["url"] || data["external_url"] || data["id"])
 
       _ ->
-        conn
-        |> put_status(404)
-        |> render_error(:not_found, "Notice not found")
+        not_found(conn, "Post not found.")
     end
   end
 
@@ -106,9 +117,33 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
         })
 
       _ ->
-        conn
-        |> put_status(404)
-        |> render_error(:not_found, "User not found")
+        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 ->
+        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
 
@@ -118,5 +153,11 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
   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