mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-10-31 22:19:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2021-04-04 21:00:26 -07:00
commit a3d5d352a7
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bookwyrm/activitystreams.py
View file

@ -39,7 +39,7 @@ class ActivityStream(ABC):
# add the status to the feed # add the status to the feed
pipeline.zadd(self.stream_id(user), value) pipeline.zadd(self.stream_id(user), value)
pipeline.zremrangebyrank( 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 # add to the unread status count
pipeline.incr(self.unread_id(user)) pipeline.incr(self.unread_id(user))
@ -61,7 +61,7 @@ class ActivityStream(ABC):
pipeline.zadd(self.stream_id(viewer), self.get_value(status)) pipeline.zadd(self.stream_id(viewer), self.get_value(status))
if statuses: if statuses:
pipeline.zremrangebyrank( pipeline.zremrangebyrank(
self.stream_id(user), settings.MAX_STREAM_LENGTH, -1 self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
) )
pipeline.execute() pipeline.execute()
@ -99,7 +99,9 @@ class ActivityStream(ABC):
# only trim the stream if statuses were added # only trim the stream if statuses were added
if statuses.exists(): 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() pipeline.execute()
def stream_users(self, status): # pylint: disable=no-self-use def stream_users(self, status): # pylint: disable=no-self-use

2
bookwyrm/settings.py
View file

@ -99,7 +99,7 @@ REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379) REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD") REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD")
MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200)) MAX_STREAM_LENGTH = 3 # int(env("MAX_STREAM_LENGTH", 200))
STREAMS = ["home", "local", "federated"] STREAMS = ["home", "local", "federated"]
# Database # Database