diff --git a/README.md b/README.md index d9ac44c94e41027b70497be7567e5d1520a02423..d941ac1824c83036c12146fa8aced4c965b99fff 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,13 @@ GEMS: We would like to keep external dependencies unduplicated. We're using No The privacy aware, personally controlled, do-it-all, open source social network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** +**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN** + +Also, we really want to continue to focus on features and improving the code base. When we think it is +ready for general use, we will post more detailed instructions. + + + These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest. ## Preparing your system diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index 88da5cc889b070e08acc2c66fbf827a90a74ca43..ab144ad127e0595bcd50549a583906f0affe49c3 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -47,7 +47,7 @@ class AspectsController < ApplicationController def manage @aspect = :manage - @remote_requests = Request.for_user current_user + @remote_requests = Request.for_user(current_user).all end def update diff --git a/app/models/person.rb b/app/models/person.rb index bed5bb2469b19c6a6132611dd6b4fac0a46c52d2..48e8b08161b107cfec0d22e7427a78f03eedc1af 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -85,6 +85,7 @@ class Person local_person elsif !identifier.include?("localhost") && !opts[:local] begin + puts "begin finger" f = Redfinger.finger(identifier) rescue SocketError => e raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/ diff --git a/app/models/request.rb b/app/models/request.rb index 739500e4e8c8fed1a9ae9cf4a2cbbaafe72f506e..da62edd937d83c372523c883143944f62226a372 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -26,8 +26,8 @@ class Request validates_presence_of :destination_url, :callback_url before_validation :clean_link - scope :for_user, lambda{ |user| where(:destination_url => user.person.receive_url) } - scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_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]