cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reports of already suspended accounts being recorded (#16047)

This commit is contained in:
Eugen Rochko 2021-04-16 22:01:05 +02:00 committed by GitHub
parent baed52c2a7
commit dde8739020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/flag.rb
View File

@ -10,6 +10,8 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
target_accounts.each do |target_account| target_accounts.each do |target_account|
target_statuses = target_statuses_by_account[target_account.id] target_statuses = target_statuses_by_account[target_account.id]
next if target_account.suspended?
ReportService.new.call( ReportService.new.call(
@account, @account,
target_account, target_account,

2
app/services/report_service.rb
View File

@ -10,6 +10,8 @@ class ReportService < BaseService
@comment = options.delete(:comment) || '' @comment = options.delete(:comment) || ''
@options = options @options = options
raise ActiveRecord::RecordNotFound if @target_account.suspended?
create_report! create_report!
notify_staff! notify_staff!
forward_to_origin! if !@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward]) forward_to_origin! if !@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward])