From 884b085f534b02c664bcddd3a2fefcad6d4e5cc4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 26 Aug 2017 16:10:35 +0200
Subject: Use Tombstone and _:atomUri in Delete activities as fallback (#4704)

---
 app/lib/activitypub/activity/delete.rb           |  3 ++-
 app/serializers/activitypub/delete_serializer.rb | 24 +++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 23f3430fb..a1598dfd3 100644
--- 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)
diff --git a/app/serializers/activitypub/delete_serializer.rb b/app/serializers/activitypub/delete_serializer.rb
index b49268d72..a041c577b 100644
--- a/app/serializers/activitypub/delete_serializer.rb
+++ b/app/serializers/activitypub/delete_serializer.rb
@@ -1,8 +1,26 @@
 # frozen_string_literal: true
 
 class ActivityPub::DeleteSerializer < ActiveModel::Serializer
+  class TombstoneSerializer < ActiveModel::Serializer
+    attributes :id, :type
+    attribute :atom_uri, key: '_:atomUri'
+
+    def id
+      ActivityPub::TagManager.instance.uri_for(object)
+    end
+
+    def type
+      'Tombstone'
+    end
+
+    def atom_uri
+      ::TagManager.instance.uri_for(object)
+    end
+  end
+
   attributes :id, :type, :actor
-  attribute :virtual_object, key: :object
+
+  has_one :object, serializer: TombstoneSerializer
 
   def id
     [ActivityPub::TagManager.instance.uri_for(object), '#delete'].join
@@ -15,8 +33,4 @@ class ActivityPub::DeleteSerializer < ActiveModel::Serializer
   def actor
     ActivityPub::TagManager.instance.uri_for(object.account)
   end
-
-  def virtual_object
-    ActivityPub::TagManager.instance.uri_for(object)
-  end
 end
-- 
cgit