diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-09 07:11:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-09 07:11:23 +0200 |
commit | b5f7e12817356b9b1795ab0187fe08d07f13a485 (patch) | |
tree | 0c0a234d78a30dd47ba2e4975156cb650607f767 /app/lib | |
parent | 354fdd317e9c495ed721013911bc5274d5e0e1f8 (diff) |
Remove auto-silence behaviour from spam check (#12117)
Fix #12113
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/spam_check.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/lib/spam_check.rb b/app/lib/spam_check.rb index 441697364..235e44230 100644 --- a/app/lib/spam_check.rb +++ b/app/lib/spam_check.rb @@ -44,7 +44,6 @@ class SpamCheck end def flag! - auto_silence_account! auto_report_status! end @@ -134,17 +133,13 @@ class SpamCheck text.gsub(/\s+/, ' ').strip end - def auto_silence_account! - @account.silence! - end - def auto_report_status! status_ids = Status.where(visibility: %i(public unlisted)).where(id: matching_status_ids).pluck(:id) + [@status.id] if @status.distributable? ReportService.new.call(Account.representative, @account, status_ids: status_ids, comment: I18n.t('spam_check.spam_detected_and_silenced')) end def already_flagged? - @account.silenced? + @account.silenced? || @account.targeted_reports.unresolved.where(account_id: -99).exists? end def trusted? |