From c2980d5b17d355985a6d5ac4eaa12371463363b3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 1 Sep 2017 21:12:59 +0200 Subject: [PATCH] Do not rely on activity arriving exactly once after delete arrived (#4754) --- app/lib/activitypub/activity.rb | 9 +-------- app/lib/activitypub/activity/delete.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 14e3ca784b..b06dd61946 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -97,14 +97,7 @@ class ActivityPub::Activity end def delete_arrived_first?(uri) - key = "delete_upon_arrival:#{@account.id}:#{uri}" - - if redis.exists(key) - redis.del(key) - true - else - false - end + redis.exists("delete_upon_arrival:#{@account.id}:#{uri}") end def delete_later!(uri) diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index afa9a80799..767909fb11 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -5,12 +5,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity 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) - else - forward_for_reblogs(status) - delete_now!(status) - end + delete_later!(object_uri) + + return if status.nil? + + forward_for_reblogs(status) + delete_now!(status) end private