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 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'app/lib/activitypub')
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)
--
cgit