Founder of @Mastodon. Film photography, prog metal, Dota 2.
", + "summary": "Founder of @Mastodon. Film photography, prog metal, Dota 2. Likes all things analog.
", "url": "https://mastodon.social/@Gargron", "manuallyApprovesFollowers": false, "discoverable": true, @@ -118,12 +118,12 @@ Endpoint: https://mastodon.social/users/Gargron "icon": { "type": "Image", "mediaType": "image/png", - "url": "https://files.mastodon.social/accounts/avatars/000/000/001/original/1a8137d3b26704e0.png" + "url": "https://files.mastodon.social/accounts/avatars/000/000/001/original/a0a49d80c3de5f75.png" }, "image": { "type": "Image", - "mediaType": "image/png", - "url": "https://files.mastodon.social/accounts/headers/000/000/001/original/e6b0f3cf210ad2a9.png" + "mediaType": "image/jpeg", + "url": "https://files.mastodon.social/accounts/headers/000/000/001/original/d13e4417706a5fec.jpg" } } ``` @@ -236,7 +236,6 @@ Endpoint: https://framapiaf.org/users/peertube } ``` -## App: Firefish, handle ``@kainoa@firefish.social`` ## App: Misskey, handle ``https://misskey.io/@syuilo`` Endpoint: https://misskey.io/users/7rkrarq81i @@ -247,6 +246,7 @@ Endpoint: https://misskey.io/users/7rkrarq81i "https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1", { + "Key": "sec:Key", "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", "sensitive": "as:sensitive", "Hashtag": "as:Hashtag", @@ -282,17 +282,17 @@ Endpoint: https://misskey.io/users/7rkrarq81i "url": "https://misskey.io/@syuilo", "preferredUsername": "syuilo", "name": ":peroro_sama:\u3057\u3085\u3044\u308d:peroro_sama:", - "summary": "Misskey\u3092\u958b\u767a\u3057\u3066\u3044\u308b\u4eba
#misskey #\u85cd\u3061\u3083\u30d5\u30a1\u30f3\u30af\u30e9\u30d6 #\u308f\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc #VisualSnowSyndrome
Misskey\u3092\u958b\u767a\u3057\u3066\u3044\u308b\u4eba
#misskey #\u85cd\u3061\u3083\u30d5\u30a1\u30f3\u30af\u30e9\u30d6 #\u308f\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc\u30fc #VisualSnowSyndrome
\u203b\u81ea\u5206\u306e\u540d\u3092\u9a19\u3063\u305f\u8ff7\u60d1\u30e1\u30fc\u30eb\u306a\u3069\u304c\u78ba\u8a8d\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u81ea\u5206\u306f\u4e00\u5207\u95a2\u4fc2\u3042\u308a\u307e\u305b\u3093\u306e\u3067\u3054\u6ce8\u610f\u304f\u3060\u3055\u3044\u3002
Support / questions about Lemmy.
\n\n", + "source": { + "content": "Support / questions about Lemmy.\n\n[Matrix Space: #lemmy-space](https://matrix.to/#/#lemmy-space:matrix.org)", + "mediaType": "text/markdown" + }, + "sensitive": false, + "attributedTo": "https://lemmy.ml/c/lemmy_support/moderators", + "postingRestrictedToMods": false, + "outbox": "https://lemmy.ml/c/lemmy_support/outbox", + "endpoints": { + "sharedInbox": "https://lemmy.ml/inbox" + }, + "featured": "https://lemmy.ml/c/lemmy_support/featured", + "language": [], + "published": "2019-04-25T16:53:06.109704Z", + "updated": "2023-06-14T21:24:21.959740Z" +} +``` + ## App: Micro.blog, handle ``@manton@manton.org`` Endpoint: https://manton.org/activitypub/manton @@ -1070,7 +1206,7 @@ Endpoint: https://manton.org/activitypub/manton "type": "Person", "preferredUsername": "manton", "name": "Manton Reece", - "summary": "I created Micro.blog. I also have 2 podcasts: Core Intuition and Timetable.", + "summary": "I created Micro.blog. I also have two podcasts: Core Intuition and Timetable.", "inbox": "https://micro.blog/activitypub/manton/inbox", "outbox": "https://micro.blog/activitypub/manton/outbox", "followers": "https://micro.blog/activitypub/manton/followers", @@ -1106,3 +1242,6 @@ Endpoint: https://manton.org/activitypub/manton } ``` +## App: Threads, handle ``@mosseri@threads.net`` +ERROR when attempting to get actor data for @mosseri@threads.net at https://threads.net/.well-known/webfinger?resource=acct%3amosseri%40threads.net. Skipping: HTTP Error 404: Not Found + diff --git a/content/reference/webfinger/index.md b/content/reference/webfinger/index.md index 24435c7..5c674d2 100644 --- a/content/reference/webfinger/index.md +++ b/content/reference/webfinger/index.md @@ -3,12 +3,12 @@ title: Webfinger sample files description: A selection of Webfinger files as produced by common Fediverse apps --- -As of 2023-12-30 15:59:00 UTC. To regenerate, run `make` +As of 2024-04-11 03:35:10 UTC. To regenerate, run `make` in directory `scripts`. ## App: Mastodon, handle ``@gargron@mastodon.social`` -Endpoint: https://mastodon.social/.well-known/webfinger?resource=acct%3agargron@mastodon.social +Endpoint: https://mastodon.social/.well-known/webfinger?resource=acct%3agargron%40mastodon.social ```js { @@ -35,7 +35,7 @@ Endpoint: https://mastodon.social/.well-known/webfinger?resource=acct%3agargron@ { "rel": "http://webfinger.net/rel/avatar", "type": "image/png", - "href": "https://files.mastodon.social/accounts/avatars/000/000/001/original/1a8137d3b26704e0.png" + "href": "https://files.mastodon.social/accounts/avatars/000/000/001/original/a0a49d80c3de5f75.png" } ] } @@ -43,7 +43,7 @@ Endpoint: https://mastodon.social/.well-known/webfinger?resource=acct%3agargron@ ## App: PeerTube, handle ``@peertube@framapiaf.org`` -Endpoint: https://framapiaf.org/.well-known/webfinger?resource=acct%3apeertube@framapiaf.org +Endpoint: https://framapiaf.org/.well-known/webfinger?resource=acct%3apeertube%40framapiaf.org ```js { @@ -76,32 +76,6 @@ Endpoint: https://framapiaf.org/.well-known/webfinger?resource=acct%3apeertube@f } ``` -## App: Firefish, handle ``@kainoa@firefish.social`` - -Endpoint: https://firefish.social/.well-known/webfinger?resource=acct%3akainoa@firefish.social - -```js -{ - "subject": "acct:kainoa@firefish.social", - "links": [ - { - "rel": "self", - "type": "application/activity+json", - "href": "https://firefish.social/users/9aprgabaeb" - }, - { - "rel": "http://webfinger.net/rel/profile-page", - "type": "text/html", - "href": "https://firefish.social/@kainoa" - }, - { - "rel": "http://ostatus.org/schema/1.0/subscribe", - "template": "https://firefish.social/authorize-follow?acct={uri}" - } - ] -} -``` - ## App: Misskey, handle ``https://misskey.io/@syuilo`` Endpoint: https://misskey.io/.well-known/webfinger?resource=https://misskey.io/@syuilo @@ -130,7 +104,7 @@ Endpoint: https://misskey.io/.well-known/webfinger?resource=https://misskey.io/@ ## App: Streams, handle ``@mike@macgirvin.com`` -Endpoint: https://macgirvin.com/.well-known/webfinger?resource=acct%3amike@macgirvin.com +Endpoint: https://macgirvin.com/.well-known/webfinger?resource=acct%3amike%40macgirvin.com ```js { @@ -139,9 +113,7 @@ Endpoint: https://macgirvin.com/.well-known/webfinger?resource=acct%3amike@macgi "https://macgirvin.com/channel/mike", "https://macgirvin.com/~mike", "https://macgirvin.com/@mike", - "https://macgirvin.com/channel/mike", - "acct:mike@fediversity.site", - "https://fediversity.site/channel/mike" + "https://macgirvin.com/channel/mike" ], "properties": { "http://webfinger.net/ns/name": "Mike Macgirvin", @@ -202,10 +174,86 @@ Endpoint: https://macgirvin.com/.well-known/webfinger?resource=acct%3amike@macgi } ``` -## App: Hubzilla, handle ``@contribute@hubzilla.org`` +## App: Hubzilla, handle ``@scott@authorship.studio`` + +Endpoint: https://authorship.studio/.well-known/webfinger?resource=acct%3ascott%40authorship.studio + +```js +{ + "subject": "acct:scott@authorship.studio", + "aliases": [ + "https://authorship.studio/channel/scott", + "https://authorship.studio/~scott", + "https://authorship.studio/@scott", + "acct:scott@biztechtonics.net", + "acct:scott@completehostingguide.com", + "acct:scott@wistex.biz", + "acct:scott@scottstolz.com" + ], + "properties": { + "http://webfinger.net/ns/name": "Scott M. Stolz", + "http://xmlns.com/foaf/0.1/name": "Scott M. Stolz", + "https://w3id.org/security/v1#publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvBaccO+wjQ9hQ6cb23a1\nCV0cv8QVH7Cu/KR55ogX5uJ+IW4uMcxmLQkyw/5oFbZOgjvDxm7zDqkDp45R2aIC\nyRmcpjSy2+sREM7OBzin9GY3N4EYrXNdl6eamrSk8v3gArIe/UbwoEzXzM4lcvut\nZGqgjoo/42j1eaAYGG/Wyzs7K3GFVJBOwYS6us/k9noF8sUE+vJI0c9UEbODNfyU\nsPC+R/n++lECAkV04a/FDqCztkqExtz2xpXnNs+yuHij4e1g3QAvcaUmIKhD2DzG\nU70pt1y4q9vZ+U/D092wGQ6fQ48r6/GG9c4yWwOxeKZfT0E8Bg5YP3NW6aGxrZA4\nOKkW3UFhTWFlBK/7DNcsuzZBA8Svt5kjJYO89xYfTAQ3ywgkKQG13/KdF2iRzlCS\nBv5qq2obBsdqOfoibd9la4tC0RY6R934DLlhHvGX57gKtbm1Fc1fOXwCYd5YMXPa\n1ewG2dD02fZ4h1zeZL2uqlzkrSEE6tiMcaux7I63q1y0MW2NFIp8i65BeSsHDcKR\n1khiDmjxN+OZLgJ7PpJM6C7xKj1V/YxP8lD5uCFFUlD9v4F1j1wa0aQ+I9nOfVwJ\nRcfCyQvXDWyen9vne8XOXV1Kb8qm7FCyrUs4WHt5AZaXC5em+RMlFM7eY+YAnxcs\nRAMnWdbqj5wXroPxEypQn60CAwEAAQ==\n-----END PUBLIC KEY-----\n", + "http://purl.org/zot/federation": "zot6,activitypub" + }, + "links": [ + { + "rel": "http://webfinger.net/rel/avatar", + "type": "", + "href": "https://authorship.studio/photo/profile/l/4" + }, + { + "rel": "http://microformats.org/profile/hcard", + "type": "text/html", + "href": "https://authorship.studio/hcard/scott" + }, + { + "rel": "http://openid.net/specs/connect/1.0/issuer", + "href": "https://authorship.studio" + }, + { + "rel": "http://webfinger.net/rel/profile-page", + "href": "https://authorship.studio/profile/scott" + }, + { + "rel": "http://webfinger.net/rel/blog", + "href": "https://authorship.studio/channel/scott" + }, + { + "rel": "http://ostatus.org/schema/1.0/subscribe", + "template": "https://authorship.studio/follow?f=&url={uri}" + }, + { + "rel": "http://purl.org/zot/protocol/6.0", + "type": "application/x-zot+json", + "href": "https://authorship.studio/channel/scott" + }, + { + "rel": "http://purl.org/openwebauth/v1", + "type": "application/x-zot+json", + "href": "https://authorship.studio/owa" + }, + { + "rel": "magic-public-key", + "href": "data:application/magic-public-key,RSA.vBaccO-wjQ9hQ6cb23a1CV0cv8QVH7Cu_KR55ogX5uJ-IW4uMcxmLQkyw_5oFbZOgjvDxm7zDqkDp45R2aICyRmcpjSy2-sREM7OBzin9GY3N4EYrXNdl6eamrSk8v3gArIe_UbwoEzXzM4lcvutZGqgjoo_42j1eaAYGG_Wyzs7K3GFVJBOwYS6us_k9noF8sUE-vJI0c9UEbODNfyUsPC-R_n--lECAkV04a_FDqCztkqExtz2xpXnNs-yuHij4e1g3QAvcaUmIKhD2DzGU70pt1y4q9vZ-U_D092wGQ6fQ48r6_GG9c4yWwOxeKZfT0E8Bg5YP3NW6aGxrZA4OKkW3UFhTWFlBK_7DNcsuzZBA8Svt5kjJYO89xYfTAQ3ywgkKQG13_KdF2iRzlCSBv5qq2obBsdqOfoibd9la4tC0RY6R934DLlhHvGX57gKtbm1Fc1fOXwCYd5YMXPa1ewG2dD02fZ4h1zeZL2uqlzkrSEE6tiMcaux7I63q1y0MW2NFIp8i65BeSsHDcKR1khiDmjxN-OZLgJ7PpJM6C7xKj1V_YxP8lD5uCFFUlD9v4F1j1wa0aQ-I9nOfVwJRcfCyQvXDWyen9vne8XOXV1Kb8qm7FCyrUs4WHt5AZaXC5em-RMlFM7eY-YAnxcsRAMnWdbqj5wXroPxEypQn60.AQAB" + }, + { + "rel": "self", + "type": "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", + "href": "https://authorship.studio/channel/scott" + }, + { + "rel": "self", + "type": "application/activity+json", + "href": "https://authorship.studio/channel/scott" + } + ] +} +``` + ## App: GNU Social, handle ``@administrator@gnusocial.net`` -Endpoint: https://gnusocial.net/.well-known/webfinger?resource=acct%3aadministrator@gnusocial.net +Endpoint: https://gnusocial.net/.well-known/webfinger?resource=acct%3aadministrator%40gnusocial.net ```js { @@ -290,7 +338,7 @@ Endpoint: https://gnusocial.net/.well-known/webfinger?resource=acct%3aadministra ## App: Pleroma, handle ``@karolat@stereophonic.space`` -Endpoint: https://stereophonic.space/.well-known/webfinger?resource=acct%3akarolat@stereophonic.space +Endpoint: https://stereophonic.space/.well-known/webfinger?resource=acct%3akarolat%40stereophonic.space ```js { @@ -324,7 +372,7 @@ Endpoint: https://stereophonic.space/.well-known/webfinger?resource=acct%3akarol ## App: Pixelfed, handle ``@dansup@pixelfed.social`` -Endpoint: https://pixelfed.social/.well-known/webfinger?resource=acct%3adansup@pixelfed.social +Endpoint: https://pixelfed.social/.well-known/webfinger?resource=acct%3adansup%40pixelfed.social ```js { @@ -348,6 +396,11 @@ Endpoint: https://pixelfed.social/.well-known/webfinger?resource=acct%3adansup@p "rel": "self", "type": "application/activity+json", "href": "https://pixelfed.social/users/dansup" + }, + { + "rel": "http://webfinger.net/rel/avatar", + "type": "image/jpeg", + "href": "https://pixelfed.social/storage/avatars/000/000/000/000/000/000/2/mLZr2R47XEwbmasH2M3P_avatar.jpg?v=57" } ] } @@ -355,14 +408,16 @@ Endpoint: https://pixelfed.social/.well-known/webfinger?resource=acct%3adansup@p ## App: Friendica, handle ``@tobias@friendi.ca`` -Endpoint: https://friendi.ca/.well-known/webfinger?resource=acct%3atobias@friendi.ca +Endpoint: https://friendi.ca/.well-known/webfinger?resource=acct%3atobias%40friendi.ca ```js { "subject": "acct:tobias@friendi.ca", "aliases": [ "acct:tobias@friendi.ca", - "https://friendi.ca/author/tobias/" + "https://friendi.ca/author/tobias/", + "https://friendi.ca/author/tobias/", + "https://friendi.ca/@tobias" ], "links": [ { @@ -385,7 +440,7 @@ Endpoint: https://friendi.ca/.well-known/webfinger?resource=acct%3atobias@friend ## App: Funkwhale, handle ``@Greensky@open.audio`` -Endpoint: https://open.audio/.well-known/webfinger?resource=acct%3aGreensky@open.audio +Endpoint: https://open.audio/.well-known/webfinger?resource=acct%3aGreensky%40open.audio ```js { @@ -405,7 +460,7 @@ Endpoint: https://open.audio/.well-known/webfinger?resource=acct%3aGreensky@open ## App: WriteFreely, handle ``@matt@write.as`` -Endpoint: https://write.as/.well-known/webfinger?resource=acct%3amatt@write.as +Endpoint: https://write.as/.well-known/webfinger?resource=acct%3amatt%40write.as ```js { @@ -431,7 +486,7 @@ Endpoint: https://write.as/.well-known/webfinger?resource=acct%3amatt@write.as ## App: Plume, handle ``@actapopuli@fediverse.blog`` -Endpoint: https://fediverse.blog/.well-known/webfinger?resource=acct%3aactapopuli@fediverse.blog +Endpoint: https://fediverse.blog/.well-known/webfinger?resource=acct%3aactapopuli%40fediverse.blog ```js { @@ -465,7 +520,7 @@ Endpoint: https://fediverse.blog/.well-known/webfinger?resource=acct%3aactapopul ## App: Mobilizon, handle ``@framasoft@mobilizon.fr`` -Endpoint: https://mobilizon.fr/.well-known/webfinger?resource=acct%3aframasoft@mobilizon.fr +Endpoint: https://mobilizon.fr/.well-known/webfinger?resource=acct%3aframasoft%40mobilizon.fr ```js { @@ -498,9 +553,35 @@ Endpoint: https://mobilizon.fr/.well-known/webfinger?resource=acct%3aframasoft@m ``` ## App: Lemmy, handle ``@lemmy_support@lemmy.ml`` + +Endpoint: https://lemmy.ml/.well-known/webfinger?resource=acct%3alemmy_support%40lemmy.ml + +```js +{ + "subject": "acct:lemmy_support@lemmy.ml", + "links": [ + { + "rel": "http://webfinger.net/rel/profile-page", + "type": "text/html", + "href": "https://lemmy.ml/c/lemmy_support", + "template": null + }, + { + "rel": "self", + "type": "application/activity+json", + "href": "https://lemmy.ml/c/lemmy_support", + "template": null, + "properties": { + "https://www.w3.org/ns/activitystreams#type": "Group" + } + } + ] +} +``` + ## App: Micro.blog, handle ``@manton@manton.org`` -Endpoint: https://manton.org/.well-known/webfinger?resource=acct%3amanton@manton.org +Endpoint: https://manton.org/.well-known/webfinger?resource=acct%3amanton%40manton.org ```js { @@ -524,3 +605,25 @@ Endpoint: https://manton.org/.well-known/webfinger?resource=acct%3amanton@manton } ``` +## App: Threads, handle ``@mosseri@threads.net`` + +Endpoint: https://threads.net/.well-known/webfinger?resource=acct%3amosseri%40threads.net + +```js +{ + "subject": "acct:mosseri@threads.net", + "links": [ + { + "href": "https://www.threads.net/ap/users/mosseri/", + "rel": "self", + "type": "application/activity+json" + }, + { + "href": "https://www.threads.net/@mosseri", + "rel": "http://webfinger.net/rel/profile-page", + "type": "text/html" + } + ] +} +``` + diff --git a/scripts/generate-samples/generate-samples.py b/scripts/generate-samples/generate-samples.py index 06713d0..8296025 100755 --- a/scripts/generate-samples/generate-samples.py +++ b/scripts/generate-samples/generate-samples.py @@ -3,7 +3,7 @@ # Generate documentation pages with samples of webfinger and actor files # from various Fediverse servers/apps # -# (C) 2023 Johannes Ernst, BSD 3-clause license +# (C) 2023-2024 Johannes Ernst, BSD 3-clause license # import argparse @@ -13,15 +13,34 @@ import urllib.request -def readAccountsFile( fileName ) : - with open( fileName, 'r' ) as fd : - sampleAccountsContent = fd.read() +USER_AGENT = 'fedidevs.org/reference' +# The default python user agent appears to be blocked by various fediverse servers. +# We might as well say who we are - return json.loads( sampleAccountsContent ) +def read_accounts_file(file_name : str) -> dict: + with open( file_name, 'r' ) as fd : + sample_accounts_content = fd.read() -def emitHeader( title, description, outFd ) : - outFd.write( f"""--- + return json.loads( sample_accounts_content ) + + +def handle_to_webfinger_endpoint(handle : str) -> str: + match = re.match("@([^@]+)@([^@]+)", handle) + if match: + ret = f"https://{ match.group(2) }/.well-known/webfinger?resource=acct%3a{ match.group(1) }%40{ match.group(2) }" + return ret + + match = re.match("https://([^/]+)/", handle) + if match: + ret = f"https://{ match.group(1) }/.well-known/webfinger?resource={ handle }" + return ret + + raise ValueError('Cannot parse: ' + handle) + + +def emit_header(title : str, description : str, out_fd : 'file') : + out_fd.write( f"""--- title: {title} description: {description} --- @@ -32,110 +51,99 @@ def emitHeader( title, description, outFd ) : """ ) -def emitWebfinger( app, handle, outFd ) : +def emit_webfinger(app : str, handle : str, out_fd : 'file' ) : try : - outFd.write( f"## App: {app}, handle ``{handle}``\n" ) - wfUrl = handleToWebfingerEndpoint( handle ) - wfContent = urllib.request.urlopen( urllib.request.Request( wfUrl, headers={ 'User-Agent' : '' } )).read() - # The default python user agent produces HTTP 403 on misskey.io -- no idea why - wfJson = json.loads( wfContent.decode( 'utf-8' )) - - outFd.write( "\n") - outFd.write( f"Endpoint: {wfUrl}\n" ) - outFd.write( "\n") - outFd.write( "```js\n" ) - outFd.write( json.dumps( wfJson, indent=2 )) - outFd.write( "\n") - outFd.write( "```\n" ) - outFd.write( "\n") + out_fd.write(f"## App: {app}, handle ``{handle}``\n") + wf_url = handle_to_webfinger_endpoint(handle) + wf_content = urllib.request.urlopen(urllib.request.Request(wf_url, headers={ 'User-Agent' : USER_AGENT } )).read() + wf_json = json.loads(wf_content.decode('utf-8')) + + out_fd.write("\n") + out_fd.write(f"Endpoint: {wf_url}\n" ) + out_fd.write("\n") + out_fd.write("```js\n" ) + out_fd.write(json.dumps( wf_json, indent=2)) + out_fd.write("\n") + out_fd.write("```\n" ) + out_fd.write("\n") except Exception as e: - print( f"ERROR when attempting to get webfinger data for {handle} at {wfUrl}. Skipping: {e}") + out_fd.write(f"ERROR when attempting to get webfinger data for {handle} at {wf_url}. Skipping: {e}\n") + out_fd.write("\n") + print( f"ERROR when attempting to get webfinger data for {handle} at {wf_url}. Skipping: {e}") -def emitActor( app, handle, outFd ) : +def emit_actor(app : str, handle : str, out_fd : 'file' ) : try : - outFd.write( f"## App: {app}, handle ``{handle}``\n" ) - wfUrl = handleToWebfingerEndpoint( handle ) - wfContent = urllib.request.urlopen( urllib.request.Request( wfUrl, headers={ 'User-Agent' : '' } )).read() - # The default python user agent produces HTTP 403 on misskey.io -- no idea why - wfJson = json.loads( wfContent.decode( 'utf-8' )) + out_fd.write(f"## App: {app}, handle ``{handle}``\n" ) + wf_url = handle_to_webfinger_endpoint( handle ) + wf_content = urllib.request.urlopen(urllib.request.Request(wf_url, headers={ 'User-Agent' : USER_AGENT } )).read() + wf_json = json.loads(wf_content.decode( 'utf-8' )) except Exception as e: - print( f"ERROR when attempting to get webfinger data for {handle} at {wfUrl}. Skipping: {e}") + out_fd.write(f"ERROR when attempting to get webfinger data for {handle} at {wf_url}. Skipping: {e}\n") + out_fd.write("\n") + print( f"ERROR when attempting to get webfinger data for {handle} at {wf_url}. Skipping: {e}") return try : - actorUrl = None - for wfLinkJson in wfJson['links'] : - if 'type' in wfLinkJson and wfLinkJson['type'] == 'application/activity+json' : - actorUrl = wfLinkJson['href'] + actor_url = None + for wf_link_json in wf_json['links'] : + if 'type' in wf_link_json and wf_link_json['type'] == 'application/activity+json' : + actor_url = wf_link_json['href'] break - if actorUrl : - actorContent = urllib.request.urlopen( urllib.request.Request( actorUrl, headers={ 'Accept' : 'application/activity+json', 'User-Agent' : '' } )).read() - # The default python user agent produces HTTP 403 on misskey.io -- no idea why - actorJson = json.loads( actorContent.decode( 'utf-8' )) + if actor_url : + actor_content = urllib.request.urlopen( urllib.request.Request( actor_url, headers={ 'Accept' : 'application/activity+json', 'User-Agent' : USER_AGENT } )).read() + actor_json = json.loads(actor_content.decode('utf-8')) - outFd.write( "\n") - outFd.write( f"Endpoint: {actorUrl}\n" ) - outFd.write( "\n") - outFd.write( "```js\n" ) - outFd.write( json.dumps( actorJson, indent=2 )) - outFd.write( "\n") - outFd.write( "```\n" ) - outFd.write( "\n") + out_fd.write("\n") + out_fd.write(f"Endpoint: {actor_url}\n" ) + out_fd.write("\n") + out_fd.write("```js\n" ) + out_fd.write(json.dumps( actor_json, indent=2 )) + out_fd.write("\n") + out_fd.write("```\n" ) + out_fd.write("\n") else : - outFd.write( "Actor JSON not found.\n" ) - outFd.write( "\n") + out_fd.write( "Actor JSON not found.\n" ) + out_fd.write( "\n") except Exception as e: - print( f"ERROR when attempting to get actor data for {handle} at {wfUrl}. Skipping: {e}") + out_fd.write(f"ERROR when attempting to get actor data for {handle} at {wf_url}. Skipping: {e}\n") + out_fd.write("\n") + print(f"ERROR when attempting to get actor data for {handle} at {wf_url}. Skipping: {e}") -def emitFooter( outFd ) : +def emit_footer( out_fd : 'file') : pass -def handleToWebfingerEndpoint( handle ) : - match = re.match( "@([^@]+)@([^@]+)", handle ) - if match : - ret = f"https://{ match.group(2) }/.well-known/webfinger?resource=acct%3a{ match.group(1) }@{ match.group(2) }" - return ret - - match = re.match( "https://([^/]+)/", handle ) - if match : - ret = f"https://{ match.group(1) }/.well-known/webfinger?resource={ handle }" - return ret - - raise ValueError( 'Cannot parse: ' + handle ) - - -parser = argparse.ArgumentParser( description='Generate webfinger samples for the docs' ) -parser.add_argument( '--account-file', help='Name of a JSON file that contains the sample accounts') -parser.add_argument( '--type', choices=['webfinger', 'actor'], required=True, help='Generate webfinger samples or actor file samples') -parser.add_argument( '-o', '--out', help='Name of the output file' ) +parser = argparse.ArgumentParser(description='Generate webfinger samples for the docs') +parser.add_argument('--account-file', help='Name of a JSON file that contains the sample accounts') +parser.add_argument('--type', choices=['webfinger', 'actor'], required=True, help='Generate webfinger samples or actor file samples') +parser.add_argument('-o', '--out', help='Name of the output file' ) args = parser.parse_args() -sampleAccountsJson = readAccountsFile( args.account_file ) +sampleAccountsJson = read_accounts_file( args.account_file ) -with open( args.out, 'w' ) as outFd : +with open(args.out, 'w') as out_fd : if args.type == 'webfinger' : - emitHeader( 'Webfinger sample files', 'A selection of Webfinger files as produced by common Fediverse apps', outFd ) + emit_header( 'Webfinger sample files', 'A selection of Webfinger files as produced by common Fediverse apps', out_fd ) else : - emitHeader( 'Actor sample files', 'A selection of Actor files as produced by common Fediverse apps', outFd ) + emit_header( 'Actor sample files', 'A selection of Actor files as produced by common Fediverse apps', out_fd ) for app in sampleAccountsJson : for handle in sampleAccountsJson[app] : if 'disabled' in sampleAccountsJson[app][handle] : - print( f"Skipping {handle}: disabled" ) + print(f"Skipping {handle}: disabled") else : - print( f"Working on: {handle}" ) + print(f"Working on: {handle}") if args.type == 'webfinger' : - emitWebfinger( app, handle, outFd ) + emit_webfinger(app, handle, out_fd) else : - emitActor( app, handle, outFd ) + emit_actor(app, handle, out_fd) - emitFooter( outFd ) + emit_footer(out_fd) diff --git a/scripts/generate-samples/sample-accounts.json b/scripts/generate-samples/sample-accounts.json index 0993f39..14893bc 100644 --- a/scripts/generate-samples/sample-accounts.json +++ b/scripts/generate-samples/sample-accounts.json @@ -5,9 +5,6 @@ "PeerTube": { "@peertube@framapiaf.org": {} }, - "Firefish": { - "@kainoa@firefish.social": {} - }, "Misskey": { "https://misskey.io/@syuilo": {} }, @@ -15,7 +12,7 @@ "@mike@macgirvin.com": {} }, "Hubzilla": { - "@contribute@hubzilla.org": {} + "@scott@authorship.studio": {} }, "GNU Social": { "@administrator@gnusocial.net": {} @@ -46,5 +43,8 @@ }, "Micro.blog": { "@manton@manton.org": {} + }, + "Threads": { + "@mosseri@threads.net": {} } }