nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	app/models/user.rb
This commit is contained in:
Raphael 2010-08-17 19:34:19 -07:00
commit 456e9e9634
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/people_controller.rb
View file

@ -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

7
app/models/user.rb
View file

@ -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}")
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
@ -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