From a91352499102df487cc9ed66425d35bf7534032d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 3 Apr 2021 10:56:53 -0700 Subject: [PATCH] Fixes redis call so tests don't fail --- bookwyrm/activitystreams.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 0be90fc6..419e20c0 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -90,7 +90,9 @@ class ActivityStream(ABC): for status in statuses.all()[: settings.MAX_STREAM_LENGTH]: pipeline.zadd(stream_id, self.get_value(status)) - pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1) + # only trim the stream if statuses were added + if statuses.exists(): + pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1) pipeline.execute() def stream_users(self, status): # pylint: disable=no-self-use @@ -280,7 +282,7 @@ def add_statuses_on_unblock(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.User) # pylint: disable=unused-argument -def populate_feed_on_account_create(sender, instance, created, *args, **kwargs): +def populate_streams_on_account_create(sender, instance, created, *args, **kwargs): """ build a user's feeds when they join """ if not created or not instance.local: return