Use Tombstone and _:atomUri in Delete activities as fallback (#4704)

2017-08-26 16:10:35 +02:00
parent 2a2698e450
commit 884b085f53
2 changed files with 21 additions and 6 deletions
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@ -2,7 +2,8 @@

 class ActivityPub::Activity::Delete < ActivityPub::Activity
  def perform
-    status = Status.find_by(uri: object_uri, account: @account)
+    status   = Status.find_by(uri: object_uri, account: @account)
+    status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present?

    if status.nil?
      delete_later!(object_uri)