resolved user.rb conflict

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 7befa479ac547387f6da99f4457b702749fd0ede..f7a4122a3afa9c3b56ec897ff7d4ac71eaf0d3b1 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,6 +4,8 @@ class User < ActiveRecord::Base
 
   has_many :traces
   has_many :diary_entries
+  has_many :messages, :foreign_key => :to_user_id
+  has_many :friends
 
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
@@ -17,7 +19,7 @@ class User < ActiveRecord::Base
     self.timeout = Time.now
     self.token = User.make_token()
   end
-  
+
   def pass_crypt=(str) 
     write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
   end
@@ -25,7 +27,7 @@ class User < ActiveRecord::Base
   def pass_crypt_confirmation=(str) 
     write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end
-  
+
   def self.authenticate(email, passwd) \r
     find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)])\r
   end 
@@ -33,7 +35,7 @@ class User < ActiveRecord::Base
   def self.authenticate_token(token) 
     find(:first, :conditions => [ "token = ? ", token])
   end 
-  
+
   def self.make_token(length=30)
     chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     confirmstring = ''
@@ -57,4 +59,43 @@ 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
+
+  def is_friends_with?(new_friend)
+    res = false
+    @new_friend = new_friend
+    self.friends.each do |friend|
+      if friend.user_id == @new_friend.user_id
+        return true
+      end
+    end
+    return false
+  end
+
 end