mirror_maker/fedi-block-api
1
0
Fork 0
mirror of https://git.kiwifarms.net/mint/fedi-block-api.git synced 2024-10-23 03:19:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

check if fields are in json to reduce errors

Browse source
This commit is contained in:
Enju Aihara 2022-03-31 18:07:32 +02:00
parent e3bca69eaf
commit 6ddbc8ab29
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fetch_blocks.py
View file

@ -29,6 +29,7 @@ for instance in c.fetchall():
# Blocks # Blocks
c.execute("delete from blocks where blocker = ?", (blocker,)) c.execute("delete from blocks where blocker = ?", (blocker,))
json = loads(get(f"https://{blocker}/nodeinfo/2.1.json").text) json = loads(get(f"https://{blocker}/nodeinfo/2.1.json").text)
if "mrf_simple" in json["metadata"]["federation"]:
for mrf in json["metadata"]["federation"]["mrf_simple"]: for mrf in json["metadata"]["federation"]["mrf_simple"]:
for blocked in json["metadata"]["federation"]["mrf_simple"][mrf]: for blocked in json["metadata"]["federation"]["mrf_simple"][mrf]:
if blocked == "": if blocked == "":
@ -38,6 +39,7 @@ for instance in c.fetchall():
c.execute("insert into instances select ?, ?, ?", (blocked, sha256(bytes(blocked, "utf-8")).hexdigest(), get_type(blocked))) c.execute("insert into instances select ?, ?, ?", (blocked, sha256(bytes(blocked, "utf-8")).hexdigest(), get_type(blocked)))
c.execute("insert into blocks select ?, ?, '', ?", (blocker, blocked, mrf)) c.execute("insert into blocks select ?, ?, '', ?", (blocker, blocked, mrf))
# Quarantined Instances # Quarantined Instances
if "quarantined_instances" in json["metadata"]["federation"]:
for blocked in json["metadata"]["federation"]["quarantined_instances"]: for blocked in json["metadata"]["federation"]["quarantined_instances"]:
if blocked == "": if blocked == "":
continue continue
@ -47,9 +49,11 @@ for instance in c.fetchall():
c.execute("insert into blocks select ?, ?, '', 'quarantined_instances'", (blocker, blocked)) c.execute("insert into blocks select ?, ?, '', 'quarantined_instances'", (blocker, blocked))
conn.commit() conn.commit()
# Reasons # Reasons
if "mrf_simple_info" in json["metadata"]["federation"]:
for mrf in json["metadata"]["federation"]["mrf_simple_info"]: for mrf in json["metadata"]["federation"]["mrf_simple_info"]:
for blocked in json["metadata"]["federation"]["mrf_simple_info"][mrf]: for blocked in json["metadata"]["federation"]["mrf_simple_info"][mrf]:
c.execute("update blocks set reason = ? where blocker = ? and blocked = ? and block_level = ?", (json["metadata"]["federation"]["mrf_simple_info"][mrf][blocked]["reason"], blocker, blocked, mrf)) c.execute("update blocks set reason = ? where blocker = ? and blocked = ? and block_level = ?", (json["metadata"]["federation"]["mrf_simple_info"][mrf][blocked]["reason"], blocker, blocked, mrf))
if "quarantined_instances_info" in json["metadata"]["federation"]:
for blocked in json["metadata"]["federation"]["quarantined_instances_info"]["quarantined_instances"]: for blocked in json["metadata"]["federation"]["quarantined_instances_info"]["quarantined_instances"]:
c.execute("update blocks set reason = ? where blocker = ? and blocked = ? and block_level = 'quarantined_instances'", (json["metadata"]["federation"]["quarantined_instances_info"]["quarantined_instances"][blocked]["reason"], blocker, blocked)) c.execute("update blocks set reason = ? where blocker = ? and blocked = ? and block_level = 'quarantined_instances'", (json["metadata"]["federation"]["quarantined_instances_info"]["quarantined_instances"][blocked]["reason"], blocker, blocked))
conn.commit() conn.commit()