From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 27 Jul 2021 13:54:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=7f23dd6cc867e839ec721d34e3c114a68a5aed9e;hp=7acdab1f305bac744a302e3b44e2e920d6bc8a47;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
---

diff --git a/lib/pleroma/web/activity_pub/visibility.ex b/lib/pleroma/web/activity_pub/visibility.ex
index 2be59144d..986fa3a08 100644
--- a/lib/pleroma/web/activity_pub/visibility.ex
+++ b/lib/pleroma/web/activity_pub/visibility.ex
@@ -57,6 +57,7 @@ defmodule Pleroma.Web.ActivityPub.Visibility do
   def is_list?(_), do: false
 
   @spec visible_for_user?(Object.t() | Activity.t() | nil, User.t() | nil) :: boolean()
+  def visible_for_user?(%Object{data: %{"type" => "Tombstone"}}, _), do: false
   def visible_for_user?(%Activity{actor: ap_id}, %User{ap_id: ap_id}), do: true
   def visible_for_user?(%Object{data: %{"actor" => ap_id}}, %User{ap_id: ap_id}), do: true
   def visible_for_user?(nil, _), do: false