mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-23 16:40:36 +00:00
Code Issues Projects Releases Wiki Activity

Moves blocking to save function

Browse source 
I just like these better than signals??
This commit is contained in:
Mouse Reeve 2021-02-15 12:21:48 -08:00
parent 930d9429ef
commit 65f81bd5f0
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/incoming.py
View file

@ -195,7 +195,7 @@ def handle_block(activity):
''' blocking a user ''' ''' blocking a user '''
# create "block" databse entry # create "block" databse entry
activitypub.Block(**activity).to_model(models.UserBlocks) activitypub.Block(**activity).to_model(models.UserBlocks)
# the removing relationships is handled in post-save hook in model # the removing relationships is handled in model save
@app.task @app.task

28
bookwyrm/models/relationship.py
View file

@ -1,7 +1,6 @@
''' defines relationships between users ''' ''' defines relationships between users '''
from django.db import models, transaction from django.db import models, transaction
from django.db.models import Q from django.db.models import Q
from django.dispatch import receiver
from bookwyrm import activitypub from bookwyrm import activitypub
from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import ActivitypubMixin, ActivityMixin
@ -126,20 +125,15 @@ class UserBlocks(ActivityMixin, UserRelationship):
status = 'blocks' status = 'blocks'
activity_serializer = activitypub.Block activity_serializer = activitypub.Block
def save(self, *args, **kwargs):
''' remove follow or follow request rels after a block is created '''
super().save(*args, **kwargs)
@receiver(models.signals.post_save, sender=UserBlocks) UserFollows.objects.filter(
#pylint: disable=unused-argument Q(user_subject=self.user_subject, user_object=self.user_object) | \
def execute_after_save(sender, instance, created, *args, **kwargs): Q(user_subject=self.user_object, user_object=self.user_subject)
''' remove follow or follow request rels after a block is created ''' ).delete()
UserFollows.objects.filter( UserFollowRequest.objects.filter(
Q(user_subject=instance.user_subject, Q(user_subject=self.user_subject, user_object=self.user_object) | \
user_object=instance.user_object) | \ Q(user_subject=self.user_object, user_object=self.user_subject)
Q(user_subject=instance.user_object, ).delete()
user_object=instance.user_subject)
).delete()
UserFollowRequest.objects.filter(
Q(user_subject=instance.user_subject,
user_object=instance.user_object) | \
Q(user_subject=instance.user_object,
user_object=instance.user_subject)
).delete()