From 0b36e3419d4c4ce175f9db266ef5b3a49a9b3974 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 21 Apr 2021 04:46:09 +0200
Subject: Fix processing of remote Delete activities (#16084)
* Add tests
* Ensure deleted statuses are marked as such
* Save some redis memory by not storing URIs in delete_upon_arrival values
* Avoid possible race condition when processing incoming Deletes
* Avoid potential duplicate Delete forwards
* Lower lock durations to reduce issues in case of hard crash of the Rails process
* Check for `lock.aquired?` and improve comment
* Refactor RedisLock usage in app/lib/activitypub
* Fix using incorrect or non-existent sender for relaying Deletes
---
spec/lib/activitypub/activity/delete_spec.rb | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
(limited to 'spec/lib/activitypub')
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index 37b93ecf7..9dfb8a61b 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -49,4 +49,24 @@ RSpec.describe ActivityPub::Activity::Delete do
end
end
end
+
+ context 'when the status has been reported' do
+ describe '#perform' do
+ subject { described_class.new(json, sender) }
+ let!(:reporter) { Fabricate(:account) }
+
+ before do
+ reporter.reports.create!(target_account: status.account, status_ids: [status.id], forwarded: false)
+ subject.perform
+ end
+
+ it 'marks the status as deleted' do
+ expect(Status.find_by(id: status.id)).to be_nil
+ end
+
+ it 'actually keeps a copy for inspection' do
+ expect(Status.with_discarded.find_by(id: status.id)).to_not be_nil
+ end
+ end
+ end
end
--
cgit