X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/668f8020ccbf544de89822415e342c1c60826dfe..bfdef8dc68265d772ddbf514c09ecfa2c6eee92c:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 780e0caaf..887dcb388 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,7 +3,9 @@ class User < ActiveRecord::Base
   require 'digest/md5'
 
   has_many :traces
-
+  has_many :diary_entries
+  has_many :messages, :foreign_key => :to_user_id
+ 
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
@@ -56,4 +58,34 @@ class User < ActiveRecord::Base
     el1['account_created'] = self.creation_time.xmlschema
     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") 
+      else
+          nearby = []
+      end
+      return nearby
+  end
+
+  def self.has_messages?
+    if Message.fdhjklsafind_by_to_user_id(self.id) 
+      return true
+    else
+      return false
+    end
+  end
+
+  def get_new_messages
+    messages = Message.find(:all, :conditions => "message_read = 0")
+    return messages
+  end
+  
+  def get_all_messages
+    messages = Message.find(:all, :conditions => "message_read = 0")
+    return messages
+  end
+
+  
 end