yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes filters

This commit is contained in:
Mouse Reeve 2021-09-08 12:06:23 -07:00
parent 88a65b0b88
commit 4db5677509
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bookwyrm/suggested_users.py
View File

@ -43,6 +43,7 @@ class SuggestedUsers(RedisStore):
~Q(id=user.id), ~Q(id=user.id),
~Q(followers=user), ~Q(followers=user),
~Q(follower_requests=user), ~Q(follower_requests=user),
bookwyrm_user=True,
) )
def get_stores_for_object(self, obj): def get_stores_for_object(self, obj):
@ -106,9 +107,7 @@ class SuggestedUsers(RedisStore):
def get_annotated_users(viewer, *args, **kwargs): def get_annotated_users(viewer, *args, **kwargs):
"""Users, annotated with things they have in common""" """Users, annotated with things they have in common"""
return ( return (
models.User.objects.filter( models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
discoverable=True, is_active=True, bookwyrm_user=True, *args, **kwargs
)
.exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer)) .exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer))
.annotate( .annotate(
mutuals=Count( mutuals=Count(
@ -196,7 +195,7 @@ def update_user(sender, instance, created, update_fields=None, **kwargs):
return return
# deleted the user # deleted the user
if not instance.is_active: if not created and not instance.is_active:
remove_user_task.delay(instance.id) remove_user_task.delay(instance.id)
return return

10
bookwyrm/tests/views/test_federation.py
View File

@ -80,7 +80,9 @@ class FederationViews(TestCase):
request.user = self.local_user request.user = self.local_user
request.user.is_superuser = True request.user.is_superuser = True
view(request, server.id) with patch("bookwyrm.suggested_users.bulk_remove_instance_task.delay") as mock:
view(request, server.id)
self.assertEqual(mock.call_count, 1)
server.refresh_from_db() server.refresh_from_db()
self.remote_user.refresh_from_db() self.remote_user.refresh_from_db()
@ -118,7 +120,11 @@ class FederationViews(TestCase):
request.user = self.local_user request.user = self.local_user
request.user.is_superuser = True request.user.is_superuser = True
views.federation.unblock_server(request, server.id) with patch("bookwyrm.suggested_users.bulk_add_instance_task.delay") as mock:
views.federation.unblock_server(request, server.id)
self.assertEqual(mock.call_count, 1)
self.assertEqual(mock.call_args[0][0], server.id)
server.refresh_from_db() server.refresh_from_db()
self.remote_user.refresh_from_db() self.remote_user.refresh_from_db()
self.assertEqual(server.status, "federated") self.assertEqual(server.status, "federated")