From 46cf65678ede77fe32fefaeedc9cd2a4f3e40f45 Mon Sep 17 00:00:00 2001
From: Enju Aihara <9839590-EnjuAihara@users.noreply.gitlab.com>
Date: Fri, 8 Apr 2022 23:12:01 +0200
Subject: [PATCH] refactored get_mastodon_blocks

---
 fetch_blocks.py | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/fetch_blocks.py b/fetch_blocks.py
index 60d90c1..7a3de5f 100644
--- a/fetch_blocks.py
+++ b/fetch_blocks.py
@@ -8,24 +8,36 @@ headers = {
 }
 
 def get_mastodon_blocks(domain: str) -> dict:
-    try:
-        reject = []
-        media_removal = []
-        federated_timeline_removal = []
+    blocks = {
+        "Suspended servers": [],
+        "Filtered media": [],
+        "Limited servers": [],
+        "Silenced servers": [],
+    }
 
-        doc = BeautifulSoup(get(f"https://{domain}/about/more", headers=headers, timeout=5).text, "html.parser")
-        for header in doc.find_all("h3"):
-            if header.text == "Suspended servers":
-                for line in header.find_next_siblings("table")[0].find_all("tr")[1:]:
-                    reject.append({"domain": line.find("span").text, "hash": line.find("span")["title"][9:], "reason": line.find_all("td")[1].text.strip()})
-            elif header.text == "Filtered media":
-                for line in header.find_next_siblings("table")[0].find_all("tr")[1:]:
-                    media_removal.append({"domain": line.find("span").text, "hash": line.find("span")["title"][9:], "reason": line.find_all("td")[1].text.strip()})
-            elif header.text in ["Limited servers", "Silenced servers"]:
-                for line in header.find_next_siblings("table")[0].find_all("tr")[1:]:
-                    federated_timeline_removal.append({"domain": line.find("span").text, "hash": line.find("span")["title"][9:], "reason": line.find_all("td")[1].text.strip()})
-    finally:
-        return {"reject": reject, "media_removal": media_removal, "federated_timeline_removal": federated_timeline_removal}
+    try:
+        doc = BeautifulSoup(
+            get(f"https://{domain}/about/more", headers=headers, timeout=5).text,
+            "html.parser",
+        )
+    except:
+        return {}
+        
+    for header in doc.find_all("h3"):
+        for line in header.find_next_siblings("table")[0].find_all("tr")[1:]:
+            if header.text in blocks:
+                blocks[header.text].append(
+                    {
+                        "domain": line.find("span").text,
+                        "hash": line.find("span")["title"][9:],
+                        "reason": line.find_all("td")[1].text.strip(),
+                    }
+                )
+    return {
+        "reject": blocks["Suspended servers"],
+        "media_removal": blocks["Filtered media"],
+        "federated_timeline_removal": blocks["Limited servers"] + blocks["Silenced servers"],
+    }
 
 
 def get_type(domain: str) -> str:
-- 
2.39.5