mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/statuses_controller.rb
View File

@ -77,7 +77,7 @@ class Api::V1::StatusesController < Api::BaseController
@status = Status.where(account: current_account).find(params[:id]) @status = Status.where(account: current_account).find(params[:id])
authorize @status, :destroy? authorize @status, :destroy?
@status.discard @status.discard_with_reblogs
StatusPin.find_by(status: @status)&.destroy StatusPin.find_by(status: @status)&.destroy
@status.account.statuses_count = @status.account.statuses_count - 1 @status.account.statuses_count = @status.account.statuses_count - 1
json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true

2
app/lib/status_reach_finder.rb
View File

@ -55,7 +55,7 @@ class StatusReachFinder
# Beware: Reblogs can be created without the author having had access to the status # Beware: Reblogs can be created without the author having had access to the status
def reblogs_account_ids def reblogs_account_ids
@status.reblogs.pluck(:account_id) if distributable? || unsafe? @status.reblogs.rewhere(deleted_at: [nil, @status.deleted_at]).pluck(:account_id) if distributable? || unsafe?
end end
# Beware: Favourites can be created without the author having had access to the status # Beware: Favourites can be created without the author having had access to the status

2
app/models/admin/status_batch_action.rb
View File

@ -44,7 +44,7 @@ class Admin::StatusBatchAction
ApplicationRecord.transaction do ApplicationRecord.transaction do
statuses.each do |status| statuses.each do |status|
status.discard status.discard_with_reblogs
log_action(:destroy, status) log_action(:destroy, status)
end end

6
app/models/status.rb
View File

@ -440,6 +440,12 @@ class Status < ApplicationRecord
im im
end end
def discard_with_reblogs
discard_time = Time.current
Status.unscoped.where(reblog_of_id: id, deleted_at: [nil, deleted_at]).in_batches.update_all(deleted_at: discard_time) unless reblog?
update_attribute(:deleted_at, discard_time)
end
private private
def update_status_stat!(attrs) def update_status_stat!(attrs)

2
app/services/account_statuses_cleanup_service.rb
View File

@ -14,7 +14,7 @@ class AccountStatusesCleanupService < BaseService
last_deleted = nil last_deleted = nil
account_policy.statuses_to_delete(budget, cutoff_id, account_policy.last_inspected).reorder(nil).find_each(order: :asc) do |status| account_policy.statuses_to_delete(budget, cutoff_id, account_policy.last_inspected).reorder(nil).find_each(order: :asc) do |status|
status.discard status.discard_with_reblogs
RemovalWorker.perform_async(status.id, { 'redraft' => false }) RemovalWorker.perform_async(status.id, { 'redraft' => false })
num_deleted += 1 num_deleted += 1
last_deleted = status.id last_deleted = status.id

4
app/services/remove_status_service.rb
View File

@ -19,7 +19,7 @@ class RemoveStatusService < BaseService
@options = options @options = options
with_lock("distribute:#{@status.id}") do with_lock("distribute:#{@status.id}") do
@status.discard @status.discard_with_reblogs
StatusPin.find_by(status: @status)&.destroy StatusPin.find_by(status: @status)&.destroy
@ -102,7 +102,7 @@ class RemoveStatusService < BaseService
# because once original status is gone, reblogs will disappear # because once original status is gone, reblogs will disappear
# without us being able to do all the fancy stuff # 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) RemoveStatusService.new.call(reblog, original_removed: true)
end end
end end