gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix reblogs being discarded after the reblogged status (#19731)

Browse source
This commit is contained in:
Claire 2022-11-04 16:31:44 +01:00 • committed by GitHub
parent e02812d5b6
commit c2170991c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/remove_status_service.rb
View file

@ -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