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

Conflicts:
	app/models/user.rb

app/controllers/people_controller.rb

@@ -12,7 +12,7 @@ class PeopleController < ApplicationController
   end
   
   def show
-    @person= current_user.friend_by_id(params[:id])
+    @person= current_user.visible_person_by_id(params[:id])
   
     @person_profile = @person.profile
     @person_posts = Post.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
@@ -21,7 +21,7 @@ class PeopleController < ApplicationController
   end
   
   def destroy
-    current_user.unfriend(current_user.friend_by_id(params[:id]))
+    current_user.unfriend(current_user.visible_person_by_id(params[:id]))
     flash[:notice] = "unfriended person."
     redirect_to people_url
   end

app/models/user.rb

@@ -236,8 +236,8 @@ class User
     if object.is_a? Retraction
       if object.type == 'Person' && object.signature_valid?
 
-        Rails.logger.info( "the person id is #{object.post_id} the friend found is #{friend_by_id(object.post_id).inspect}")
+        Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}")
-        unfriended_by friend_by_id(object.post_id)
+        unfriended_by visible_person_by_id(object.post_id)
 
       else
         object.perform self.id
@@ -289,7 +289,8 @@ class User
     terse
   end
  
-  def friend_by_id( id )
+  def visible_person_by_id( id )
+    return self if id == self.id
     friends.detect{|x| x.id == ensure_bson( id ) }
   end