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

Removes filter for checking for follow requests

Browse source
This commit is contained in:
Mouse Reeve 2021-05-11 14:04:45 -07:00
parent 3de8ae00ae
commit f5eb5f982a
3 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/templates/snippets/follow_request_buttons.html
View file

@ -1,6 +1,5 @@
{% load i18n %} {% load i18n %}
{% load bookwyrm_tags %} {% if request.user in user.follow_requests.all %}
{% if request.user|follow_request_exists:user %}
<div class="field is-grouped"> <div class="field is-grouped">
<form action="/accept-follow-request/" method="POST"> <form action="/accept-follow-request/" method="POST">
{% csrf_token %} {% csrf_token %}

13
bookwyrm/templatetags/bookwyrm_tags.py
View file

@ -79,19 +79,6 @@ def get_user_boosted(user, status):
return user.id in status.boosters.all().values_list("user", flat=True) return user.id in status.boosters.all().values_list("user", flat=True)
@register.filter(name="follow_request_exists")
def follow_request_exists(user, requester):
"""see if there is a pending follow request for a user"""
try:
models.UserFollowRequest.objects.filter(
user_subject=requester,
user_object=user,
).get()
return True
except models.UserFollowRequest.DoesNotExist:
return False
@register.filter(name="boosted_status") @register.filter(name="boosted_status")
def get_boosted(boost): def get_boosted(boost):
"""load a boosted status. have to do this or it wont get foregin keys""" """load a boosted status. have to do this or it wont get foregin keys"""

18
bookwyrm/tests/test_templatetags.py
View file

@ -113,24 +113,6 @@ class TemplateTags(TestCase):
models.Boost.objects.create(user=self.user, boosted_status=status) models.Boost.objects.create(user=self.user, boosted_status=status)
self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status)) self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
def test_follow_request_exists(self, _):
"""does a user want to follow"""
self.assertFalse(
bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
)
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
models.UserFollowRequest.objects.create(
user_subject=self.user, user_object=self.remote_user
)
self.assertFalse(
bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
)
self.assertTrue(
bookwyrm_tags.follow_request_exists(self.remote_user, self.user)
)
def test_get_boosted(self, _): def test_get_boosted(self, _):
"""load a boosted status""" """load a boosted status"""
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):