From 5446869c389351046a708ddefdab2031d056174a Mon Sep 17 00:00:00 2001
From: Wesley Aptekar-Cassels <me@wesleyac.com>
Date: Wed, 8 Mar 2023 22:33:32 -0500
Subject: [PATCH] Change stream_id to take user ID

Anywhere we have a user object, we can easily get the user ID in the
caller, and this will allow us more flexibility in the future to
implement optimizations that involve knowing a user ID without querying
the database for the user object.
---
 bookwyrm/activitystreams.py                   | 22 +++++++++----------
 .../activitystreams/test_abstractstream.py    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 80774e28d..f8349eed8 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -13,18 +13,18 @@ from bookwyrm.tasks import app, LOW, MEDIUM, HIGH
 class ActivityStream(RedisStore):
     """a category of activity stream (like home, local, books)"""
 
-    def stream_id(self, user):
+    def stream_id(self, user_id):
         """the redis key for this user's instance of this stream"""
-        return f"{user.id}-{self.key}"
+        return f"{user_id}-{self.key}"
 
     def unread_id(self, user):
         """the redis key for this user's unread count for this stream"""
-        stream_id = self.stream_id(user)
+        stream_id = self.stream_id(user.id)
         return f"{stream_id}-unread"
 
     def unread_by_status_type_id(self, user):
         """the redis key for this user's unread count for this stream"""
-        stream_id = self.stream_id(user)
+        stream_id = self.stream_id(user.id)
         return f"{stream_id}-unread-by-type"
 
     def get_rank(self, obj):  # pylint: disable=no-self-use
@@ -52,13 +52,13 @@ class ActivityStream(RedisStore):
         """add a user's statuses to another user's feed"""
         # only add the statuses that the viewer should be able to see (ie, not dms)
         statuses = models.Status.privacy_filter(viewer).filter(user=user)
-        self.bulk_add_objects_to_store(statuses, self.stream_id(viewer))
+        self.bulk_add_objects_to_store(statuses, self.stream_id(viewer.id))
 
     def remove_user_statuses(self, viewer, user):
         """remove a user's status from another user's feed"""
         # remove all so that followers only statuses are removed
         statuses = user.status_set.all()
-        self.bulk_remove_objects_from_store(statuses, self.stream_id(viewer))
+        self.bulk_remove_objects_from_store(statuses, self.stream_id(viewer.id))
 
     def get_activity_stream(self, user):
         """load the statuses to be displayed"""
@@ -66,7 +66,7 @@ class ActivityStream(RedisStore):
         r.set(self.unread_id(user), 0)
         r.delete(self.unread_by_status_type_id(user))
 
-        statuses = self.get_store(self.stream_id(user))
+        statuses = self.get_store(self.stream_id(user.id))
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
@@ -95,7 +95,7 @@ class ActivityStream(RedisStore):
 
     def populate_streams(self, user):
         """go from zero to a timeline"""
-        self.populate_store(self.stream_id(user))
+        self.populate_store(self.stream_id(user.id))
 
     def get_audience(self, status):  # pylint: disable=no-self-use
         """given a status, what users should see it"""
@@ -137,7 +137,7 @@ class ActivityStream(RedisStore):
         return audience.distinct()
 
     def get_stores_for_object(self, obj):
-        return [self.stream_id(u) for u in self.get_audience(obj)]
+        return [self.stream_id(u.id) for u in self.get_audience(obj)]
 
     def get_statuses_for_user(self, user):  # pylint: disable=no-self-use
         """given a user, what statuses should they see on this stream"""
@@ -257,7 +257,7 @@ class BooksStream(ActivityStream):
             )
             .distinct()
         )
-        self.bulk_add_objects_to_store(statuses, self.stream_id(user))
+        self.bulk_add_objects_to_store(statuses, self.stream_id(user.id))
 
     def remove_book_statuses(self, user, book):
         """add statuses about a book to a user's feed"""
@@ -275,7 +275,7 @@ class BooksStream(ActivityStream):
             )
             .distinct()
         )
-        self.bulk_remove_objects_from_store(statuses, self.stream_id(user))
+        self.bulk_remove_objects_from_store(statuses, self.stream_id(user.id))
 
 
 # determine which streams are enabled in settings.py
diff --git a/bookwyrm/tests/activitystreams/test_abstractstream.py b/bookwyrm/tests/activitystreams/test_abstractstream.py
index af94233f0..d7d4793a1 100644
--- a/bookwyrm/tests/activitystreams/test_abstractstream.py
+++ b/bookwyrm/tests/activitystreams/test_abstractstream.py
@@ -53,7 +53,7 @@ class Activitystreams(TestCase):
     def test_activitystream_class_ids(self, *_):
         """the abstract base class for stream objects"""
         self.assertEqual(
-            self.test_stream.stream_id(self.local_user),
+            self.test_stream.stream_id(self.local_user.id),
             f"{self.local_user.id}-test",
         )
         self.assertEqual(