From a4b892dfadfe915c0dc2185682fe652e1a7661f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 16:47:48 -0700
Subject: [PATCH] Fixes domain block tests

---
 bookwyrm/tests/views/test_federation.py | 16 ++++++++++++++++
 bookwyrm/tests/views/test_inbox.py      |  4 ++--
 bookwyrm/views/inbox.py                 |  5 +++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index a60ea432..874e277c 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -44,3 +44,19 @@ class FederationViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_server_page_post(self):
+        """ block and unblock a server """
+        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        self.assertEqual(server.status, "federated")
+
+        view = views.FederatedServer.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request, server.id)
+        self.assertEqual(server.status, "blocked")
+
+        view(request, server.id)
+        self.assertEqual(server.status, "federated")
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 889fdc32..f15b99f1 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -955,9 +955,9 @@ class Inbox(TestCase):
     def test_is_blocked_activity(self):
         """ check for blocked servers """
         activity = {"actor": "https://mastodon.social/user/whaatever/else"}
-        self.assertFalse(views.inbox.is_blocked_user_agent(activity))
+        self.assertFalse(views.inbox.is_blocked_activity(activity))
 
         models.FederatedServer.objects.create(
             server_name="mastodon.social", status="blocked"
         )
-        self.assertTrue(views.inbox.is_blocked_user_agent(activity))
+        self.assertTrue(views.inbox.is_blocked_activity(activity))
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 9e5aa019..387efe9f 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -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()