about summary refs log tree commit diff
path: root/app/services/remove_status_service.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-04-07 15:03:31 +0200
committerGitHub <noreply@github.com>2022-04-07 15:03:31 +0200
commit3f9959a4b66c8d33a1de6dd13972327ff62f2cd3 (patch)
tree56bef462d8ec527b893e5f02d687d419b5440cc9 /app/services/remove_status_service.rb
parent00c9363f07081e0149533023992fba47dd905384 (diff)
parente2f4bafc136cb0853321ed4be1b02106bec8bc93 (diff)
Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/remove_status_service.rb')
-rw-r--r--app/services/remove_status_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index c28e16572..dfe9f9ac5 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -17,10 +17,10 @@ class RemoveStatusService < BaseService
     @account  = status.account
     @options  = options
 
-    @status.discard
-
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
+        @status.discard
+
         remove_from_self if @account.local?
         remove_from_followers
         remove_from_lists