diff options
| author | feld <feld@feld.me> | 2021-07-27 16:25:34 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-07-27 16:25:34 +0000 |
| commit | d8a986c9e893de8eed3aa336a557695669b1ffee (patch) | |
| tree | af0db5bcaa392f07de1ffbef8c6f8b4fe93af0ef | |
| parent | 7495beeb4086d925cdb006368eb318c630eb0276 (diff) | |
| parent | 7f23dd6cc867e839ec721d34e3c114a68a5aed9e (diff) | |
Merge branch 'object-tombstone-visibility' into 'develop'
Visibility: check Tombstone objects in visible_for_user?/2
See merge request pleroma/pleroma!3490
| -rw-r--r-- | lib/pleroma/web/activity_pub/visibility.ex | 1 |
1 files changed, 1 insertions, 0 deletions
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 |