From 88212c39811c61359d691f9d38e6ec7ec3a9c7bd Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 18 Feb 2019 18:20:39 -0500
Subject: [PATCH] AP: Updates

---
 lib/generate/activitypub.ts | 47 ++++---------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/lib/generate/activitypub.ts b/lib/generate/activitypub.ts
index 17941c1..9d52b39 100644
--- a/lib/generate/activitypub.ts
+++ b/lib/generate/activitypub.ts
@@ -19,8 +19,6 @@ export default async function activitypub(posts: Page[]) {
 		util.write(path.join(post.metadata.permalink, "index.html.json"), data);
 	}
 
-	util.write("ap/actor", JSON.stringify(actorObject()))
-
 	util.write(".well-known/webfinger", JSON.stringify(webfingerObject()));
 }
 
@@ -31,11 +29,7 @@ function postObject(post: Page): object {
 			"https://www.w3.org/ns/activitystreams"
 		],
 		"type": "Article",
-		"id": `https://${baseURL}${path.format({
-			dir: path.dirname(post.metadata.permalink),
-			name: path.basename(post.metadata.permalink),
-			ext: ".json"
-		})}`,
+		"id": `https://${baseURL}${post.metadata.permalink}`,
 		"published": (<Date>postMeta.date).toISOString(),
 		"inReplyTo": null,
 		"url": `https://${baseURL}${postMeta.permalink}`,
@@ -43,47 +37,14 @@ function postObject(post: Page): object {
 		"to": [
 			"https://www.w3.org/ns/activitystreams#Public"
 		],
-		"cc": [],
+		"cc": [
+			`https://${baseURL}/ap/followers`
+		],
 		"name": postMeta.title,
 		"content": post.text
 	};
 }
 
-function actorObject() {
-	return {
-		"@context": [
-			"https://www.w3.org/ns/activitystreams",
-			"https://w3id.org/security/v1"
-		],
-		"type": "Person",
-		"id": `https://${baseURL}/ap/actor`,
-		"preferredUsername": "shadowfacts",
-		"name": "shadowfacts' blog",
-		"icon": {
-			"type": "Image",
-			"mediaType": "image/png",
-			"url": `https://${baseURL}/shadowfacts.png`
-		},
-		"inbox": `https://${baseURL}/ap/inbox`,
-		"publicKey": {
-			"id": `https://${baseURL}/ap/actor#main-key`,
-			"owner": `https://${baseURL}/ap/actor`,
-			"publicKeyPem":
-`
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsePhOEq6EqqgGe+5vKa
-ti8cnvLoP3eJDTHENxX4M9epMIeo48cI214wkAERoNufZLtYeGOHO6YJcVydVSYN
-Ud4lQxgaPwAlh0DB0BUrXR1yfcSAhHS86XBSUq86O3fY5V+vEdZiN5PfUCG5rg5t
-5V/TrcbVQngXqDmwVZ/OcJ+5vUo+B62Mul7EmiNkZHKzp1VZGVtZ6nZ/4TxsdeSN
-XT8Vb0f/GJQOQLzW6dV0CBupts6x7o+9oRiYiAH+cXLFyQdTQ+1TrqMSMscdfX9I
-Kos5Ih7oKdj6wQt0pDEOGx090c9JzQC25RzxRk7jc1Jt1UzDi/a1U/BbucxIvPr3
-PQIDAQAB
------END PUBLIC KEY-----
-`
-		}
-	};
-}
-
 function webfingerObject() {
 	return {
 		"subject": `acct:shadowfacts@${baseURL}`,