mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-09-28 06:12:03 +00:00
Code Issues Projects Releases Wiki Activity

Change unread_by_status_type_id to take user ID

Browse source 
Same reason as in prior commit.
This commit is contained in:
Wesley Aptekar-Cassels 2023-03-08 22:37:30 -05:00
parent 653e8ee81b
commit 41e14bdfaf
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

@ -22,9 +22,9 @@ class ActivityStream(RedisStore):
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_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-by-type" return f"{stream_id}-unread-by-type"
def get_rank(self, obj): # pylint: disable=no-self-use def get_rank(self, obj): # pylint: disable=no-self-use
@ -42,7 +42,7 @@ class ActivityStream(RedisStore):
pipeline.incr(self.unread_id(user.id)) 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.id), get_status_type(status), 1
) )
# and go! # and go!
@ -64,7 +64,7 @@ class ActivityStream(RedisStore):
"""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.id), 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.id))
statuses = self.get_store(self.stream_id(user.id)) statuses = self.get_store(self.stream_id(user.id))
return ( return (
@ -87,7 +87,7 @@ class ActivityStream(RedisStore):
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"""
status_types = r.hgetall(self.unread_by_status_type_id(user)) status_types = r.hgetall(self.unread_by_status_type_id(user.id))
return { return {
str(key.decode("utf-8")): int(value) or 0 str(key.decode("utf-8")): int(value) or 0
for key, value in status_types.items() for key, value in status_types.items()

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

@ -64,7 +64,7 @@ class Activitystreams(TestCase):
def test_unread_by_status_type_id(self, *_): def test_unread_by_status_type_id(self, *_):
"""stream for status type""" """stream for status type"""
self.assertEqual( self.assertEqual(
self.test_stream.unread_by_status_type_id(self.local_user), self.test_stream.unread_by_status_type_id(self.local_user.id),
f"{self.local_user.id}-test-unread-by-type", f"{self.local_user.id}-test-unread-by-type",
) )