Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

Browse source 
Change all account actions except "none" to resolve all unresolved reports

Refactor `SuspendAccountService` to be more readable
This commit is contained in:
Eugen Rochko 2019-09-11 16:32:44 +02:00 • committed by GitHub
parent 4fe127664b
commit c5d37f18cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 98 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/services/remove_status_service.rb
View file

@ -8,7 +8,8 @@ class RemoveStatusService < BaseService
# @param [Status] status
# @param [Hash] options
# @option [Boolean] :redraft
# @options [Boolean] :original_removed
# @option [Boolean] :immediate
# @option [Boolean] :original_removed
def call(status, **options)
@payload = Oj.dump(event: :delete, payload: status.id.to_s)
@status = status
@ -31,7 +32,7 @@ class RemoveStatusService < BaseService
remove_from_spam_check
remove_media
@status.destroy!
@status.destroy! if @options[:immediate] || !@status.reported?
else
raise Mastodon::RaceConditionError
end
@ -150,7 +151,7 @@ class RemoveStatusService < BaseService
end
def remove_media
return if @options[:redraft]
return if @options[:redraft] || (!@options[:immediate] && @status.reported?)
@status.media_attachments.destroy_all
end