From bd271b7bec20e921f3d2aa0fd6e8b0ccc1b8ab9a Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 13 Aug 2010 17:33:26 -0700 Subject: [PATCH] RS, IZ; Refactored the user unfriend and unfriended_by --- app/models/user.rb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 56a0a584e..2eac6a008 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -103,26 +103,25 @@ class User end def unfriend(friend_id) + Rails.logger.info("#{self.real_name} is unfriending #{bad_friend.inspect}" bad_friend = Person.first(:_id => friend_id) + Retraction.for(self).push_to_url(bad_friend.receive_url) + remove_friend friend_id + end + + def remove_friend friend_id + bad_friend = Person.first(:_id => friend_id) + self.friend_ids.delete( friend_id ) - - if bad_friend - Retraction.for(self).push_to_url(bad_friend.receive_url) - bad_friend.user_refs -= 1 - - (bad_friend.user_refs > 0 || bad_friend.owner.nil? == false) ? bad_friend.save : bad_friend.destroy - end self.save + + bad_friend.user_refs -= 1 + (bad_friend.user_refs > 0 || bad_friend.owner.nil? == false) ? bad_friend.save : bad_friend.destroy end def unfriended_by friend_id - bad_friend = Person.first(:_id => friend_id) - - self.friend_ids.delete( friend_id ) - bad_friend.user_refs -= 1 - - (bad_friend.user_refs > 0 || bad_friend.owner.nil? == false) ? bad_friend.save : bad_friend.destroy - self.save + Rails.logger.info("#{self.real_name} is being unfriended by #{bad_friend.inspect}" + remove_friend friend_id end def send_request(rel_hash, group)