X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4fd689b03551a5d03cd7843504e277fc7078ad1a..417ded9da545299026b96f5f81f79897f8e3769b:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 3fdebbf61..525d018ac 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,24 +3,33 @@ class User < ActiveRecord::Base
 
   has_many :traces
   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, :order => 'sent_on DESC'
+  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0", :order => 'sent_on DESC'
+  has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :order => 'sent_on DESC'
+  has_many :friends, :include => :befriendee, :conditions => "users.visible = 1"
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
 
+  validates_presence_of :email, :display_name
+  validates_confirmation_of :email, :message => 'Email addresses must match'
   validates_confirmation_of :pass_crypt, :message => 'Password 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 if self.creation_time.nil?
   end
 
   def encrypt_password
@@ -40,7 +49,7 @@ class User < ActiveRecord::Base
     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
@@ -58,20 +67,27 @@ class User < ActiveRecord::Base
     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 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 = User.find(:all, :conditions => "visible = 1 and 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) }
     else
       nearby = []
     end
-    return nearby
+    return nearby.first(num)
   end
 
   def distance(nearby_user)
@@ -82,7 +98,7 @@ class User < ActiveRecord::Base
     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