X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fstatic_fe%2Fstatic_fe_controller.ex;h=8ccf15f4bb21c9b252975158eb45eaad597f40a1;hb=6cc5341d26426f98a53a6e46787f1457f974f321;hp=9f4eeaa3659daa1306777e533e8490ee35cd11c3;hpb=df2f59be911acd4626886befbc0c6bcd75752080;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 9f4eeaa36..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,8 @@ 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
 
   plug(:put_layout, :static_fe)
@@ -25,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)
 
@@ -61,35 +69,82 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
   end
 
   def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
-    activity = Activity.get_by_id_with_object(notice_id)
-    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})
+    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"])
+
+      _ ->
+        not_found(conn, "Post not found.")
+    end
   end
 
   def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
-    %User{} = user = User.get_cached_by_nickname_or_id(username_or_id)
+    case User.get_cached_by_nickname_or_id(username_or_id) do
+      %User{} = user ->
+        meta = Metadata.build_tags(%{user: user})
+
+        timeline =
+          ActivityPub.fetch_user_activities(user, nil, Map.take(params, @page_keys))
+          |> Enum.map(&represent/1)
+
+        prev_page_id =
+          (params["min_id"] || params["max_id"]) &&
+            List.first(timeline) && List.first(timeline).id
+
+        next_page_id = List.last(timeline) && List.last(timeline).id
+
+        render(conn, "profile.html", %{
+          user: user,
+          timeline: timeline,
+          prev_page_id: prev_page_id,
+          next_page_id: next_page_id,
+          meta: meta
+        })
+
+      _ ->
+        not_found(conn, "User not found.")
+    end
+  end
 
-    timeline =
-      ActivityPub.fetch_user_activities(user, nil, Map.take(params, @page_keys))
-      |> Enum.map(&represent/1)
+  def show(%{assigns: %{object_id: _}} = conn, _params) do
+    url = Helpers.url(conn) <> conn.request_path
 
-    prev_page_id =
-      (params["min_id"] || params["max_id"]) &&
-        List.first(timeline) && List.first(timeline).id
+    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)
 
-    next_page_id = List.last(timeline) && List.last(timeline).id
+      _ ->
+        not_found(conn, "Post not found.")
+    end
+  end
 
-    render(conn, "profile.html", %{
-      user: user,
-      timeline: timeline,
-      prev_page_id: prev_page_id,
-      next_page_id: next_page_id
-    })
+  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
 
   def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
@@ -98,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