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

Use host-meta to find webfinger url, indent-flatten by raise calls

Browse source
This commit is contained in:
jesopo 2019-08-05 15:41:24 +01:00
parent 20042edfd9
commit 357abba00d
1 changed files with 77 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/fediverse.py
View file

@ -1,7 +1,7 @@
import urllib.parse import urllib.parse
from src import ModuleManager, utils from src import ModuleManager, utils
WEBFINGER = "https://%s/.well-known/webfinger" HOSTMETA = "https://%s/.well-known/host-meta"
WEBFINGER_HEADERS = {"Accept": "application/jrd+json"} WEBFINGER_HEADERS = {"Accept": "application/jrd+json"}
ACTIVITY_TYPE = "application/activity+json" ACTIVITY_TYPE = "application/activity+json"
@ -22,12 +22,27 @@ class Module(ModuleManager.BaseModule):
if not username or not instance: if not username or not instance:
raise utils.EventError("Please provide @<user>@<instance>") raise utils.EventError("Please provide @<user>@<instance>")
webfinger = utils.http.request(WEBFINGER % instance, hostmeta = utils.http.request(HOSTMETA % instance,
soup=True, check_content_type=False)
print(hostmeta.data)
webfinger_url = None
for item in hostmeta.data.find_all("link"):
if item["rel"] and item["rel"][0] == "lrdd":
webfinger_url = item["template"]
break
if webfinger_url == None:
raise utils.EventError("host-meta lookup failed for %s" %
instance)
webfinger_url = webfinger_url.replace("{uri}",
"acct:%s" % full_username)
webfinger = utils.http.request(webfinger_url,
headers=WEBFINGER_HEADERS, headers=WEBFINGER_HEADERS,
get_params={"resource": "acct:%s" % full_username}, get_params={"resource": "acct:%s" % full_username},
json=True) json=True)
print(webfinger.data)
if webfinger.data:
activity_url = None activity_url = None
for link in webfinger.data["links"]: for link in webfinger.data["links"]:
if link["type"] == ACTIVITY_TYPE: if link["type"] == ACTIVITY_TYPE:
@ -45,6 +60,7 @@ class Module(ModuleManager.BaseModule):
outbox = utils.http.request(outbox_url, headers=ACTIVITY_HEADERS, outbox = utils.http.request(outbox_url, headers=ACTIVITY_HEADERS,
json=True) json=True)
items = None items = None
if "first" in outbox.data: if "first" in outbox.data:
if type(outbox.data["first"]) == dict: if type(outbox.data["first"]) == dict:
items = outbox.data["first"]["orderedItems"] items = outbox.data["first"]["orderedItems"]
@ -55,7 +71,9 @@ class Module(ModuleManager.BaseModule):
else: else:
items = outbox.data["orderedItems"] items = outbox.data["orderedItems"]
if items: if not items:
raise utils.EventError("No toots found")
first_item = items[0] first_item = items[0]
if first_item["type"] == "Announce": if first_item["type"] == "Announce":
retoot_url = first_item["object"] retoot_url = first_item["object"]
@ -89,5 +107,3 @@ class Module(ModuleManager.BaseModule):
event["stdout"].write("%s: %s - %s" % (preferred_username, event["stdout"].write("%s: %s - %s" % (preferred_username,
content, shorturl)) content, shorturl))
else:
raise utils.EventError("User not found")