diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-05 22:29:08 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-05 22:29:08 +0000 |
| commit | 576368237ce3c8f07acb19ab02f3f9df84b42e4b (patch) | |
| tree | 282b4f640c6c12fbc6d2928970b62f42edd06138 /lib | |
| parent | 145d6fe6e9f3c9414b1231da7f200e007413b31b (diff) | |
| parent | 2d7da5f4375164aa78e221ab054529a04d09e819 (diff) | |
| download | pleroma-576368237ce3c8f07acb19ab02f3f9df84b42e4b.tar.gz | |
Merge branch 'activitypub-tombstone-fix' into 'develop'
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 4d754de13..4685f6d95 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -801,6 +801,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end end + def is_public?(%Object{data: %{"type" => "Tombstone"}}) do + false + end + def is_public?(activity) do "https://www.w3.org/ns/activitystreams#Public" in (activity.data["to"] ++ (activity.data["cc"] || [])) |