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

dont delete blocks

Browse Source
This commit is contained in:
Enju Aihara 2022-04-16 22:43:28 +02:00
parent eec20e4659
commit 5862133eb8
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fetch_blocks.py
View File

@ -75,7 +75,6 @@ for blocker, software in c.fetchall():
print(blocker) print(blocker)
try: try:
# Blocks # Blocks
c.execute("delete from blocks where blocker = ?", (blocker,))
federation = get( federation = get(
f"https://{blocker}/nodeinfo/2.1.json", headers=headers, timeout=5 f"https://{blocker}/nodeinfo/2.1.json", headers=headers, timeout=5
).json()["metadata"]["federation"] ).json()["metadata"]["federation"]
@ -96,9 +95,14 @@ for blocker, software in c.fetchall():
(blocked, get_hash(blocked), get_type(blocked)), (blocked, get_hash(blocked), get_type(blocked)),
) )
c.execute( c.execute(
"insert into blocks select ?, ?, '', ?", "select * from blocks where blocker = ? and blocked = ? and block_level = ?",
(blocker, blocked, block_level), (blocker, blocked, block_level),
) )
if c.fetchone() == None:
c.execute(
"insert into blocks select ?, ?, '', ?",
(blocker, blocked, block_level),
)
conn.commit() conn.commit()
# Reasons # Reasons
if "mrf_simple_info" in federation: if "mrf_simple_info" in federation:
@ -119,7 +123,6 @@ for blocker, software in c.fetchall():
elif software == "mastodon": elif software == "mastodon":
print(blocker) print(blocker)
try: try:
c.execute("delete from blocks where blocker = ?", (blocker,))
json = get_mastodon_blocks(blocker) json = get_mastodon_blocks(blocker)
for block_level, blocks in json.items(): for block_level, blocks in json.items():
for instance in blocks: for instance in blocks:
@ -134,14 +137,19 @@ for blocker, software in c.fetchall():
(blocked, get_hash(blocked), get_type(blocked)), (blocked, get_hash(blocked), get_type(blocked)),
) )
c.execute( c.execute(
"insert into blocks select ?, ?, ?, ?", "select * from blocks where blocker = ? and blocked = ? and block_level = ?",
( (blocker, blocked, block_level),
blocker,
blocked if blocked.count("*") <= 1 else blocked_hash,
reason,
block_level,
),
) )
if c.fetchone() == None:
c.execute(
"insert into blocks select ?, ?, ?, ?",
(
blocker,
blocked if blocked.count("*") <= 1 else blocked_hash,
reason,
block_level,
),
)
conn.commit() conn.commit()
except Exception as e: except Exception as e:
print("error:", e, blocker) print("error:", e, blocker)