Improve handling of user to user messages.

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index f72fd5bfadd59a1aa025ba0e368b97dc0044e5f9..783a9bc3b2f333fe604625424014f07d93a052ad 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,8 +3,9 @@ class User < ActiveRecord::Base
   require 'digest/md5'
 
   has_many :traces
-  has_many :diary_entries
+  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
 
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
@@ -13,6 +14,9 @@ class User < ActiveRecord::Base
   validates_length_of :pass_crypt, :minimum => 8
   validates_length_of :display_name, :minimum => 3, :allow_nil => true
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  validates_format_of :display_name, :with => /^[^\/;.,?]*$/
+
+  before_save :encrypt_password
 
   def set_defaults
     self.creation_time = Time.now
@@ -20,16 +24,12 @@ class User < ActiveRecord::Base
     self.token = User.make_token()
   end
 
-  def pass_crypt=(str) 
-    write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
-  end
-
-  def pass_crypt_confirmation=(str) 
-    write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
+  def encrypt_password
+    self.pass_crypt = Digest::MD5.hexdigest(pass_crypt) unless pass_crypt_confirmation.nil?
   end
 
-  def self.authenticate(email, passwd) \r
-    find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)])\r
+  def self.authenticate(email, passwd, active = true)
+    find(:first, :conditions => [ "email = ? AND pass_crypt = ? AND active = ?", email, Digest::MD5.hexdigest(passwd), active])
   end 
 
   def self.authenticate_token(token) 
@@ -60,31 +60,21 @@ class User < ActiveRecord::Base
     return el1
   end
 
-  def nearby(lat_range=1, lon_range=1)
-      if self.home_lon and self.home_lat 
-          nearby = User.find(:all,  :conditions => "#{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and  #{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and data_public = 1 and id != #{self.id}") 
-      else
-          nearby = []
-      end
-      return nearby
-  end
-
-  def self.has_messages?
-    if Message.fdhjklsafind_by_to_user_id(self.id) 
-      return true
+  def nearby(radius = 50)
+    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) }
     else
-      return false
+      nearby = []
     end
+    return nearby
   end
 
-  def get_new_messages
-    messages = Message.find(:all, :conditions => "message_read = 0 and to_user_id = #{self.id}")
-    return messages
-  end
-
-  def get_all_messages
-    messages = Message.find(:all, :conditions => "to_user_id = #{self.id}")
-    return messages
+  def distance(nearby_user)
+    return OSM::GreatCircle.new(self.home_lat, self.home_lon).distance(nearby_user.home_lat, nearby_user.home_lon)
   end
 
   def is_friends_with?(new_friend)