X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..baf10cd39289cd7e94a819305e46f43e85a136c6:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 12afbb24b..f6d7ee78d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -138,7 +138,6 @@ class User < ActiveRecord::Base def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) if home_lon && home_lat gc = OSM::GreatCircle.new(home_lat, home_lon) - bounds = gc.bounds(radius) sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") nearby = User.where("id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius).order(sql_for_distance).limit(num) else @@ -212,8 +211,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) { |s, e| s += e.body.spam_score } - diary_comment_score = diary_comments.inject(0) { |s, c| s += c.body.spam_score } + diary_entry_score = diary_entries.inject(0) { |s, e| s + e.body.spam_score } + diary_comment_score = diary_comments.inject(0) { |s, c| s + c.body.spam_score } score = description.spam_score / 4.0 score += diary_entries.where("created_at > ?", 1.day.ago).count * 10