From 3dd7847d7b544581e01b4dfd06aa389be7993553 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 Jan 2022 13:46:21 -0800
Subject: [PATCH] Only remove non-public lists on unfollow

---
 bookwyrm/lists_stream.py | 17 +++++++++++------
 complete_bwdev.sh        |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/lists_stream.py b/bookwyrm/lists_stream.py
index f98a82cb..bb0ae1c8 100644
--- a/bookwyrm/lists_stream.py
+++ b/bookwyrm/lists_stream.py
@@ -30,11 +30,13 @@ class ListsStream(RedisStore):
         lists = models.List.privacy_filter(viewer).filter(user=user)
         self.bulk_add_objects_to_store(lists, self.stream_id(viewer))
 
-    def remove_user_lists(self, viewer, user):
+    def remove_user_lists(self, viewer, user, exclude_privacy=None):
         """remove a user's list from another user's feed"""
         # remove all so that followers only lists are removed
-        lists = user.list_set.all()
-        self.bulk_remove_objects_from_store(lists, self.stream_id(viewer))
+        lists = user.list_set
+        if exclude_privacy:
+            lists = lists.exclude(privacy=exclude_privacy)
+        self.bulk_remove_objects_from_store(lists.all(), self.stream_id(viewer))
 
     def get_list_stream(self, user):
         """load the lists to be displayed"""
@@ -144,7 +146,10 @@ def remove_lists_on_unfollow(sender, instance, *args, **kwargs):
     """remove lists from a feed on unfollow"""
     if not instance.user_subject.local:
         return
-    remove_user_lists_task.delay(instance.user_subject.id, instance.user_object.id)
+    # remove all but public lists
+    remove_user_lists_task.delay(
+        instance.user_subject.id, instance.user_object.id, exclude_privacy="public"
+    )
 
 
 @receiver(signals.post_save, sender=models.UserBlocks)
@@ -224,11 +229,11 @@ def add_list_task(list_id):
 
 
 @app.task(queue=MEDIUM)
-def remove_user_lists_task(viewer_id, user_id):
+def remove_user_lists_task(viewer_id, user_id, exclude_privacy=None):
     """remove all lists by a user from a viewer's stream"""
     viewer = models.User.objects.get(id=viewer_id)
     user = models.User.objects.get(id=user_id)
-    ListsStream().remove_user_lists(viewer, user)
+    ListsStream().remove_user_lists(viewer, user, exclude_privacy=exclude_privacy)
 
 
 @app.task(queue=MEDIUM)
diff --git a/complete_bwdev.sh b/complete_bwdev.sh
index e7a036cc..85115fba 100644
--- a/complete_bwdev.sh
+++ b/complete_bwdev.sh
@@ -22,6 +22,7 @@ clean
 black
 prettier
 populate_streams
+populate_lists_streams
 populate_suggestions
 generate_thumbnails
 generate_preview_images