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

Cleans up suggested users logic

Browse source
This commit is contained in:
Mouse Reeve 2021-09-08 11:14:41 -07:00
parent aabacc2124
commit e06e507c8d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bookwyrm/suggested_users.py
View file

@ -43,7 +43,6 @@ 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):
@ -103,7 +102,9 @@ 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(discoverable=True, is_active=True, *args, **kwargs) models.User.objects.filter(
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(
@ -178,15 +179,21 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs):
@receiver(signals.post_save, sender=models.User) @receiver(signals.post_save, sender=models.User)
# pylint: disable=unused-argument, too-many-arguments # pylint: disable=unused-argument, too-many-arguments
def add_new_user(sender, instance, created, update_fields=None, **kwargs): def updated_user(sender, instance, created, update_fields=None, **kwargs):
"""a new user, wow how cool""" """an updated user, neat"""
# a new user is found, create suggestions for them # a new user is found, create suggestions for them
if created and instance.local: if created and instance.local:
rerank_suggestions_task.delay(instance.id) rerank_suggestions_task.delay(instance.id)
# we know what fields were updated and discoverability didn't change
if update_fields and not "discoverable" in update_fields: if update_fields and not "discoverable" in update_fields:
return return
# deleted the user
if not instance.is_active:
remove_user_task.delay(instance.id)
return
# this happens on every save, not just when discoverability changes, annoyingly # this happens on every save, not just when discoverability changes, annoyingly
if instance.discoverable: if instance.discoverable:
rerank_user_task.delay(instance.id, update_only=False) rerank_user_task.delay(instance.id, update_only=False)