mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix auto-report string saying the account has been auto-silenced (#12142)

pull/1236/head^2
Eugen Rochko 2019-10-10 18:47:24 +02:00 committed by GitHub
parent a57ac0723f
commit aa509a3d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/spam_check.rb
View File

@ -135,7 +135,7 @@ class SpamCheck
def auto_report_status! def auto_report_status!
status_ids = Status.where(visibility: %i(public unlisted)).where(id: matching_status_ids).pluck(:id) + [@status.id] if @status.distributable? 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 end
def already_flagged? def already_flagged?

2
config/locales/en.yml
View File

@ -1009,7 +1009,7 @@ en:
relationships: Follows and followers relationships: Follows and followers
two_factor_authentication: Two-factor Auth two_factor_authentication: Two-factor Auth
spam_check: 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: statuses:
attached: attached:
description: 'Attached: %{attached}' description: 'Attached: %{attached}'