Merge branch 'master' of github.com:diaspora/diaspora_rails

app/models/friend_request.rb

@@ -26,7 +26,7 @@ class FriendRequest
   end
 
   def send_off
-    push_to [self.recipient]
+    push_to_recipient self.recipient
   end
   
 end

lib/common.rb

@@ -66,6 +66,11 @@ module Diaspora
           end
         end
 
+        def push_to_recipient(recipient)
+          if self.sender_id == User.first.id
+            push_to( [recipient] )
+          end
+        end
 
         def prep_webhook
           "<post>#{self.to_xml.to_s}</post>"

lib/tasks/db.rake

@@ -24,6 +24,7 @@ namespace :db do
     User.delete_all
     Friend.delete_all
     Profile.delete_all
+    FriendRequest.delete_all
   end
 
   desc 'Purge and seed the current RAILS_ENV database using information from db/seeds.rb'