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

Fix for instance detection

Browse Source
This commit is contained in:
Mint 2022-08-06 18:19:26 +03:00
parent a7d98c64f2
commit deee4b248d
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_instances.py
View File

@ -24,20 +24,20 @@ def get_peers(domain: str) -> str:
peerlist = get_peers(domain) peerlist = get_peers(domain)
def get_type(domain: str) -> str: def get_type(instdomain: str) -> str:
try: try:
res = get(f"https://{domain}/nodeinfo/2.1.json", headers=headers, timeout=5) res = get(f"https://{instdomain}/nodeinfo/2.1.json", headers=headers, timeout=5)
if res.status_code == 404: if res.status_code == 404:
res = get(f"https://{domain}/nodeinfo/2.0.json", headers=headers, timeout=5) res = get(f"https://{instdomain}/nodeinfo/2.0.json", headers=headers, timeout=5)
if res.ok and "text/html" in res.headers["content-type"]: if res.ok and "text/html" in res.headers["content-type"]:
res = get(f"https://{domain}/nodeinfo/2.1", headers=headers, timeout=5) res = get(f"https://{instdomain}/nodeinfo/2.1", headers=headers, timeout=5)
if res.ok: if res.ok:
if res.json()["software"]["name"] == "akkoma": if res.json()["software"]["name"] == "akkoma":
return "pleroma" return "pleroma"
else: else:
return res.json()["software"]["name"] return res.json()["software"]["name"]
elif res.status_code == 404: elif res.status_code == 404:
res = get(f"https://{domain}/api/v1/instance", headers=headers, timeout=5) res = get(f"https://{instdomain}/api/v1/instance", headers=headers, timeout=5)
if res.ok: if res.ok:
return "mastodon" return "mastodon"
except: except: