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

use "id" not "url", support boosts

Browse source
This commit is contained in:
jesopo 2019-08-02 16:21:11 +01:00
parent 85c1222b54
commit b58c0f8b59
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/fediverse.py
View file

@ -1,3 +1,4 @@
import urllib.parse
from src import ModuleManager, utils from src import ModuleManager, utils
WEBFINGER = "https://%s/.well-known/webfinger" WEBFINGER = "https://%s/.well-known/webfinger"
@ -49,11 +50,36 @@ class Module(ModuleManager.BaseModule):
items = outbox.data["orderedItems"] items = outbox.data["orderedItems"]
if items: if items:
first_item = items[0]["object"]["content"] first_item = items[0]
first_item = utils.http.strip_html(first_item) if first_item["type"] == "Announce":
url = items[0]["object"]["url"] retoot_url = first_item["object"]
retoot_instance = urllib.parse.urlparse(retoot_url).hostname
retoot = utils.http.request(retoot_url,
headers=ACTIVITY_HEADERS, json=True)
original_tooter_url = retoot.data["attributedTo"]
original_tooter = utils.http.request(original_tooter_url,
headers=ACTIVITY_HEADERS, json=True)
retooted_user = "@%s@%s" % (
original_tooter.data["preferredUsername"],
retoot_instance)
shorturl = self.exports.get_one("shorturl")(
event["server"], retoot_url)
retoot_content = utils.http.strip_html(
retoot.data["content"])
event["stdout"].write("%s (boost %s): %s - %s" % (
preferred_username, retooted_user, retoot_content,
shorturl))
elif first_item["type"] == "Note":
content = utils.http.strip_html(
first_item["object"]["content"])
url = first_itme["object"]["id"]
shorturl = self.exports.get_one("shorturl")( shorturl = self.exports.get_one("shorturl")(
event["server"], url) event["server"], url)
event["stdout"].write("%s: %s - %s" % (preferred_username, event["stdout"].write("%s: %s - %s" % (preferred_username,
first_item, shorturl)) content, shorturl))