sim1222/fedi-block-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only clear blocks if theres no error

Browse Source
This commit is contained in:
Enju Aihara 2022-03-05 09:41:11 +01:00
parent ad7bc06709
commit bea677e585
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fetch_blocks.py
View File

@ -8,9 +8,8 @@ c = conn.cursor()
with open("pleroma_instances.txt", "r") as f: with open("pleroma_instances.txt", "r") as f:
while blocker := f.readline().strip(): while blocker := f.readline().strip():
print(blocker) print(blocker)
c.execute("delete from blocks where blocker = ?", (blocker,))
conn.commit()
try: try:
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)
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]:
@ -30,9 +29,8 @@ with open("pleroma_instances.txt", "r") as f:
with open("mastodon_instances.txt", "r") as f: with open("mastodon_instances.txt", "r") as f:
while blocker := f.readline().strip(): while blocker := f.readline().strip():
print(blocker) print(blocker)
c.execute("delete from blocks where blocker = ?", (blocker,))
conn.commit()
try: try:
c.execute("delete from blocks where blocker = ?", (blocker,))
json = loads(get(f"http://127.0.0.1:8069/{blocker}").text) json = loads(get(f"http://127.0.0.1:8069/{blocker}").text)
for blocked in json["reject"]: for blocked in json["reject"]:
if blocked["domain"].count("*") > 1: if blocked["domain"].count("*") > 1: