diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-04 16:31:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-04 16:31:44 +0100 |
commit | c2170991c7889b8f6c6434f416cb0a8450db25a1 (patch) | |
tree | 15da9dd2a375d5e0cbc3e1da97688096f7b30591 /app/services/remove_status_service.rb | |
parent | e02812d5b63b4909fff9c0c7246e80745c4c703e (diff) |
Fix reblogs being discarded after the reblogged status (#19731)
Diffstat (limited to 'app/services/remove_status_service.rb')
-rw-r--r-- | app/services/remove_status_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index f9fdea2cb..37d2dabae 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -19,7 +19,7 @@ class RemoveStatusService < BaseService @options = options with_lock("distribute:#{@status.id}") do - @status.discard + @status.discard_with_reblogs StatusPin.find_by(status: @status)&.destroy @@ -102,7 +102,7 @@ class RemoveStatusService < BaseService # because once original status is gone, reblogs will disappear # without us being able to do all the fancy stuff - @status.reblogs.includes(:account).reorder(nil).find_each do |reblog| + @status.reblogs.rewhere(deleted_at: [nil, @status.deleted_at]).includes(:account).reorder(nil).find_each do |reblog| RemoveStatusService.new.call(reblog, original_removed: true) end end |