zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Fixes domain block tests

Browse source
This commit is contained in:
Mouse Reeve 2021-04-05 16:47:48 -07:00
parent 34b790a086
commit a4b892dfad
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bookwyrm/views/inbox.py
View file

@ -70,7 +70,8 @@ def is_blocked_user_agent(request):
user_agent = request.headers.get("User-Agent")
if not user_agent:
return False
domain = re.match(regex.domain, user_agent)
url = re.search(r"+https?://{:s}/?".format(regex.domain), user_agent)
domain = urlparse(url).netloc
if not domain:
# idk, we'll try again later with the actor
return False
@ -89,7 +90,7 @@ def is_blocked_activity(activity_json):
def is_blocked(domain):
""" is this domain blocked? """
return models.FederatedServer.object.filter(
return models.FederatedServer.objects.filter(
server_name=domain, status="blocked"
).exists()