X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14ac1babc2517320a2c90fa9b4ac36a5a6e68018..4d44f188e1b69d94ea9f364d85a57dcd262a93ba:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index e5ff1917d..c845d4d0a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,7 @@ class User < ActiveRecord::Base has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" has_many :changesets, -> { order(:created_at => :desc) } - has_many :changeset_comments, :foreign_key => 'author_id' + has_many :changeset_comments, :foreign_key => :author_id has_and_belongs_to_many :changeset_subscriptions, :class_name => 'Changeset', :join_table => 'changesets_subscribers', :foreign_key => 'subscriber_id' has_many :note_comments, :foreign_key => :author_id has_many :notes, :through => :note_comments @@ -216,6 +216,7 @@ class User < ActiveRecord::Base diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score } score = self.description.spam_score / 4.0 + score += self.diary_entries.where("created_at > ?", 1.day.ago).count * 10 score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0 score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0 score -= changeset_score