about summary refs log tree commit diff
path: root/app/lib/activitypub
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-10-14 21:42:09 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-14 14:42:09 +0200
commit8125fdc19f310a22fdd1395365c2f02d6887b389 (patch)
tree7d85e55d35e6b0b40de87058e449bfe6dd43b860 /app/lib/activitypub
parentae716a12e1604a4df54acbc77ff35f591e3168e2 (diff)
Use atomUri in Undo activity of Announce (#5376)
This allows deletion of reblogs which delivered before with OStatus URI.
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r--app/lib/activitypub/activity/undo.rb3
1 files changed, 2 insertions, 1 deletions
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)