From 15f77ee32b2bf33ad7eb5db837ed92adf0f3a959 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Mon, 18 Jul 2016 15:27:36 -0300 Subject: [PATCH] Correctly remove followers from circle when unfriend --- app/models/friendship.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/friendship.rb b/app/models/friendship.rb index 53c089d..7a6927b 100644 --- a/app/models/friendship.rb +++ b/app/models/friendship.rb @@ -20,8 +20,11 @@ class Friendship < ApplicationRecord Friendship.update_cache_counter(:friends_count, friendship.person, -1) Friendship.update_cache_counter(:friends_count, friendship.friend, -1) - circle = Circle.find_by(:person => friendship.person, :name => (friendship.group.blank? ? 'friendships': friendship.group) ) - friendship.person.remove_profile_from_circle(friendship.friend, circle) if circle + groups = friendship.group.blank? ? ['friendships'] : friendship.group.split(',').map(&:strip) + groups.each do |group| + circle = Circle.find_by(:person => friendship.person, :name => group ) + friendship.person.remove_profile_from_circle(friendship.friend, circle) if circle + end end def self.remove_friendship(person1, person2) -- libgit2 0.21.2