diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 5e0969e56..1feb495b7 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -331,8 +331,15 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserBlocks) # pylint: disable=unused-argument def add_statuses_on_unblock(sender, instance, *args, **kwargs): - """remove statuses from all feeds on block""" - public_streams = [v for (k, v) in streams.items() if k != "home"] + """add statuses back to all feeds on unblock""" + # make sure there isn't a block in the other direction + if models.UserBlocks.objects.filter( + user_subject=instance.user_object, + user_object=instance.user_subject, + ).exists(): + return + + public_streams = [k for (k, v) in streams.items() if k != "home"] # add statuses back to streams with statuses from anyone if instance.user_subject.local: diff --git a/bookwyrm/views/preferences/block.py b/bookwyrm/views/preferences/block.py index 90b3be90c..1eccf4612 100644 --- a/bookwyrm/views/preferences/block.py +++ b/bookwyrm/views/preferences/block.py @@ -14,7 +14,7 @@ class Block(View): """blocking users""" def get(self, request): - """list of blocked users?""" + """list of blocked users""" return TemplateResponse(request, "preferences/blocks.html") def post(self, request, user_id):