mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-06-05 23:38:53 +00:00
Code Issues Projects Releases Wiki Activity

Change unread_id to take user ID

Browse source 
Same reason as described in the prior commit.
This commit is contained in:
Wesley Aptekar-Cassels 2023-03-08 22:36:02 -05:00
parent 5446869c38
commit 653e8ee81b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bookwyrm/activitystreams.py
View file

@ -17,9 +17,9 @@ class ActivityStream(RedisStore):
"""the redis key for this user's instance of this stream""" """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): def unread_id(self, user_id):
"""the redis key for this user's unread count for this stream""" """the redis key for this user's unread count for this stream"""
stream_id = self.stream_id(user.id) stream_id = self.stream_id(user_id)
return f"{stream_id}-unread" return f"{stream_id}-unread"
def unread_by_status_type_id(self, user): def unread_by_status_type_id(self, user):
@ -39,7 +39,7 @@ class ActivityStream(RedisStore):
if increment_unread: if increment_unread:
for user in self.get_audience(status): for user in self.get_audience(status):
# add to the unread status count # add to the unread status count
pipeline.incr(self.unread_id(user)) pipeline.incr(self.unread_id(user.id))
# add to the unread status count for status type # add to the unread status count for status type
pipeline.hincrby( pipeline.hincrby(
self.unread_by_status_type_id(user), get_status_type(status), 1 self.unread_by_status_type_id(user), get_status_type(status), 1
@ -63,7 +63,7 @@ class ActivityStream(RedisStore):
def get_activity_stream(self, user): def get_activity_stream(self, user):
"""load the statuses to be displayed""" """load the statuses to be displayed"""
# clear unreads for this feed # clear unreads for this feed
r.set(self.unread_id(user), 0) r.set(self.unread_id(user.id), 0)
r.delete(self.unread_by_status_type_id(user)) r.delete(self.unread_by_status_type_id(user))
statuses = self.get_store(self.stream_id(user.id)) statuses = self.get_store(self.stream_id(user.id))
@ -83,7 +83,7 @@ class ActivityStream(RedisStore):
def get_unread_count(self, user): def get_unread_count(self, user):
"""get the unread status count for this user's feed""" """get the unread status count for this user's feed"""
return int(r.get(self.unread_id(user)) or 0) return int(r.get(self.unread_id(user.id)) or 0)
def get_unread_count_by_status_type(self, user): def get_unread_count_by_status_type(self, user):
"""get the unread status count for this user's feed's status types""" """get the unread status count for this user's feed's status types"""

2
bookwyrm/tests/activitystreams/test_abstractstream.py
View file

@ -57,7 +57,7 @@ class Activitystreams(TestCase):
f"{self.local_user.id}-test", f"{self.local_user.id}-test",
) )
self.assertEqual( self.assertEqual(
self.test_stream.unread_id(self.local_user), self.test_stream.unread_id(self.local_user.id),
f"{self.local_user.id}-test-unread", f"{self.local_user.id}-test-unread",
) )