Merge branch 'activitypub-tombstone-fix' into 'develop'

Don't crash on AP request for tombstone See merge request pleroma/pleroma!630
2019-01-05 22:29:08 +00:00 · 2019-01-05 22:29:08 +00:00 · 576368237c
commit 576368237c
parent 145d6fe6e9 2d7da5f437
3 changed files with 29 additions and 0 deletions
--- 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"] || []))