From 940e841502647fab3d903a5e2d440f7bae79947e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 4 Apr 2021 20:57:30 -0700 Subject: [PATCH] Fixes trimming streams --- bookwyrm/activitystreams.py | 8 +++++--- bookwyrm/settings.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 94ba23bc9..279079c81 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -36,7 +36,7 @@ class ActivityStream(ABC): # add the status to the feed pipeline.zadd(self.stream_id(user), value) pipeline.zremrangebyrank( - self.stream_id(user), settings.MAX_STREAM_LENGTH, -1 + self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH ) # add to the unread status count pipeline.incr(self.unread_id(user)) @@ -58,7 +58,7 @@ class ActivityStream(ABC): pipeline.zadd(self.stream_id(viewer), self.get_value(status)) if statuses: pipeline.zremrangebyrank( - self.stream_id(user), settings.MAX_STREAM_LENGTH, -1 + self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH ) pipeline.execute() @@ -96,7 +96,9 @@ class ActivityStream(ABC): # only trim the stream if statuses were added if statuses.exists(): - pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1) + pipeline.zremrangebyrank( + self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH + ) pipeline.execute() def stream_users(self, status): # pylint: disable=no-self-use diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 845f81c46..9d1d0b858 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -98,7 +98,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application" REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost") REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379) -MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200)) +MAX_STREAM_LENGTH = 3 # int(env("MAX_STREAM_LENGTH", 200)) STREAMS = ["home", "local", "federated"] # Database