From 48756e77f394b5f2fdc52416ab72e66e0289484f Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 17 Aug 2010 19:32:42 -0700
Subject: [PATCH] Friend_by_id changed to visible_person_by_id
---
app/controllers/people_controller.rb | 4 ++--
app/models/user.rb | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index f530489145..226f3233b2 100644
--- a/app/controllers/people_controller.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index a3144cb9a3..bbe4a095c1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -225,8 +225,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}")
- unfriended_by friend_by_id(object.post_id)
+ Rails.logger.info( "the person id is #{object.post_id} the friend found is #{visible_person_by_id(object.post_id).inspect}")
+ unfriended_by visible_person_by_id(object.post_id)
else
object.perform self.id
@@ -287,7 +287,8 @@ class User
self.password_confirmation = self.password
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
--
GitLab