diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 5c70d9704..e2ec400a5 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -29,6 +29,8 @@ class ReportsController < ApplicationController @report.issue.reopen unless @report.issue.open? @report.issue.save! + @report.issue.reported_user&.spam_check + redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report") else flash.now[:notice] = t(".provide_details") diff --git a/app/models/user.rb b/app/models/user.rb index 21fe2181b..8d061e26b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -359,7 +359,7 @@ 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")).count * 20 + 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 diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb index 25b80e8f4..a7f65de62 100644 --- a/test/controllers/reports_controller_test.rb +++ b/test/controllers/reports_controller_test.rb @@ -111,4 +111,42 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest assert_equal 2, issue.reports.count end + + def test_spam_reports_can_suspend + target_user = create(:user) + + session_for(create(:user)) + + post reports_path(:report => { + :details => "Spammer", + :category => "spam", + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) + assert_equal "active", target_user.reload.status + + session_for(create(:user)) + + post reports_path(:report => { + :details => "Spammer", + :category => "spam", + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) + assert_equal "active", target_user.reload.status + + post reports_path(:report => { + :details => "Spammer", + :category => "spam", + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) + assert_equal "active", target_user.reload.status + + session_for(create(:user)) + + post reports_path(:report => { + :details => "Spammer", + :category => "spam", + :issue => { :reportable_id => target_user.id, :reportable_type => "User" } + }) + assert_equal "suspended", target_user.reload.status + end end