about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-04-21 04:46:09 +0200
committerchr <chr@cybre.space>2021-04-24 15:41:17 -0700
commitc4a3b7eef372db1414cbd6d62741c61ca7201613 (patch)
treee5669e41100f8069f1b15bc8fadd4af2f4dc7a19 /app/services
parenta22ab5038aaf90a182f99f45c1cddc234b794388 (diff)
Fix processing of remote Delete activities (#16084) cybrespace-3.3
* 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
Diffstat (limited to 'app/services')
-rw-r--r--app/services/remove_status_service.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index d6043fb5d..52d3f108c 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -16,6 +16,8 @@ class RemoveStatusService < BaseService
     @account  = status.account
     @options  = options
 
+    @status.discard
+
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
         remove_from_self if @account.local?