1 files changed, 15 insertions, 0 deletions
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 92d86a2c5..4d9c2a9a7 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -5,5 +5,20 @@ class UnfollowService < BaseService
   def call(source_account, target_account)
     follow = source_account.unfollow!(target_account)
     NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) unless target_account.local?
+    unmerge_from_timeline(target_account, source_account)
+  end
+
+  private
+
+  def unmerge_from_timeline(from_account, into_account)
+    timeline_key = FeedManager.instance.key(:home, into_account.id)
+
+    from_account.statuses.find_each do |status|
+      redis.zrem(timeline_key, status.id)
+    end
+  end
+
+  def redis
+    $redis
   end
 end