Merge remote-tracking branch 'upstream/pull/5694'

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 16f733c882d30f002f3e7765c703d9bf7bf5254f..8d061e26bb626cd7c1a42fe9d6c6fb8e72e044fe 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -359,11 +359,13 @@ class User < ApplicationRecord
     trace_score = traces.size * 50
     diary_entry_score = diary_entries.visible.inject(0) { |acc, elem| acc + elem.body.spam_score }
     diary_comment_score = diary_comments.visible.inject(0) { |acc, elem| acc + elem.body.spam_score }
+    report_score = Report.where(:category => "spam", :issue => issues.with_status("open")).distinct.count(:user_id) * 20
 
     score = description.spam_score / 4.0
     score += diary_entries.visible.where("created_at > ?", 1.day.ago).count * 10
     score += diary_entry_score / diary_entries.visible.length unless diary_entries.visible.empty?
     score += diary_comment_score / diary_comments.visible.length unless diary_comments.visible.empty?
+    score += report_score
     score -= changeset_score
     score -= trace_score