diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 18:49:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-06 18:49:46 +0100 |
commit | 54101563bbadbfafd9291a867d7fbea6df3a8b7b (patch) | |
tree | fcf9a125f6ebc3ad4182fa0edcbd7101b33aebb0 /app/services/remove_status_service.rb | |
parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
parent | 21d6bc16893a9dd24c5ef54cf2f554846c8eca5b (diff) |
Merge pull request #1892 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.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 3d0825f08..58bf1dcb7 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 @@ -59,13 +59,13 @@ class RemoveStatusService < BaseService end def remove_from_followers - @account.followers_for_local_distribution.reorder(nil).find_each do |follower| + @account.followers_for_local_distribution.includes(:user).reorder(nil).find_each do |follower| FeedManager.instance.unpush_from_home(follower, @status) end end def remove_from_lists - @account.lists_for_local_distribution.select(:id, :account_id).reorder(nil).find_each do |list| + @account.lists_for_local_distribution.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |list| FeedManager.instance.unpush_from_list(list, @status) end end @@ -104,7 +104,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 |