From 016c8fa471c0d03aea752011554aa8bf4e77fc09 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 14:11:41 -0700 Subject: [PATCH 1/6] MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up --- app/helpers/sockets_helper.rb | 6 +++--- app/views/publics/host_meta.erb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index 27a083bdf..b35780399 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -5,9 +5,9 @@ module SocketsHelper (object.is_a? Post) ? object.id : object.post_id end - def url_options - {:host => ""} - end + #def url_options + # {:host => ""} + #end def action_hash(uid, object) begin diff --git a/app/views/publics/host_meta.erb b/app/views/publics/host_meta.erb index b657a440f..e28fb6211 100644 --- a/app/views/publics/host_meta.erb +++ b/app/views/publics/host_meta.erb @@ -1,9 +1,9 @@ - <%= terse_url(root_path) %> + <%= terse_url(root_url) %> + template='<%= root_url %>webfinger?q={uri}'> Resource Descriptor From 7ff25ef81aec3da03556520c76f8b9a22c501274 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 15:10:11 -0700 Subject: [PATCH 2/6] MS IZ saved the person model --- app/models/person.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/person.rb b/app/models/person.rb index 3eaebd8d2..0b31cbc0a 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -110,7 +110,7 @@ class Person end def recieve_url - "#{self.url}user/#{self.owner.id}" + "#{self.url}user/#{self.id}" end protected From 487de2d8651a0c2e2af9acbbf4bf9e7ab47e7d9f Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 15:17:12 -0700 Subject: [PATCH 3/6] MS IZ receive, not recieve --- app/models/person.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/person.rb b/app/models/person.rb index 0b31cbc0a..005037d5e 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -109,7 +109,7 @@ class Person self.id == post.person.id end - def recieve_url + def receive_url "#{self.url}user/#{self.id}" end From da4de20ce11d673256c348e0174f3b74ae3ed063 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 15:24:51 -0700 Subject: [PATCH 4/6] IZ MS made things push to the receive url --- app/models/request.rb | 2 +- app/models/user.rb | 2 +- lib/diaspora/webhooks.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/request.rb b/app/models/request.rb index d55d1efb8..e3fad0606 100644 --- a/app/models/request.rb +++ b/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 diff --git a/app/models/user.rb b/app/models/user.rb index df7483c22..8fb73dc55 100644 --- a/app/models/user.rb +++ b/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 diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb index 26cddc01a..ba78ed81a 100644 --- a/lib/diaspora/webhooks.rb +++ b/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 ) From 432ce02a14ef8f13e04c1b3601dd2e88ff1d4b87 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 15:35:40 -0700 Subject: [PATCH 5/6] MS IZ receive url is better --- app/models/person.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/person.rb b/app/models/person.rb index 005037d5e..4d6cf9454 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -110,7 +110,7 @@ class Person end def receive_url - "#{self.url}user/#{self.id}" + "#{self.url}receive/users/#{self.id}" end protected From 89c54d1a63d037c8023ccef99be41f3f59251994 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 10 Aug 2010 15:56:34 -0700 Subject: [PATCH 6/6] MS IZ receive url in the request and a slash in person --- app/models/person.rb | 2 +- app/models/request.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 4d6cf9454..ad3991959 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -110,7 +110,7 @@ class Person end def receive_url - "#{self.url}receive/users/#{self.id}" + "#{self.url}receive/users/#{self.id}/" end protected diff --git a/app/models/request.rb b/app/models/request.rb index e3fad0606..31dcd162e 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -25,8 +25,8 @@ class Request before_validation :clean_link - scope :for_user, lambda{ |user| where(:destination_url => user.url) } - scope :from_user, lambda{ |user| where(:destination_url.ne => user.url) } + scope :for_user, lambda{ |user| where(:destination_url => user.receive_url) } + scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) } def self.instantiate(options = {}) person = options[:from]