From c2980d5b17d355985a6d5ac4eaa12371463363b3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 1 Sep 2017 21:12:59 +0200 Subject: Do not rely on activity arriving exactly once after delete arrived (#4754) --- app/lib/activitypub/activity/delete.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/lib/activitypub/activity/delete.rb') diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index afa9a8079..767909fb1 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 -- cgit