From 8125fdc19f310a22fdd1395365c2f02d6887b389 Mon Sep 17 00:00:00 2001 From: unarist Date: Sat, 14 Oct 2017 21:42:09 +0900 Subject: Use atomUri in Undo activity of Announce (#5376) This allows deletion of reblogs which delivered before with OStatus URI. --- app/lib/activitypub/activity/undo.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/lib/activitypub') diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index 4b0905de2..cbed417c4 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -17,7 +17,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity private def undo_announce - 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