@fedify/relay 2.0.0-pr.471.1909 → 2.0.0-pr.471.1920

package/dist/mod.cjs

@@ -120,21 +120,21 @@ var MastodonRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
 			let approved = false;
-			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, follower);
 			if (approved) {
 				const followers = await options.kv.get(["followers"]) ?? [];
 				followers.push(follow.id.href);
 				await options.kv.set(["followers"], followers);
-				await options.kv.set(["follower", follow.id.href], await recipient.toJsonLd());
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Accept({
+				await options.kv.set(["follower", follow.id.href], await follower.toJsonLd());
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
@@ -226,6 +226,7 @@ var LitePubRelay = class {
 				summary: "LitePub-compatible ActivityPub relay server",
 				inbox: ctx.getInboxUri(),
 				followers: ctx.getFollowersUri(identifier),
+				following: ctx.getFollowingUri(identifier),
 				url: ctx.getActorUri(identifier),
 				publicKey: keys[0].cryptographicKey,
 				assertionMethods: keys.map((k) => k.multikey)
@@ -273,6 +274,9 @@ var LitePubRelay = class {
 			};
 			return [rsaPair, ed25519Pair];
 		});
+		this.#federation.setFollowingDispatcher("/users/{identifier}/following", (_ctx, _identifier) => {
+			return { items: [] };
+		}).setCounter((_ctx, _identifier) => 0);
 		this.#federation.setFollowersDispatcher("/users/{identifier}/followers", async (_ctx, identifier) => {
 			if (identifier !== RELAY_SERVER_ACTOR) return null;
 			const followers = await options.kv.get(["followers"]) ?? [];
@@ -292,53 +296,59 @@ var LitePubRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
-			const existingFollow = await options.kv.get(["follower", recipient.id.href]);
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
+			const existingFollow = await options.kv.get(["follower", follower.id.href]);
 			if (existingFollow?.state === "pending") return;
 			let subscriptionApproved = false;
