Add some further test cases.

Including like ... private visibility, cos that's super important.

1 files changed, 15 insertions, 13 deletions

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 66d2d0367..5e60c82b0 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
 
@@ -62,19 +63,20 @@ 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{local: true} = 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
       _ ->
         conn
         |> put_status(404)