[mastodon] support cross-instance user references (#3109)

pull/3119/head
Mike Fährmann 2 years ago
parent 58d97188b4
commit 9a2cfd4421
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -111,9 +111,15 @@ class MastodonUserExtractor(MastodonExtractor):
"count": 60, "count": 60,
}), }),
("https://baraag.net/@pumpkinnsfw"), ("https://baraag.net/@pumpkinnsfw"),
("https://mastodon.social/@yoru_nine@pawoo.net", {
"pattern": r"https://mastodon\.social/media_proxy/\d+/original",
"range": "1-10",
"count": 10,
}),
("https://mastodon.social/@id:10843"), ("https://mastodon.social/@id:10843"),
("https://mastodon.social/users/id:10843"), ("https://mastodon.social/users/id:10843"),
("https://mastodon.social/users/jk"), ("https://mastodon.social/users/jk"),
("https://mastodon.social/users/yoru_nine@pawoo.net"),
) )
def statuses(self): def statuses(self):
@ -211,9 +217,13 @@ class MastodonAPI():
if username.startswith("id:"): if username.startswith("id:"):
return username[3:] return username[3:]
handle = "@{}@{}".format(username, self.extractor.instance) if "@" in username:
handle = "@" + username
else:
handle = "@{}@{}".format(username, self.extractor.instance)
for account in self.account_search(handle, 1): for account in self.account_search(handle, 1):
if account["username"] == username: if account["acct"] == username:
self.extractor._check_move(account) self.extractor._check_move(account)
return account["id"] return account["id"]
raise exception.NotFoundError("account") raise exception.NotFoundError("account")

Loading…
Cancel
Save