-			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, follower);
 			if (subscriptionApproved) {
-				await options.kv.set(["follower", recipient.id.href], {
-					"actor": await recipient.toJsonLd(),
+				await options.kv.set(["follower", follower.id.href], {
+					"actor": await follower.toJsonLd(),
 					"state": "pending"
 				});
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Accept({
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Follow({
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Follow({
 					actor: relayActorUri,
-					object: recipient.id,
-					to: recipient.id
+					object: follower.id,
+					to: follower.id
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
 			}));
 		}).on(__fedify_fedify_vocab.Accept, async (ctx, accept) => {
-			const follow = await accept.getObject();
+			const follow = await accept.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
 			if (!(follow instanceof __fedify_fedify_vocab.Follow)) return;
-			const following = await accept.getActor();
-			if (!(0, __fedify_fedify_vocab.isActor)(following)) return;
 			const follower = follow.actorId;
 			if (follower == null) return;
+			const following = await accept.getActor();
+			if (!(0, __fedify_fedify_vocab.isActor)(following) || !following.id) return;
 			const parsed = ctx.parseUri(follower);
 			if (parsed == null || parsed.type !== "actor") return;
-			const followerData = await options.kv.get(["follower", follower.href]);
+			const followerData = await options.kv.get(["follower", following.id.href]);
 			if (followerData == null) return;
 			const updatedFollowerData = {
 				...followerData,
 				status: "accepted"
 			};
-			await options.kv.set(["follower", follower.href], updatedFollowerData);
+			await options.kv.set(["follower", following.id.href], updatedFollowerData);
 			const followers = await options.kv.get(["followers"]) ?? [];
-			followers.push(follower.href);
+			followers.push(following.id.href);
 			await options.kv.set(["followers"], followers);
 		}).on(__fedify_fedify_vocab.Undo, async (ctx, undo) => {
-			const activity = await undo.getObject(ctx);
+			const activity = await undo.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
 			if (activity instanceof __fedify_fedify_vocab.Follow) {
 				if (activity.id == null || activity.actorId == null) return;
 				const followers = await options.kv.get(["followers"]) ?? [];
@@ -402,6 +412,19 @@ var LitePubRelay = class {
 				excludeBaseUris,
 				preferSharedInbox: true
 			});
+		}).on(__fedify_fedify_vocab.Announce, async (ctx, announceActivity) => {
+			const sender = await announceActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: announceActivity.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
 		});
 	}
 	get domain() {

package/dist/mod.js

@@ -97,21 +97,21 @@ var MastodonRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
 			let approved = false;
-			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, follower);
 			if (approved) {
 				const followers = await options.kv.get(["followers"]) ?? [];
 				followers.push(follow.id.href);
 				await options.kv.set(["followers"], followers);
-				await options.kv.set(["follower", follow.id.href], await recipient.toJsonLd());
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Accept({
+				await options.kv.set(["follower", follow.id.href], await follower.toJsonLd());
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
@@ -203,6 +203,7 @@ var LitePubRelay = class {
 				summary: "LitePub-compatible ActivityPub relay server",
 				inbox: ctx.getInboxUri(),
 				followers: ctx.getFollowersUri(identifier),
+				following: ctx.getFollowingUri(identifier),
 				url: ctx.getActorUri(identifier),
 				publicKey: keys[0].cryptographicKey,
 				assertionMethods: keys.map((k) => k.multikey)
@@ -250,6 +251,9 @@ var LitePubRelay = class {
 			};
 			return [rsaPair, ed25519Pair];
 		});
+		this.#federation.setFollowingDispatcher("/users/{identifier}/following", (_ctx, _identifier) => {
+			return { items: [] };
+		}).setCounter((_ctx, _identifier) => 0);
 		this.#federation.setFollowersDispatcher("/users/{identifier}/followers", async (_ctx, identifier) => {
 			if (identifier !== RELAY_SERVER_ACTOR) return null;
 			const followers = await options.kv.get(["followers"]) ?? [];
@@ -269,53 +273,59 @@ var LitePubRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
-			const existingFollow = await options.kv.get(["follower", recipient.id.href]);
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
+			const existingFollow = await options.kv.get(["follower", follower.id.href]);
 			if (existingFollow?.state === "pending") return;
 			let subscriptionApproved = false;
-			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, follower);
 			if (subscriptionApproved) {
-				await options.kv.set(["follower", recipient.id.href], {
-					"actor": await recipient.toJsonLd(),
+				await options.kv.set(["follower", follower.id.href], {
+					"actor": await follower.toJsonLd(),
 					"state": "pending"
 				});
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Accept({
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Follow({
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Follow({
 					actor: relayActorUri,
-					object: recipient.id,
-					to: recipient.id
+					object: follower.id,
+					to: follower.id
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
 			}));
 		}).on(Accept, async (ctx, accept) => {
-			const follow = await accept.getObject();
+			const follow = await accept.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
 			if (!(follow instanceof Follow)) return;
-			const following = await accept.getActor();
-			if (!isActor(following)) return;
 			const follower = follow.actorId;
 			if (follower == null) return;
+			const following = await accept.getActor();
+			if (!isActor(following) || !following.id) return;
 			const parsed = ctx.parseUri(follower);
 			if (parsed == null || parsed.type !== "actor") return;
-			const followerData = await options.kv.get(["follower", follower.href]);
+			const followerData = await options.kv.get(["follower", following.id.href]);
 			if (followerData == null) return;
 			const updatedFollowerData = {
 				...followerData,
 				status: "accepted"
 			};
-			await options.kv.set(["follower", follower.href], updatedFollowerData);
+			await options.kv.set(["follower", following.id.href], updatedFollowerData);
 			const followers = await options.kv.get(["followers"]) ?? [];
-			followers.push(follower.href);
+			followers.push(following.id.href);
 			await options.kv.set(["followers"], followers);
 		}).on(Undo, async (ctx, undo) => {
-			const activity = await undo.getObject(ctx);
+			const activity = await undo.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
 			if (activity instanceof Follow) {
 				if (activity.id == null || activity.actorId == null) return;
 				const followers = await options.kv.get(["followers"]) ?? [];
@@ -379,6 +389,19 @@ var LitePubRelay = class {
 				excludeBaseUris,
 				preferSharedInbox: true
 			});
+		}).on(Announce, async (ctx, announceActivity) => {
+			const sender = await announceActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: announceActivity.objectId,
+				to: PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
 		});
 	}
 	get domain() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.0.0-pr.471.1909+976b008d",
+  "version": "2.0.0-pr.471.1920+38258210",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -48,13 +48,13 @@
     "package.json"
   ],
   "peerDependencies": {
-    "@fedify/fedify": "^2.0.0-pr.471.1909+976b008d"
+    "@fedify/fedify": "^2.0.0-pr.471.1920+38258210"
   },
   "devDependencies": {
     "tsdown": "^0.12.9",
     "typescript": "^5.9.3",
-    "@fedify/testing": "^2.0.0-pr.471.1909+976b008d",
-    "@fedify/vocab-runtime": "^2.0.0-pr.471.1909+976b008d"
+    "@fedify/testing": "^2.0.0-pr.471.1920+38258210",
+    "@fedify/vocab-runtime": "^2.0.0-pr.471.1920+38258210"
   },
   "scripts": {
     "build": "deno task codegen && tsdown",