Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

tolerate a server not having a host-meta

Browse source
This commit is contained in:
jesopo 2020-03-08 18:43:49 +00:00
parent 13943e84a2
commit 142d181048
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/fediverse/ap_utils.py
View file

@ -39,15 +39,17 @@ class FindActorException(Exception):
pass pass
def find_actor(username, instance): def find_actor(username, instance):
hostmeta = HOSTMETA_TEMPLATE % instance hostmeta_url = HOSTMETA_TEMPLATE % instance
hostmeta_request = utils.http.Request(HOSTMETA_TEMPLATE % instance) hostmeta_request = utils.http.Request(hostmeta_url)
try: try:
hostmeta = utils.http.request(hostmeta_request) hostmeta = utils.http.request(hostmeta_request)
except: except:
raise FindActorException("Failed to get host-meta for %s" % instance) # failed to GET hostmeta; this is an optional step for servers that do
# not host their webfinger at the usual URL (see WEBFINGER_TEMPLATE)
hostmeta = None
webfinger_url = None webfinger_url = None
if hostmeta.code == 200: if hostmeta and hostmeta.code == 200:
for item in hostmeta.soup().find_all("link"): for item in hostmeta.soup().find_all("link"):
if item["rel"] and item["rel"][0] == "lrdd": if item["rel"] and item["rel"][0] == "lrdd":
webfinger_url = item["template"] webfinger_url = item["template"]