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

changed how dicts are merged

Browse Source
This commit is contained in:
Enju Aihara 2022-04-23 14:12:21 +02:00
parent dc3d83c345
commit 0a19dd55d3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fetch_blocks.py
View File

@ -95,8 +95,8 @@ for blocker, software in c.fetchall():
).json()["metadata"]["federation"] ).json()["metadata"]["federation"]
if "mrf_simple" in federation: if "mrf_simple" in federation:
for block_level, blocks in ( for block_level, blocks in (
federation["mrf_simple"] {**federation["mrf_simple"],
| {"quarantined_instances": federation["quarantined_instances"]} **{"quarantined_instances": federation["quarantined_instances"]}}
).items(): ).items():
for blocked in blocks: for blocked in blocks:
if blocked == "": if blocked == "":
@ -122,10 +122,10 @@ for blocker, software in c.fetchall():
# Reasons # Reasons
if "mrf_simple_info" in federation: if "mrf_simple_info" in federation:
for block_level, info in ( for block_level, info in (
federation["mrf_simple_info"] {**federation["mrf_simple_info"],
| federation["quarantined_instances_info"] **(federation["quarantined_instances_info"]
if "quarantined_instances_info" in federation if "quarantined_instances_info" in federation
else {} else {})}
).items(): ).items():
for blocked, reason in info.items(): for blocked, reason in info.items():
c.execute( c.execute(