@fedify/relay 2.4.0-dev.1794 → 2.4.0-dev.1805

package/dist/litepub.test.js

@@ -1,12 +1,11 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as isRelayFollowerData } from "./types-CZvP2qE2.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-1nwAof4Z.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Accept, Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
-import { exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";
-import { ok, strictEqual } from "node:assert";
+import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import test, { describe } from "node:test";
 //#region src/litepub.test.ts
 const mockDocumentLoader = async (url) => {
@@ -288,7 +287,58 @@ describe("LitePubRelay", () => {
 		await relay.fetch(request);
 		strictEqual(await kv.get(["follower", "https://remote.example.com/users/alice"]), void 0);
 	});
-	test("ignores duplicate Follow activity from pending follower", async () => {
+	test("replaces malformed follower data on Follow", async () => {
+		const followerId = "https://remote.example.com/users/alice";
+		const malformedRows = [
+			{ state: "pending" },
+			{
+				actor: null,
+				state: "pending"
+			},
+			{
+				actor: {},
+				state: "pending"
+			},
+			{
+				actor: await new Person({ id: new URL("https://remote.example.com/users/bob") }).toJsonLd(),
+				state: "pending"
+			}
+		];
+		for (const malformedRow of malformedRows) {
+			const kv = new MemoryKvStore();
+			await kv.set(["follower", followerId], malformedRow);
+			let handlerCallCount = 0;
+			const relay = createRelay("litepub", {
+				kv,
+				origin: "https://relay.example.com",
+				documentLoaderFactory: () => mockDocumentLoader,
+				authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+				subscriptionHandler: () => {
+					handlerCallCount++;
+					return Promise.resolve(true);
+				}
+			});
+			strictEqual(await relay.getFollower(followerId), null);
+			const followActivity = new Follow({
+				id: new URL("https://remote.example.com/activities/follow/1"),
+				actor: new URL(followerId),
+				object: new URL("https://relay.example.com/users/relay")
+			});
+			let request = new Request("https://relay.example.com/inbox", {
+				method: "POST",
+				headers: { "Content-Type": "application/activity+json" },
+				body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
+			});
+			request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+			await relay.fetch(request);
+			strictEqual(handlerCallCount, 1);
+			const follower = await relay.getFollower(followerId);
+			ok(follower);
+			strictEqual(follower.state, "pending");
+			strictEqual(follower.actor.id?.href, followerId);
+		}
+	});
+	for (const state of ["pending", "accepted"]) test(`ignores duplicate Follow activity from ${state} follower`, async () => {
 		const kv = new MemoryKvStore();
 		let handlerCallCount = 0;
 		const relay = createRelay("litepub", {
@@ -308,7 +358,7 @@ describe("LitePubRelay", () => {
 		});
 		await kv.set(["follower", "https://remote.example.com/users/alice"], {
 			actor: await follower.toJsonLd(),
-			state: "pending"
+			state
 		});
 		const followActivity = new Follow({
 			id: new URL("https://remote.example.com/activities/follow/1"),
@@ -323,6 +373,9 @@ describe("LitePubRelay", () => {
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
 		await relay.fetch(request);
 		strictEqual(handlerCallCount, 0);
+		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
+		ok(isRelayFollowerData(followerData));
+		strictEqual(followerData.state, state);
 	});
 	test("handles Accept activity completing reciprocal follow", async () => {
 		const kv = new MemoryKvStore();
@@ -363,7 +416,54 @@ describe("LitePubRelay", () => {
 		ok(isRelayFollowerData(followerData));
 		strictEqual(followerData.state, "accepted");
 	});
-	test("handles Undo Follow activity", async () => {
+	test("ignores Accept activity for invalid follower data", async () => {
+		const followerId = "https://remote.example.com/users/alice";
+		const invalidRows = [
+			{ state: "pending" },
+			{
+				actor: null,
+				state: "pending"
+			},
+			{
+				actor: {},
+				state: "pending"
+			},
+			{
+				actor: await new Person({ id: new URL("https://remote.example.com/users/bob") }).toJsonLd(),
+				state: "pending"
+			}
+		];
+		for (const invalidRow of invalidRows) {
+			const kv = new MemoryKvStore();
+			await kv.set(["follower", followerId], invalidRow);
+			const relay = createRelay("litepub", {
+				kv,
+				origin: "https://relay.example.com",
+				documentLoaderFactory: () => mockDocumentLoader,
+				authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+				subscriptionHandler: () => Promise.resolve(true)
+			});
+			const relayFollow = new Follow({
+				id: new URL("https://relay.example.com/activities/follow/1"),
+				actor: new URL("https://relay.example.com/users/relay"),
+				object: new URL(followerId)
+			});
+			const acceptActivity = new Accept({
+				id: new URL("https://remote.example.com/activities/accept/1"),
+				actor: new URL(followerId),
+				object: relayFollow
+			});
+			let request = new Request("https://relay.example.com/inbox", {
+				method: "POST",
+				headers: { "Content-Type": "application/activity+json" },
+				body: JSON.stringify(await acceptActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
+			});
+			request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+			await relay.fetch(request);
+			deepStrictEqual(await kv.get(["follower", followerId]), invalidRow);
+		}
+	});
+	for (const state of ["pending", "accepted"]) test(`handles Undo Follow activity for ${state} follower`, async () => {
 		const kv = new MemoryKvStore();
 		const followerId = "https://remote.example.com/users/alice";
 		const follower = new Person({
@@ -373,7 +473,7 @@ describe("LitePubRelay", () => {
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
-			state: "accepted"
+			state
 		});
 		const relay = createRelay("litepub", {
 			kv,

package/dist/mastodon.test.js

@@ -1,12 +1,11 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as isRelayFollowerData } from "./types-CZvP2qE2.js";
-import { MemoryKvStore, signRequest } from "@fedify/fedify";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-1nwAof4Z.js";
+import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
-import { Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
-import { exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";
-import { ok, strictEqual } from "node:assert";
+import { Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
+import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import test, { describe } from "node:test";
 //#region src/mastodon.test.ts
 const mockDocumentLoader = async (url) => {
@@ -254,7 +253,9 @@ describe("MastodonRelay", () => {
 		await relay.fetch(request);
 		strictEqual(handlerCalled, true);
 		ok(handlerActor);
-		ok(await kv.get(["follower", "https://remote.example.com/users/alice"]));
+		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
+		ok(isRelayFollowerData(followerData));
+		strictEqual(followerData.state, "accepted");
 	});
 	test("handles Follow activity with subscription rejection", async () => {
 		const kv = new MemoryKvStore();
@@ -433,6 +434,57 @@ describe("MastodonRelay", () => {
 		const response = await relay.fetch(request);
 		ok(response.status === 200 || response.status === 202);
 	});
+	test("handles Announce activity forwarding", async () => {
+		const kv = new MemoryKvStore();
+		const follower = new Person({
+			id: new URL("https://follower.example.com/users/bob"),
+			preferredUsername: "bob",
+			inbox: new URL("https://follower.example.com/users/bob/inbox")
+		});
+		await kv.set(["follower", follower.id.href], {
+			actor: await follower.toJsonLd(),
+			state: "accepted"
+		});
+		const relay = createRelay("mastodon", {
+			kv,
+			origin: "https://relay.example.com",
+			documentLoaderFactory: () => mockDocumentLoader,
+			authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+			subscriptionHandler: () => Promise.resolve(true)
+		});
+		const signedAnnounce = await signJsonLd(await new Announce({
+			id: new URL("https://remote.example.com/activities/announce/1"),
+			actor: new URL("https://remote.example.com/users/alice"),
+			object: new URL("https://remote.example.com/notes/1")
+		}).toJsonLd({ contextLoader: mockDocumentLoader }), rsaKeyPair.privateKey, rsaPublicKey.id, { contextLoader: mockDocumentLoader });
+		let request = new Request("https://relay.example.com/inbox", {
+			method: "POST",
+			headers: { "Content-Type": "application/activity+json" },
+			body: JSON.stringify(signedAnnounce)
+		});
+		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+		const originalFetch = globalThis.fetch;
+		let deliveryMethod;
+		let deliveredActivity;
+		globalThis.fetch = (async (input, init) => {
+			const outboundRequest = input instanceof Request ? input : new Request(input, init);
+			if (outboundRequest.url === "https://follower.example.com/users/bob/inbox") {
+				deliveryMethod = outboundRequest.method;
+				deliveredActivity = await outboundRequest.json();
+				return new Response(null, { status: 202 });
+			}
+			return originalFetch(input, init);
+		});
+		try {
+			const response = await relay.fetch(request);
+			ok(response.status === 200 || response.status === 202, `Unexpected inbox response status: ${response.status}`);
+		} finally {
+			globalThis.fetch = originalFetch;
+		}
+		ok(deliveredActivity, "Expected Announce delivery to the follower inbox");
+		strictEqual(deliveryMethod, "POST");
+		deepStrictEqual(deliveredActivity, signedAnnounce);
+	});
 	test("ignores Follow activity without required fields", async () => {
 		const kv = new MemoryKvStore();
 		const relay = createRelay("mastodon", {

package/dist/mod.cjs

@@ -18,6 +18,28 @@ function isRelayFollowerData(value) {
 	const obj = value;
 	return "actor" in obj && "state" in obj && typeof obj.state === "string" && (obj.state === "pending" || obj.state === "accepted");
 }
+/**
+* Parses and semantically validates follower data from storage.
+*
+* @param actorId The actor ID used as the follower's storage key.
+* @param value The stored follower data.
+* @returns The parsed follower, or `null` if the row is invalid.
+* @internal
+*/
+async function parseRelayFollowerData(actorId, value) {
+	if (!isRelayFollowerData(value)) return null;
+	try {
+		const actor = await _fedify_vocab.Object.fromJsonLd(value.actor);
+		if (!(0, _fedify_vocab.isActor)(actor) || actor.id?.href !== actorId) return null;
+		return {
+			actorId,
+			actor,
+			state: value.state
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/builder.ts
 const relayBuilder = (0, _fedify_fedify.createFederationBuilder)();
@@ -78,12 +100,12 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 });
 async function getFollowerActors(ctx) {
 	const actors = [];
-	for await (const { value } of ctx.data.kv.list(["follower"])) {
-		if (!isRelayFollowerData(value)) continue;
-		if (value.state !== "accepted") continue;
-		const actor = await _fedify_vocab.Object.fromJsonLd(value.actor);
-		if (!(0, _fedify_vocab.isActor)(actor)) continue;
-		actors.push(actor);
+	for await (const { key, value } of ctx.data.kv.list(["follower"])) {
+		const actorId = key[1];
+		if (typeof actorId !== "string") continue;
+		const follower = await parseRelayFollowerData(actorId, value);
+		if (follower?.state !== "accepted") continue;
+		actors.push(follower.actor);
 	}
 	return actors;
 }
@@ -3658,6 +3680,64 @@ const Temporal$2 = /*@__PURE__*/ Object.defineProperties({}, {
 const Temporal$1 = NativeTemporal || Temporal$2;
 NativeTemporal && Date.prototype.toTemporalInstant;
 //#endregion
+//#region src/follow.ts
+/**
+* Validate Follow activity and return follower actor if valid.
+* This validation is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity to validate
+* @returns The follower Actor if valid, null otherwise
+*/
+async function validateFollowActivity(ctx, follow) {
+	if (follow.id == null || follow.objectId == null) return null;
+	const parsed = ctx.parseUri(follow.objectId);
+	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
+	const follower = await follow.getActor(ctx);
+	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
+	return follower;
+}
+/**
+* Send Accept or Reject response for a Follow activity.
+* This is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity being responded to
+* @param follower The actor who sent the Follow
+* @param approved Whether the follow was approved
+*/
+async function sendFollowResponse(ctx, follow, follower, approved) {
+	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+	const Activity = approved ? _fedify_vocab.Accept : _fedify_vocab.Reject;
+	const action = approved ? "accepts" : "rejects";
+	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
+		id: new URL(`#${action}`, relayActorUri),
+		actor: relayActorUri,
+		object: follow
+	}));
+}
+/**
+* Handle Undo activity for Follow.
+* This logic is identical for both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param undo The Undo activity to handle
+* @param logger The logger instance to use for warnings
+*/
+async function handleUndoFollow(ctx, undo, logger) {
+	const activity = await undo.getObject({
+		crossOrigin: "trust",
+		...ctx
+	});
+	if (activity instanceof _fedify_vocab.Follow) {
+		if (activity.id == null || activity.actorId == null) return;
+		await ctx.data.kv.delete(["follower", activity.actorId.href]);
+	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
+		type: activity?.constructor.name,
+		object: activity
+	});
+}
+//#endregion
 //#region src/base.ts
 /**
 * Abstract base class for relay implementations.
@@ -3677,25 +3757,6 @@ var BaseRelay = class {
 		return await (await this.#getFederation()).fetch(request, { contextData: this.options });
 	}
 	/**
-	* Helper method to parse and validate follower data from storage.
-	* Deserializes JSON-LD actor data and validates it.
-	*
-	* @param actorId The actor ID of the follower
-	* @param data Raw data from KV store
-	* @returns RelayFollower object if valid, null otherwise
-	* @internal
-	*/
-	async parseFollowerData(actorId, data) {
-		if (!isRelayFollowerData(data)) return null;
-		const actor = await _fedify_vocab.Object.fromJsonLd(data.actor);
-		if (!(0, _fedify_vocab.isActor)(actor)) return null;
-		return {
-			actorId,
-			actor,
-			state: data.state
-		};
-	}
-	/**
 	* Lists all followers of the relay.
 	*
 	* @returns An async iterator of follower entries
@@ -3724,7 +3785,7 @@ var BaseRelay = class {
 		for await (const entry of this.options.kv.list(["follower"])) {
 			const actorId = entry.key[1];
 			if (typeof actorId !== "string") continue;
-			const follower = await this.parseFollowerData(actorId, entry.value);
+			const follower = await parseRelayFollowerData(actorId, entry.value);
 			if (follower) yield follower;
 		}
 	}
@@ -3757,8 +3818,35 @@ var BaseRelay = class {
 	* @since 2.0.0
 	*/
 	async getFollower(actorId) {
-		const followerData = await this.options.kv.get(["follower", actorId]);
-		return await this.parseFollowerData(actorId, followerData);
+		return await parseRelayFollowerData(actorId, await this.options.kv.get(["follower", actorId]));
+	}
+	shouldSkipFollow(_ctx, _follower) {
+		return Promise.resolve(false);
+	}
+	afterFollowApproved(_ctx, _follower) {
+		return Promise.resolve();
+	}
+	async #handleFollow(ctx, follow) {
+		const follower = await validateFollowActivity(ctx, follow);
+		if (follower?.id == null || await this.shouldSkipFollow(ctx, follower)) return;
+		const approved = await this.options.subscriptionHandler(ctx, follower);
+		if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
+			actor: await follower.toJsonLd(),
+			state: this.initialFollowerState
+		});
+		await sendFollowResponse(ctx, follow, follower, approved);
+		if (approved) await this.afterFollowApproved(ctx, follower);
+	}
+	async #relayActivity(ctx, activity) {
+		const senderId = activity.actorId;
+		const excludeBaseUris = senderId == null ? [] : [senderId];
+		await this.deliverActivity(ctx, activity, excludeBaseUris);
+	}
+	setupInboxListeners() {
+		if (this.federation == null) throw new Error("Federation must be initialized before inbox listeners");
+		const listeners = this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		listeners.on(_fedify_vocab.Follow, async (ctx, follow) => await this.#handleFollow(ctx, follow)).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, this.logger)).on(_fedify_vocab.Create, async (ctx, create) => await this.#relayActivity(ctx, create)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#relayActivity(ctx, deleteActivity)).on(_fedify_vocab.Move, async (ctx, move) => await this.#relayActivity(ctx, move)).on(_fedify_vocab.Update, async (ctx, update) => await this.#relayActivity(ctx, update)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#relayActivity(ctx, announce));
+		return listeners;
 	}
 	async #getFederation() {
 		if (this.federation == null) {
@@ -3778,64 +3866,6 @@ var BaseRelay = class {
 	}
 };
 //#endregion
-//#region src/follow.ts
-/**
-* Validate Follow activity and return follower actor if valid.
-* This validation is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity to validate
-* @returns The follower Actor if valid, null otherwise
-*/
-async function validateFollowActivity(ctx, follow) {
-	if (follow.id == null || follow.objectId == null) return null;
-	const parsed = ctx.parseUri(follow.objectId);
-	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
-	const follower = await follow.getActor(ctx);
-	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
-	return follower;
-}
-/**
-* Send Accept or Reject response for a Follow activity.
-* This is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity being responded to
-* @param follower The actor who sent the Follow
-* @param approved Whether the follow was approved
-*/
-async function sendFollowResponse(ctx, follow, follower, approved) {
-	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-	const Activity = approved ? _fedify_vocab.Accept : _fedify_vocab.Reject;
-	const action = approved ? "accepts" : "rejects";
-	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
-		id: new URL(`#${action}`, relayActorUri),
-		actor: relayActorUri,
-		object: follow
-	}));
-}
-/**
-* Handle Undo activity for Follow.
-* This logic is identical for both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param undo The Undo activity to handle
-* @param logger The logger instance to use for warnings
-*/
-async function handleUndoFollow(ctx, undo, logger) {
-	const activity = await undo.getObject({
-		crossOrigin: "trust",
-		...ctx
-	});
-	if (activity instanceof _fedify_vocab.Follow) {
-		if (activity.id == null || activity.actorId == null) return;
-		await ctx.data.kv.delete(["follower", activity.actorId.href]);
-	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
-		type: activity?.constructor.name,
-		object: activity
-	});
-}
-//#endregion
 //#region src/litepub.ts
 const Temporal = Temporal$1;
 const logger$1 = (0, _logtape_logtape.getLogger)([
@@ -3851,9 +3881,23 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 * @since 2.0.0
 */
 var LitePubRelay = class extends BaseRelay {
-	async #announceToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "pending";
+	logger = logger$1;
+	async shouldSkipFollow(ctx, follower) {
+		if (follower.id == null) return true;
+		const existingFollow = await ctx.data.kv.get(["follower", follower.id.href]);
+		return await parseRelayFollowerData(follower.id.href, existingFollow) != null;
+	}
+	async afterFollowApproved(ctx, follower) {
+		if (follower.id == null) return;
+		const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+		await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new _fedify_vocab.Follow({
+			actor: relayActorUri,
+			object: follower.id,
+			to: follower.id
+		}));
+	}
+	async deliverActivity(ctx, activity, excludeBaseUris) {
 		const announce = new _fedify_vocab.Announce({
 			id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
 			actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
@@ -3867,25 +3911,7 @@ var LitePubRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(_fedify_vocab.Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			if ((await ctx.data.kv.get(["follower", follower.id.href]))?.state === "pending") return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) {
-				await ctx.data.kv.set(["follower", follower.id.href], {
-					actor: await follower.toJsonLd(),
-					state: "pending"
-				});
-				await sendFollowResponse(ctx, follow, follower, approved);
-				const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new _fedify_vocab.Follow({
-					actor: relayActorUri,
-					object: follower.id,
-					to: follower.id
-				}));
-			} else await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(_fedify_vocab.Accept, async (ctx, accept) => {
+		return super.setupInboxListeners().on(_fedify_vocab.Accept, async (ctx, accept) => {
 			const follow = await accept.getObject({
 				crossOrigin: "trust",
 				...ctx
@@ -3893,18 +3919,19 @@ var LitePubRelay = class extends BaseRelay {
 			if (!(follow instanceof _fedify_vocab.Follow)) return;
 			const relayActorId = follow.actorId;
 			if (relayActorId == null) return;
-			const followerActor = await accept.getActor();
+			const followerActor = await accept.getActor(ctx);
 			if (!(0, _fedify_vocab.isActor)(followerActor) || !followerActor.id) return;
 			const parsed = ctx.parseUri(relayActorId);
 			if (parsed == null || parsed.type !== "actor") return;
 			const followerData = await ctx.data.kv.get(["follower", followerActor.id.href]);
-			if (followerData == null) return;
+			if (!isRelayFollowerData(followerData)) return;
+			if (await parseRelayFollowerData(followerActor.id.href, followerData) == null) return;
 			const updatedFollowerData = {
 				...followerData,
 				state: "accepted"
 			};
 			await ctx.data.kv.set(["follower", followerActor.id.href], updatedFollowerData);
-		}).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger$1)).on(_fedify_vocab.Create, async (ctx, create) => await this.#announceToFollowers(ctx, create)).on(_fedify_vocab.Update, async (ctx, update) => await this.#announceToFollowers(ctx, update)).on(_fedify_vocab.Move, async (ctx, move) => await this.#announceToFollowers(ctx, move)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#announceToFollowers(ctx, deleteActivity)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#announceToFollowers(ctx, announce));
+		});
 	}
 };
 //#endregion
@@ -3922,27 +3949,15 @@ const logger = (0, _logtape_logtape.getLogger)([
 * @since 2.0.0
 */
 var MastodonRelay = class extends BaseRelay {
-	async #forwardToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "accepted";
+	logger = logger;
+	async deliverActivity(ctx, _activity, excludeBaseUris) {
 		await ctx.forwardActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", {
 			skipIfUnsigned: true,
 			excludeBaseUris,
 			preferSharedInbox: true
 		});
 	}
-	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(_fedify_vocab.Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
-				actor: await follower.toJsonLd(),
-				state: "accepted"
-			});
-			await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger)).on(_fedify_vocab.Create, async (ctx, create) => await this.#forwardToFollowers(ctx, create)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#forwardToFollowers(ctx, deleteActivity)).on(_fedify_vocab.Move, async (ctx, move) => await this.#forwardToFollowers(ctx, move)).on(_fedify_vocab.Update, async (ctx, update) => await this.#forwardToFollowers(ctx, update)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#forwardToFollowers(ctx, announce));
-	}
 };
 //#endregion
 //#region src/factory.ts