Merge branch 'master' into glitch-soc/merge-upstream

2019-10-11 22:41:21 +02:00
parent c2112c7781 c4118ba71b
commit 10f1478498
134 changed files with 1669 additions and 649 deletions
@@ -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?