IZ MS made things push to the receive url

app/models/request.rb

@@ -30,7 +30,7 @@ class Request
 
   def self.instantiate(options = {})
     person = options[:from]
-    self.new(:destination_url => options[:to], :callback_url => person.url, :person => person, :exported_key => person.export_key)
+    self.new(:destination_url => options[:to], :callback_url => person.receive_url, :person => person, :exported_key => person.export_key)
   end
   
 

app/models/user.rb

@@ -97,7 +97,7 @@ class User
     self.save
 
     if bad_friend 
-      Retraction.for(self).push_to_url(bad_friend.url) 
+      Retraction.for(self).push_to_url(bad_friend.receive_url) 
       bad_friend.update_attributes(:user_refs => bad_friend.user_refs - 1)
       bad_friend.destroy if bad_friend.user_refs == 0
     end

lib/diaspora/webhooks.rb

@@ -27,7 +27,7 @@ module Diaspora
         end
 
         def push_to_url(url)
-          hook_url = url + "receive/"
+          hook_url = url 
           xml = self.class.build_xml_for(self)
           Rails.logger.debug("Adding xml for #{self} to message queue to #{url}")
           @@queue.add_post_request( hook_url, xml )