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

Lightly updates tests

Browse source
This commit is contained in:
Mouse Reeve 2021-10-04 09:47:33 -07:00
parent 443750d6db
commit 321949f2fa
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/activitystreams.py
View file

@ -480,12 +480,14 @@ def handle_boost_task(boost_id):
instance = models.Status.objects.get(id=boost_id) instance = models.Status.objects.get(id=boost_id)
boosted = instance.boost.boosted_status boosted = instance.boost.boosted_status
# previous boosts of this status
old_versions = models.Boost.objects.filter( old_versions = models.Boost.objects.filter(
boosted_status__id=boosted.id, boosted_status__id=boosted.id,
created_date__lt=instance.created_date, created_date__lt=instance.created_date,
) )
for stream in streams.values(): for stream in streams.values():
# people who should see the boost (not people who see the original status)
audience = stream.get_stores_for_object(instance) audience = stream.get_stores_for_object(instance)
stream.remove_object_from_related_stores(boosted, stores=audience) stream.remove_object_from_related_stores(boosted, stores=audience)
for status in old_versions: for status in old_versions:

2
bookwyrm/redis_store.py
View file

@ -35,7 +35,7 @@ class RedisStore(ABC):
def remove_object_from_related_stores(self, obj, stores=None): def remove_object_from_related_stores(self, obj, stores=None):
"""remove an object from all stores""" """remove an object from all stores"""
stores = stores or self.get_stores_for_object(obj) stores = self.get_stores_for_object(obj) if stores is None else stores
pipeline = r.pipeline() pipeline = r.pipeline()
for store in stores: for store in stores:
pipeline.zrem(store, -1, obj.id) pipeline.zrem(store, -1, obj.id)

3
bookwyrm/tests/activitystreams/test_tasks.py
View file

@ -125,7 +125,7 @@ class Activitystreams(TestCase):
@patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores") @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
def test_boost_to_another_timeline(self, *_): def test_boost_to_another_timeline(self, *_):
"""add a boost and deduplicate the boosted status on the timeline""" """boost from a non-follower doesn't remove original status from feed"""
status = models.Status.objects.create(user=self.local_user, content="hi") status = models.Status.objects.create(user=self.local_user, content="hi")
with patch("bookwyrm.activitystreams.handle_boost_task.delay"): with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
boost = models.Boost.objects.create( boost = models.Boost.objects.create(
@ -138,6 +138,7 @@ class Activitystreams(TestCase):
activitystreams.handle_boost_task(boost.id) activitystreams.handle_boost_task(boost.id)
self.assertTrue(mock.called) self.assertTrue(mock.called)
self.assertEqual(mock.call_count, 1)
call_args = mock.call_args call_args = mock.call_args
self.assertEqual(call_args[0][0], status) self.assertEqual(call_args[0][0], status)
self.assertEqual( self.assertEqual(