Remove nonsense has_one relationship

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 678bbad9de34b0466ec916b34c69af5744af0a36..c063b7c34b6f4babce1bff7b4eda0efadf13e59f 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,7 +74,6 @@ class User < ActiveRecord::Base
   has_many :roles, :class_name => "UserRole"
 
   has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id
-  has_one :issue, :class_name => "Issue", :foreign_key => :updated_by
   has_many :issue_comments
 
   has_many :reports
@@ -267,8 +266,8 @@ class User < ActiveRecord::Base
   def spam_score
     changeset_score = changesets.size * 50
     trace_score = traces.size * 50
-    diary_entry_score = diary_entries.inject(0) { |acc, elem| acc + elem.body.spam_score }
-    diary_comment_score = diary_comments.inject(0) { |acc, elem| acc + elem.body.spam_score }
+    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 }
 
     score = description.spam_score / 4.0
     score += diary_entries.where("created_at > ?", 1.day.ago).count * 10
@@ -283,9 +282,7 @@ class User < ActiveRecord::Base
   ##
   # perform a spam check on a user
   def spam_check
-    if status == "active" && spam_score > SPAM_THRESHOLD
-      update(:status => "suspended")
-    end
+    update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD
   end
 
   ##