From: Enju Aihara <9839590-EnjuAihara@users.noreply.gitlab.com> Date: Sat, 9 Apr 2022 17:26:33 +0000 (+0200) Subject: reformatted X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e077b77a743f9c7b4c6cb0f210c87aea917c5f34;p=fba.git reformatted --- diff --git a/fetch_blocks.py b/fetch_blocks.py index e6c8daa..2d2aab6 100644 --- a/fetch_blocks.py +++ b/fetch_blocks.py @@ -7,6 +7,7 @@ headers = { "user-agent": "fedi-block-api (https://gitlab.com/EnjuAihara/fedi-block-api)" } + def get_mastodon_blocks(domain: str) -> dict: blocks = { "Suspended servers": [], @@ -22,7 +23,7 @@ def get_mastodon_blocks(domain: str) -> dict: ) 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: @@ -36,12 +37,15 @@ def get_mastodon_blocks(domain: str) -> dict: return { "reject": blocks["Suspended servers"], "media_removal": blocks["Filtered media"], - "federated_timeline_removal": blocks["Limited servers"] + blocks["Silenced servers"], + "federated_timeline_removal": blocks["Limited servers"] + + blocks["Silenced servers"], } + def get_hash(domain: str) -> str: return sha256(domain.encode("utf-8")).hexdigest() + def get_type(domain: str) -> str: try: res = get(f"https://{domain}/nodeinfo/2.1.json", headers=headers, timeout=5) @@ -56,10 +60,13 @@ def get_type(domain: str) -> str: except: return None + conn = sqlite3.connect("blocks.db") c = conn.cursor() -c.execute("select domain, software from instances where software in ('pleroma', 'mastodon')") +c.execute( + "select domain, software from instances where software in ('pleroma', 'mastodon')" +) for blocker, software in c.fetchall(): if software == "pleroma": @@ -67,22 +74,43 @@ for blocker, software in c.fetchall(): try: # Blocks c.execute("delete from blocks where blocker = ?", (blocker,)) - federation = get(f"https://{blocker}/nodeinfo/2.1.json", headers=headers, timeout=5).json()["metadata"]["federation"] + federation = get( + f"https://{blocker}/nodeinfo/2.1.json", headers=headers, timeout=5 + ).json()["metadata"]["federation"] if "mrf_simple" in federation: - for block_level, blocks in (federation["mrf_simple"] | {"quarantined_instances": federation["quarantined_instances"]}).items(): + for block_level, blocks in ( + federation["mrf_simple"] + | {"quarantined_instances": federation["quarantined_instances"]} + ).items(): for blocked in blocks: if blocked == "": continue - c.execute("select domain from instances where domain = ?", (blocked,)) + c.execute( + "select domain from instances where domain = ?", (blocked,) + ) if c.fetchone() == None: - c.execute("insert into instances select ?, ?, ?", (blocked, get_hash(blocked), get_type(blocked))) - c.execute("insert into blocks select ?, ?, '', ?", (blocker, blocked, block_level)) + c.execute( + "insert into instances select ?, ?, ?", + (blocked, get_hash(blocked), get_type(blocked)), + ) + c.execute( + "insert into blocks select ?, ?, '', ?", + (blocker, blocked, block_level), + ) conn.commit() # Reasons if "mrf_simple_info" in federation: - for block_level, info in (federation["mrf_simple_info"] | federation["quarantined_instances_info"] if "quarantined_instances_info" in federation else {}).items(): + for block_level, info in ( + federation["mrf_simple_info"] + | federation["quarantined_instances_info"] + if "quarantined_instances_info" in federation + else {} + ).items(): for blocked, reason in info.items(): - c.execute("update blocks set reason = ? where blocker = ? and blocked = ? and block_level = ?", (reason["reason"], blocker, blocked, block_level)) + c.execute( + "update blocks set reason = ? where blocker = ? and blocked = ? and block_level = ?", + (reason["reason"], blocker, blocked, block_level), + ) conn.commit() except Exception as e: print("error:", e, blocker) @@ -95,7 +123,9 @@ for blocker, software in c.fetchall(): for instance in blocks: blocked, blocked_hash, reason = instance.values() if blocked.count("*") <= 1: - c.execute("select hash from instances where hash = ?", (blocked_hash,)) + c.execute( + "select hash from instances where hash = ?", (blocked_hash,) + ) if c.fetchone() == None: c.execute( "insert into instances select ?, ?, ?",