class User < ActiveRecord::Base
require 'xml/libxml'
- require 'digest/md5'
- has_many :traces
+ has_many :traces, :conditions => { :visible => true }
has_many :diary_entries, :order => 'created_at DESC'
- has_many :messages, :foreign_key => :to_user_id
- has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0"
- has_many :friends
+ 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 :tokens, :class_name => "UserToken"
has_many :preferences, :class_name => "UserPreference"
+ has_many :changesets
- validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
+ has_many :client_applications
+ has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
+
+ validates_presence_of :email, :display_name
+ validates_confirmation_of :email#, :message => ' addresses must match'
+ validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
validates_uniqueness_of :display_name, :allow_nil => true
validates_uniqueness_of :email
- validates_length_of :pass_crypt, :minimum => 8
- validates_length_of :display_name, :minimum => 3, :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_format_of :display_name, :with => /^[^\/;.,?]*$/
+ 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
before_save :encrypt_password
+ file_column :image, :magick => { :geometry => "100x100>" }
+
def after_initialize
- self.creation_time = Time.now
+ self.creation_time = Time.now.getutc if self.creation_time.nil?
end
def encrypt_password
- self.pass_crypt = Digest::MD5.hexdigest(pass_crypt) unless pass_crypt_confirmation.nil?
+ if pass_crypt_confirmation
+ self.pass_salt = OSM::make_token(8)
+ self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt)
+ end
end
def self.authenticate(options)
if options[:username] and options[:password]
user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
- user = nil unless user.pass_crypt == Digest::MD5.hexdigest(options[:password])
+ user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
elsif options[:token]
token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])
user = token.user if token
end
if user
- user = nil unless user.active? or options[:inactive]
+ user = nil unless user.visible? and (user.active? or options[:inactive])
end
token.update_attribute(:expiry, 1.week.from_now) if token and user
el1 = XML::Node.new 'user'
el1['display_name'] = self.display_name.to_s
el1['account_created'] = self.creation_time.xmlschema
+ if self.home_lat and self.home_lon
+ home = XML::Node.new 'home'
+ home['lat'] = self.home_lat.to_s
+ home['lon'] = self.home_lon.to_s
+ home['zoom'] = self.home_zoom.to_s
+ el1 << home
+ end
return el1
end
- def nearby(radius = 50)
+ def languages
+ attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+ end
+
+ def languages=(languages)
+ write_attribute(:languages, languages.join(","))
+ end
+
+ def preferred_language
+ languages.find { |l| Language.find(:first, :conditions => { :code => l }) }
+ end
+
+ def preferred_language_from(array)
+ (languages & array.collect { |i| i.to_s }).first
+ end
+
+ def nearby(radius = 50, num = 10)
if self.home_lon and self.home_lat
gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
bounds = gc.bounds(radius)
- nearby = User.find(:all, :conditions => "home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = 1 and id != #{self.id}")
- nearby.delete_if { |u| gc.distance(u.home_lat, u.home_lon) > radius }
- nearby.sort! { |u1,u2| gc.distance(u1.home_lat, u1.home_lon) <=> gc.distance(u2.home_lat, u2.home_lon) }
+ 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)
else
nearby = []
end
res = false
@new_friend = new_friend
self.friends.each do |friend|
- if friend.user_id == @new_friend.user_id
+ if friend.friend_user_id == @new_friend.id
return true
end
end
return false
end
+ def delete
+ self.active = false
+ self.display_name = "user_#{self.id}"
+ self.description = ""
+ self.home_lat = nil
+ self.home_lon = nil
+ self.image = nil
+ self.email_valid = false
+ self.new_email = nil
+ self.visible = false
+ self.save
+ end
+
end
projects / rails.git / blobdiff