From ca8f991389e309c3f2b7246320313a2269362a19 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Thu, 14 Nov 2024 12:44:05 -0500 Subject: [PATCH] . --- .gitignore | 2 +- package-lock.json | 3 +- package.json | 2 +- .../static/functions/.well-known/nodeinfo.js | 17 ------- .../static/functions/.well-known/webfinger.js | 20 -------- .../functions/api/activitypub/nodeinfo.js | 45 ------------------ .../functions/api/activitypub/outbox.js | 46 ------------------- .../functions/api/activitypub/users/evan.js | 44 ------------------ 8 files changed, 4 insertions(+), 175 deletions(-) delete mode 100644 sites/ewpratten.com/static/functions/.well-known/nodeinfo.js delete mode 100644 sites/ewpratten.com/static/functions/.well-known/webfinger.js delete mode 100644 sites/ewpratten.com/static/functions/api/activitypub/nodeinfo.js delete mode 100644 sites/ewpratten.com/static/functions/api/activitypub/outbox.js delete mode 100644 sites/ewpratten.com/static/functions/api/activitypub/users/evan.js diff --git a/.gitignore b/.gitignore index 7587a7d..b99ee13 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk -/public/ +/sites/*/public/ /node_modules/ diff --git a/package-lock.json b/package-lock.json index 026b599..beeb732 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "devDependencies": { - "wrangler": "2.21.1" + "wrangler": "^2.21.1" } }, "node_modules/@cloudflare/kv-asset-handler": { @@ -1524,6 +1524,7 @@ "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-2.21.1.tgz", "integrity": "sha512-gPLqLHUvIR1TVLc2fARtIJ4UNVpTTMbxXKCZyLqGuLmbYPFQhvNKlct2eyfAYuYaTOr8g7VxswMn2mFab1Gu5A==", "dev": true, + "license": "MIT OR Apache-2.0", "dependencies": { "@cloudflare/kv-asset-handler": "^0.2.0", "@esbuild-plugins/node-globals-polyfill": "^0.1.1", diff --git a/package.json b/package.json index 72b28a2..645152f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "wrangler": "2.21.1" + "wrangler": "^2.21.1" }, "scripts": { "wrangler": "wrangler" diff --git a/sites/ewpratten.com/static/functions/.well-known/nodeinfo.js b/sites/ewpratten.com/static/functions/.well-known/nodeinfo.js deleted file mode 100644 index bb7d173..0000000 --- a/sites/ewpratten.com/static/functions/.well-known/nodeinfo.js +++ /dev/null @@ -1,17 +0,0 @@ -export function onRequest(context) { - return new Response( - JSON.stringify({ - "links": [ - { - "href": "https://ewpratten.com/api/activitypub/nodeinfo", - "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0" - } - ] - }), - { - headers: { - "Content-Type": "application/jrd+json", - }, - } - ) -} \ No newline at end of file diff --git a/sites/ewpratten.com/static/functions/.well-known/webfinger.js b/sites/ewpratten.com/static/functions/.well-known/webfinger.js deleted file mode 100644 index ba53e1d..0000000 --- a/sites/ewpratten.com/static/functions/.well-known/webfinger.js +++ /dev/null @@ -1,20 +0,0 @@ -export function onRequest(context) { - return new Response( - JSON.stringify({ - "subject": "acct:evan@ewpratten.com", - "aliases": [], - "links": [ - { - "rel": "self", - "type": "application/activity+json", - "href": "https://ewpratten.com/api/activitypub/users/evan" - } - ] - }), - { - headers: { - "Content-Type": "application/jrd+json", - }, - } - ) -} \ No newline at end of file diff --git a/sites/ewpratten.com/static/functions/api/activitypub/nodeinfo.js b/sites/ewpratten.com/static/functions/api/activitypub/nodeinfo.js deleted file mode 100644 index ced0865..0000000 --- a/sites/ewpratten.com/static/functions/api/activitypub/nodeinfo.js +++ /dev/null @@ -1,45 +0,0 @@ -const RSS_ITEM_PATTERN = /\s+([^<]+)<\/title>\s+<pubDate>([^<]+)<\/pubDate>\s+<author>([^<]+)<\/author>\s+<link>([^<]+)<\/link>\s+<guid>([^<]+)<\/guid>\s+<description[^>]+>([^<]+)<\/description>\s+<\/item>/gm; - -export async function onRequest(context) { - - // Request our own RSS feed - let rss_feed = await fetch("https://ewpratten.com/feed.xml"); - - // Parse the RSS feed - let rss_data = await rss_feed.text(); - let items = rss_data.matchAll(RSS_ITEM_PATTERN); - - // Generate the outbox content - return new Response( - JSON.stringify({ - "metadata": {}, - "openRegistrations": false, - "protocols": [ - "activitypub" - ], - "services": { - "inbound": [], - "outbound": [] - }, - "software": { - "name": "Cloudflare Workers", - "version": "0.0.0" - }, - "usage": { - "localPosts": items.length, - "users": { - "activeHalfyear": 1, - "activeMonth": 1, - "total": 1 - } - }, - "version": "2.0" - } - ), - { - headers: { - "Content-Type": "application/json", - }, - } - ) -} \ No newline at end of file diff --git a/sites/ewpratten.com/static/functions/api/activitypub/outbox.js b/sites/ewpratten.com/static/functions/api/activitypub/outbox.js deleted file mode 100644 index ac8d429..0000000 --- a/sites/ewpratten.com/static/functions/api/activitypub/outbox.js +++ /dev/null @@ -1,46 +0,0 @@ -const RSS_ITEM_PATTERN = /<item>\s+<title>([^<]+)<\/title>\s+<pubDate>([^<]+)<\/pubDate>\s+<author>([^<]+)<\/author>\s+<link>([^<]+)<\/link>\s+<guid>([^<]+)<\/guid>\s+<description[^>]+>([^<]+)<\/description>\s+<\/item>/gm; - -export async function onRequest(context) { - - // Request our own RSS feed - let rss_feed = await fetch("https://ewpratten.com/feed.xml"); - - // Parse the RSS feed - let rss_data = await rss_feed.text(); - let items = rss_data.matchAll(RSS_ITEM_PATTERN); - - // Generate the outbox content - return new Response( - JSON.stringify({ - "@context": "https://www.w3.org/ns/activitystreams", - "id": "https://ewpratten.com/api/activitypub/outbox", - "summary": "Evan Pratten", - "type": "OrderedCollection", - "totalItems": items.length, - "orderedItems": Array.from(items).map((item) => { - return { - "@context": "https://www.w3.org/ns/activitystreams", - "id": item[5] + "-create", - "type": "Create", - "actor": "https://ewpratten.com/api/activitypub/users/evan", - "object": { - "id": item[5], - "type": "Note", - "content": item[1], - "url": item[4], - "attributedTo": "https://ewpratten.com/api/activitypub/users/evan", - "to": [ - "https://www.w3.org/ns/activitystreams#Public" - ], - "published": item[2], - } - } - }) - }), - { - headers: { - "Content-Type": "application/activity+json", - }, - } - ) -} \ No newline at end of file diff --git a/sites/ewpratten.com/static/functions/api/activitypub/users/evan.js b/sites/ewpratten.com/static/functions/api/activitypub/users/evan.js deleted file mode 100644 index 7b0625d..0000000 --- a/sites/ewpratten.com/static/functions/api/activitypub/users/evan.js +++ /dev/null @@ -1,44 +0,0 @@ -export function onRequest(context) { - return new Response( - JSON.stringify({ - "@context": [ - "https://www.w3.org/ns/activitystreams", - "https://w3id.org/security/v1", - { - "@language": "en" - } - ], - "type": "Person", - "manuallyApprovesFollowers": true, - "discoverable": true, - "id": "https://ewpratten.com/api/activitypub/users/evan", - "outbox": "https://ewpratten.com/api/activitypub/inbox", - "outbox": "https://ewpratten.com/api/activitypub/outbox", - "preferredUsername": "evan", - "name": "Evan Pratten", - "summary": "I make things", - "icon": [ - "https://ewpratten.com/images/pfp/2022/460x460.webp" - ], - "attachment": [ - { - "name": "Website", - "type": "PropertyValue", - "value": "<a href=\"https://ewpratten.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\">ewpratten.com</a>" - } - ], - "publicKey": { - "@type": "Key", - "id": "https://ewpratten.com/api/activitypub/users/evan#main-key", - "owner": "https://ewpratten.com/api/activitypub/users/evan", - "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJwe4jxrpiDx0vzqnoc+3Mja7X\nz73/NxfDqG9Mu+k6Vs87N/+kV4BbsbJ/vtdYAg58+iMDmyRw48CzaXkPDgiCh3RZ\nFc/8GniBSEucjt/QEiAitV48aykqWyXtln0hAmQrjoEeE9DRxS3eyF7FVE2GhkTz\n1YqBabOMpHA1uGOp7QIDAQAB\n-----END PUBLIC KEY-----" - }, - "url": "https://ewpratten.com", - }), - { - headers: { - "Content-Type": "application/activity+json", - }, - } - ) -} \ No newline at end of file