From aa509a3d8ae00f32fb318dd08ba8a95229a35533 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 10 Oct 2019 18:47:24 +0200 Subject: [PATCH] Fix auto-report string saying the account has been auto-silenced (#12142) --- app/lib/spam_check.rb | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/spam_check.rb b/app/lib/spam_check.rb index 235e44230..5b40514fd 100644 --- a/app/lib/spam_check.rb +++ b/app/lib/spam_check.rb @@ -135,7 +135,7 @@ class SpamCheck 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')) + ReportService.new.call(Account.representative, @account, status_ids: status_ids, comment: I18n.t('spam_check.spam_detected')) end def already_flagged? diff --git a/config/locales/en.yml b/config/locales/en.yml index 1ffc99eb3..be66b6c6c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1009,7 +1009,7 @@ en: relationships: Follows and followers two_factor_authentication: Two-factor Auth spam_check: - spam_detected_and_silenced: This is an automated report. Spam has been detected and the sender has been silenced automatically. If this is a mistake, please unsilence the account. + spam_detected: This is an automated report. Spam has been detected. statuses: attached: description: 'Attached: %{attached}'