has_many :traces, :conditions => { :visible => true }
has_many :diary_entries, :order => 'created_at DESC'
+ has_many :diary_comments, :order => 'created_at DESC'
has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC'
has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC'
has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC'
- has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
+ has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')"
has_many :tokens, :class_name => "UserToken"
has_many :preferences, :class_name => "UserPreference"
has_many :changesets
has_many :client_applications
has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
- has_many :blocks, :class_name => "UserBlock", :conditions => ["user_blocks.ends_at > now() or user_blocks.needs_view"]
+ has_many :active_blocks, :class_name => "UserBlock", :conditions => ['user_blocks.ends_at > \'#{Time.now.getutc.xmlschema(5)}\' or user_blocks.needs_view']
has_many :roles, :class_name => "UserRole"
validates_presence_of :email, :display_name
validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
validates_uniqueness_of :display_name, :allow_nil => true
validates_uniqueness_of :email
+ validates_uniqueness_of :openid_url, :allow_nil => true
validates_length_of :pass_crypt, :within => 8..255
validates_length_of :display_name, :within => 3..255, :allow_nil => true
- validates_length_of :email, :within => 6..255
- validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+ validates_email_format_of :email
+ validates_email_format_of :new_email, :allow_blank => true
validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+ validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace"
+ validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace"
validates_numericality_of :home_lat, :allow_nil => true
validates_numericality_of :home_lon, :allow_nil => true
validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
user = token.user if token
end
- if user
- user = nil unless user.visible? and (user.active? or options[:inactive])
+ if user and
+ ( user.status == "deleted" or
+ ( user.status == "pending" and not options[:pending] ) or
+ ( user.status == "suspended" and not options[:suspended] ) )
+ user = nil
end
token.update_attribute(:expiry, 1.week.from_now) if token and user
end
def languages
- attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+ attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
end
def languages=(languages)
bounds = gc.bounds(radius)
sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
nearby = User.find(:all,
- :conditions => ["id != ? AND visible = ? AND data_public = ? AND #{sql_for_distance} <= ?", id, true, true, radius], :order => sql_for_distance, :limit => num)
+ :conditions => ["id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius],
+ :order => sql_for_distance, :limit => num)
else
nearby = []
end
return false
end
+ ##
+ # returns true if a user is visible
+ def visible?
+ ["pending","active","confirmed"].include? self.status
+ end
+
+ ##
+ # returns true if a user is active
+ def active?
+ ["active","confirmed"].include? self.status
+ end
+
##
# returns true if the user has the moderator role, false otherwise
def moderator?
end
##
- # returns true if the user has the moderator role, false otherwise
+ # returns true if the user has the administrator role, false otherwise
def administrator?
has_role? 'administrator'
end
##
# returns true if the user has the requested role
def has_role?(role)
- roles.inject(false) { |x, r| x or r.role == role }
+ roles.any? { |r| r.role == role }
end
##
# returns the first active block which would require users to view
# a message, or nil if there are none.
def blocked_on_view
- blocks.inject(nil) { |s,x| s || (x.needs_view? ? x : nil) }
+ active_blocks.detect { |b| b.needs_view? }
end
+ ##
+ # delete a user - leave the account but purge most personal data
def delete
- self.active = false
self.display_name = "user_#{self.id}"
self.description = ""
self.home_lat = nil
self.image = nil
self.email_valid = false
self.new_email = nil
- self.visible = false
+ self.status = "deleted"
self.save
end
+ ##
+ # return a spam score for a user
+ def spam_score
+ changeset_score = self.changesets.find(:all, :limit => 10).length * 50
+ trace_score = self.traces.find(:all, :limit => 10).length * 50
+ diary_entry_score = self.diary_entries.inject(0) { |s,e| s += OSM.spam_score(e.body) }
+ diary_comment_score = self.diary_comments.inject(0) { |s,e| s += OSM.spam_score(e.body) }
+
+ score = OSM.spam_score(self.description) * 2
+ 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
+ score -= trace_score
+
+ return score.to_i
+ end
end
projects / rails.git / blobdiff