message outbox

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

diff --git a/app/models/user.rb b/app/models/user.rb
index c4b81e7abdb66d26db556237e5500a670e9d2fc5..eccc006c2b7b5abf860e581e6f72c9e1bda774bf 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,6 +5,7 @@ class User < ActiveRecord::Base
   has_many :diary_entries, :order => 'created_at DESC'
   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
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
@@ -72,7 +73,7 @@ class User < ActiveRecord::Base
     return el1
   end
 
-  def nearby(radius = 50)
+  def nearby(radius = 50, num = 5)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)
@@ -82,7 +83,7 @@ class User < ActiveRecord::Base
     else
       nearby = []
     end
-    return nearby
+    return nearby.first(num)
   end
 
   def distance(nearby_user)