@fedify/relay 2.4.0-pr.934.40 → 2.4.0

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;
 }
@@ -245,7 +267,7 @@ function parseInt0(s) {
 function padNumber(digits, num) {
 	return String(num).padStart(digits, "0");
 }
-const padNumber2 = /* @__PURE__ */ bindArgs(padNumber, 2);
+const padNumber2 = /*@__PURE__*/ bindArgs(padNumber, 2);
 function compareNumbers(a, b) {
 	return Math.sign(a - b);
 }
@@ -313,7 +335,7 @@ const unitNameMap = {
 	month: 8,
 	year: 9
 };
-const unitNamesAsc = /* @__PURE__ */ Object.keys(unitNameMap);
+const unitNamesAsc = /*@__PURE__*/ Object.keys(unitNameMap);
 const nanoInMicro = nanoInMicro$1;
 const nanoInMilli = nanoInMilli$1;
 const nanoInSec = nanoInSec$1;
@@ -329,19 +351,19 @@ const unitNanoMap = [
 	nanoInHour,
 	nanoInUtcDay
 ];
-const bigNanoInMicro = /* @__PURE__ */ BigInt(nanoInMicro);
-const bigNanoInMilli = /* @__PURE__ */ BigInt(nanoInMilli);
-const bigNanoInSec = /* @__PURE__ */ BigInt(nanoInSec);
-const bigNanoInMinute = /* @__PURE__ */ BigInt(nanoInMinute);
-const bigNanoInHour = /* @__PURE__ */ BigInt(nanoInHour);
-const bigNanoInUtcDay = /* @__PURE__ */ BigInt(nanoInUtcDay);
+const bigNanoInMicro = /*@__PURE__*/ BigInt(nanoInMicro);
+const bigNanoInMilli = /*@__PURE__*/ BigInt(nanoInMilli);
+const bigNanoInSec = /*@__PURE__*/ BigInt(nanoInSec);
+const bigNanoInMinute = /*@__PURE__*/ BigInt(nanoInMinute);
+const bigNanoInHour = /*@__PURE__*/ BigInt(nanoInHour);
+const bigNanoInUtcDay = /*@__PURE__*/ BigInt(nanoInUtcDay);
 function divideBigNanoToExactNumber(bigNano, divisorNano) {
 	const days = Number(bigNano / bigNanoInUtcDay);
 	const timeNano = Number(bigNano % bigNanoInUtcDay);
 	return days * (nanoInUtcDay / divisorNano) + (Math.trunc(timeNano / divisorNano) + timeNano % divisorNano / divisorNano);
 }
-const timeFieldNamesAsc = /* @__PURE__ */ unitNamesAsc.slice(0, 6);
-const timeGetters = /* @__PURE__ */ createPropGetters(timeFieldNamesAsc);
+const timeFieldNamesAsc = /*@__PURE__*/ unitNamesAsc.slice(0, 6);
+const timeGetters = /*@__PURE__*/ createPropGetters(timeFieldNamesAsc);
 const yearFieldNamesAsc = ["year"];
 const dayFieldNamesAsc = ["day"];
 const calendarDateFieldNamesAsc = [
@@ -363,24 +385,24 @@ const monthDayFieldNames = [
 	"month",
 	"monthCode"
 ];
-const timeFieldNamesAlpha = /* @__PURE__ */ sortStrings(timeFieldNamesAsc);
-const yearFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(eraYearFieldNames, yearFieldNamesAsc);
-const yearMonthFieldNamesAlpha = /* @__PURE__ */ sortStrings(monthFieldNames, yearFieldNamesAsc);
-const yearMonthFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(eraYearFieldNames, yearMonthFieldNamesAlpha);
-const yearMonthCodeFieldNamesAlpha = /* @__PURE__ */ sortStrings(["monthCode"], yearFieldNamesAsc);
-const yearMonthCodeFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(eraYearFieldNames, yearMonthCodeFieldNamesAlpha);
-const monthCodeDayFieldNamesAlpha = /* @__PURE__ */ sortStrings(dayFieldNamesAsc, ["monthCode"]);
-const dateFieldNamesAlpha = /* @__PURE__ */ sortStrings(dayFieldNamesAsc, yearMonthFieldNamesAlpha);
-const dateFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(dayFieldNamesAsc, eraYearFieldNames, yearMonthFieldNamesAlpha);
-const dateTimeFieldNamesAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc);
-const dateTimeFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc);
-const dateTimeAndOffsetFieldNamesAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc, offsetFieldNames);
-const dateTimeAndOffsetFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc, offsetFieldNames);
-const dateTimeAndZoneFieldNamesAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc, offsetFieldNames, timeZoneFieldNames);
-const dateTimeAndZoneFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc, offsetFieldNames, timeZoneFieldNames);
-const yearMonthCodeDayFieldNamesAlpha = /* @__PURE__ */ sortStrings(dayFieldNamesAsc, yearMonthCodeFieldNamesAlpha);
-const yearMonthCodeDayFieldNamesWithEraAlpha = /* @__PURE__ */ sortStrings(dayFieldNamesAsc, eraYearFieldNames, yearMonthCodeFieldNamesAlpha);
-const timeFieldDefaults = /* @__PURE__ */ zipPropsConst(timeFieldNamesAsc, 0);
+const timeFieldNamesAlpha = /*@__PURE__*/ sortStrings(timeFieldNamesAsc);
+const yearFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(eraYearFieldNames, yearFieldNamesAsc);
+const yearMonthFieldNamesAlpha = /*@__PURE__*/ sortStrings(monthFieldNames, yearFieldNamesAsc);
+const yearMonthFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(eraYearFieldNames, yearMonthFieldNamesAlpha);
+const yearMonthCodeFieldNamesAlpha = /*@__PURE__*/ sortStrings(["monthCode"], yearFieldNamesAsc);
+const yearMonthCodeFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(eraYearFieldNames, yearMonthCodeFieldNamesAlpha);
+const monthCodeDayFieldNamesAlpha = /*@__PURE__*/ sortStrings(dayFieldNamesAsc, ["monthCode"]);
+const dateFieldNamesAlpha = /*@__PURE__*/ sortStrings(dayFieldNamesAsc, yearMonthFieldNamesAlpha);
+const dateFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(dayFieldNamesAsc, eraYearFieldNames, yearMonthFieldNamesAlpha);
+const dateTimeFieldNamesAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc);
+const dateTimeFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc);
+const dateTimeAndOffsetFieldNamesAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc, offsetFieldNames);
+const dateTimeAndOffsetFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc, offsetFieldNames);
+const dateTimeAndZoneFieldNamesAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesAlpha, timeFieldNamesAsc, offsetFieldNames, timeZoneFieldNames);
+const dateTimeAndZoneFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(dateFieldNamesWithEraAlpha, timeFieldNamesAsc, offsetFieldNames, timeZoneFieldNames);
+const yearMonthCodeDayFieldNamesAlpha = /*@__PURE__*/ sortStrings(dayFieldNamesAsc, yearMonthCodeFieldNamesAlpha);
+const yearMonthCodeDayFieldNamesWithEraAlpha = /*@__PURE__*/ sortStrings(dayFieldNamesAsc, eraYearFieldNames, yearMonthCodeFieldNamesAlpha);
+const timeFieldDefaults = /*@__PURE__*/ zipPropsConst(timeFieldNamesAsc, 0);
 function validateTimeFields(timeFields) {
 	return constrainTimeFields(timeFields, 1), timeFields;
 }
@@ -609,20 +631,20 @@ function computeCalendarWeekOfYear(calendar, isoDate) {
 function computeCalendarYearOfWeek(calendar, isoDate) {
 	return calendar === void 0 ? computeIsoWeekFields(isoDate).yearOfWeek : void 0;
 }
-const durationFieldNamesAsc = /* @__PURE__ */ unitNamesAsc.map((unitName) => unitName + "s");
-const durationGetters = /* @__PURE__ */ createPropGetters(durationFieldNamesAsc);
-const durationFieldNamesAlpha = /* @__PURE__ */ sortStrings(durationFieldNamesAsc);
-const durationTimeFieldNamesAsc = /* @__PURE__ */ durationFieldNamesAsc.slice(0, 6);
-const durationDateFieldNamesAsc = /* @__PURE__ */ durationFieldNamesAsc.slice(6);
-const durationCalendarFieldNamesAsc = /* @__PURE__ */ durationDateFieldNamesAsc.slice(1);
-const durationFieldIndexes = /* @__PURE__ */ durationFieldNamesAsc.reduce((indexes, fieldName, i) => (indexes[fieldName] = i, indexes), {});
-const durationFieldDefaults = /* @__PURE__ */ zipPropsConst(durationFieldNamesAsc, 0);
-const durationTimeFieldDefaults = /* @__PURE__ */ zipPropsConst(durationTimeFieldNamesAsc, 0);
-const clearDurationFields = /* @__PURE__ */ bindArgs(zeroOutProps, durationFieldNamesAsc);
+const durationFieldNamesAsc = /*@__PURE__*/ unitNamesAsc.map((unitName) => unitName + "s");
+const durationGetters = /*@__PURE__*/ createPropGetters(durationFieldNamesAsc);
+const durationFieldNamesAlpha = /*@__PURE__*/ sortStrings(durationFieldNamesAsc);
+const durationTimeFieldNamesAsc = /*@__PURE__*/ durationFieldNamesAsc.slice(0, 6);
+const durationDateFieldNamesAsc = /*@__PURE__*/ durationFieldNamesAsc.slice(6);
+const durationCalendarFieldNamesAsc = /*@__PURE__*/ durationDateFieldNamesAsc.slice(1);
+const durationFieldIndexes = /*@__PURE__*/ durationFieldNamesAsc.reduce((indexes, fieldName, i) => (indexes[fieldName] = i, indexes), {});
+const durationFieldDefaults = /*@__PURE__*/ zipPropsConst(durationFieldNamesAsc, 0);
+const durationTimeFieldDefaults = /*@__PURE__*/ zipPropsConst(durationTimeFieldNamesAsc, 0);
+const clearDurationFields = /*@__PURE__*/ bindArgs(zeroOutProps, durationFieldNamesAsc);
 function requirePropDefined(optionName, optionVal) {
 	return optionVal ?? throwRangeError(missingField(optionName)), optionVal;
 }
-const requireString = /* @__PURE__ */ bindArgs(requireType, "string");
+const requireString = /*@__PURE__*/ bindArgs(requireType, "string");
 function requireType(typeName, arg, entityName = typeName) {
 	return typeof arg !== typeName && throwTypeError(invalidEntity(entityName, arg)), arg;
 }
@@ -734,17 +756,17 @@ function coerceChoiceOption(optionName, enumNameMap, options, defaultChoice = 0)
 	const enumNum = enumNameMap[enumStr];
 	return void 0 === enumNum && throwRangeError(invalidChoice(optionName, enumStr, enumNameMap)), enumNum;
 }
-const coerceSmallestUnit = /* @__PURE__ */ bindArgs(coerceUnitOption, smallestUnitStr);
-const coerceLargestUnit = /* @__PURE__ */ bindArgs(coerceUnitOption, "largestUnit");
-const coerceTotalUnit = /* @__PURE__ */ bindArgs(coerceUnitOption, "unit");
-const coerceOverflow = /* @__PURE__ */ bindArgs(coerceChoiceOption, "overflow", overflowMap);
-const coerceEpochDisambig = /* @__PURE__ */ bindArgs(coerceChoiceOption, "disambiguation", epochDisambigMap);
-const coerceOffsetDisambig = /* @__PURE__ */ bindArgs(coerceChoiceOption, "offset", offsetDisambigMap);
-const coerceCalendarDisplay = /* @__PURE__ */ bindArgs(coerceChoiceOption, "calendarName", calendarDisplayMap);
-const coerceTimeZoneDisplay = /* @__PURE__ */ bindArgs(coerceChoiceOption, "timeZoneName", timeZoneDisplayMap);
-const coerceOffsetDisplay = /* @__PURE__ */ bindArgs(coerceChoiceOption, "offset", offsetDisplayMap);
-const coerceRoundingMode = /* @__PURE__ */ bindArgs(coerceChoiceOption, "roundingMode", roundingModeMap);
-const coerceDirection = /* @__PURE__ */ bindArgs(coerceChoiceOption, "direction", directionMap);
+const coerceSmallestUnit = /*@__PURE__*/ bindArgs(coerceUnitOption, smallestUnitStr);
+const coerceLargestUnit = /*@__PURE__*/ bindArgs(coerceUnitOption, "largestUnit");
+const coerceTotalUnit = /*@__PURE__*/ bindArgs(coerceUnitOption, "unit");
+const coerceOverflow = /*@__PURE__*/ bindArgs(coerceChoiceOption, "overflow", overflowMap);
+const coerceEpochDisambig = /*@__PURE__*/ bindArgs(coerceChoiceOption, "disambiguation", epochDisambigMap);
+const coerceOffsetDisambig = /*@__PURE__*/ bindArgs(coerceChoiceOption, "offset", offsetDisambigMap);
+const coerceCalendarDisplay = /*@__PURE__*/ bindArgs(coerceChoiceOption, "calendarName", calendarDisplayMap);
+const coerceTimeZoneDisplay = /*@__PURE__*/ bindArgs(coerceChoiceOption, "timeZoneName", timeZoneDisplayMap);
+const coerceOffsetDisplay = /*@__PURE__*/ bindArgs(coerceChoiceOption, "offset", offsetDisplayMap);
+const coerceRoundingMode = /*@__PURE__*/ bindArgs(coerceChoiceOption, "roundingMode", roundingModeMap);
+const coerceDirection = /*@__PURE__*/ bindArgs(coerceChoiceOption, "direction", directionMap);
 function validateRoundingInc(roundingInc, smallestUnit, allowManyLargeUnits, solarMode) {
 	const upUnitNano = solarMode ? nanoInUtcDay : unitNanoMap[smallestUnit + 1];
 	if (upUnitNano) {
@@ -798,8 +820,8 @@ function refineZonedFieldOptions(options, defaultOffsetDisambig = 0) {
 		epochDisambig
 	];
 }
-const epochNanoMax = /* @__PURE__ */ BigInt(1e8) * bigNanoInUtcDay;
-const epochNanoMin = /* @__PURE__ */ BigInt(-1e8) * bigNanoInUtcDay;
+const epochNanoMax = /*@__PURE__*/ BigInt(1e8) * bigNanoInUtcDay;
+const epochNanoMin = /*@__PURE__*/ BigInt(-1e8) * bigNanoInUtcDay;
 const plainDateEpochNanoMin = epochNanoMin - bigNanoInUtcDay;
 const isoYearMonthIndexMin = -3261848;
 function checkIsoYearMonthInBounds(isoDate) {
@@ -1070,11 +1092,12 @@ function nudgeRelativeDuration(sign, durationFields, endEpochNano, _largestUnit,
 }
 function getTimeZoneTransitionEpochNanoseconds(slots, options) {
 	return slots.timeZone.U(slots.epochNanoseconds, ((options) => {
-		const res = coerceDirection(normalizeOptionsOrString(options, "direction"), 0);
+		const normalizedOptions = normalizeOptionsOrString(options, "direction");
+		const res = coerceDirection(normalizedOptions, 0);
 		return res || throwRangeError(invalidEntity("direction", res)), res;
 	})(options));
 }
-const zonedEpochSlotsToIso = /* @__PURE__ */ memoize(_zonedEpochSlotsToIso, WeakMap);
+const zonedEpochSlotsToIso = /*@__PURE__*/ memoize(_zonedEpochSlotsToIso, WeakMap);
 function _zonedEpochSlotsToIso(slots) {
 	const { epochNanoseconds, timeZone } = slots;
 	const offsetNanoseconds = timeZone.C(epochNanoseconds);
@@ -1640,7 +1663,7 @@ function resolveTimeFields(fields, overflow) {
 		...fields
 	}), overflow);
 }
-const offsetRegExp = /* @__PURE__ */ createRegExp("([+-])(\\d{2})(?::?(\\d{2})(?::?(\\d{2})(?:[.,](\\d{1,9}))?)?)?");
+const offsetRegExp = /*@__PURE__*/ createRegExp("([+-])(\\d{2})(?::?(\\d{2})(?::?(\\d{2})(?:[.,](\\d{1,9}))?)?)?");
 function parseOffsetNano(s) {
 	const offsetNano = parseOffsetNanoMaybe(s);
 	return void 0 === offsetNano && throwRangeError(failedParse(s)), offsetNano;
@@ -1675,13 +1698,13 @@ const dateFieldRefiners = {
 	},
 	day: toPositiveIntegerWithTruncation
 };
-const timeFieldRefiners = /* @__PURE__ */ zipPropsConst(timeFieldNamesAsc, toIntegerWithTrunc);
-const durationFieldRefiners = /* @__PURE__ */ zipPropsConst(durationFieldNamesAsc, toStrictInteger);
+const timeFieldRefiners = /*@__PURE__*/ zipPropsConst(timeFieldNamesAsc, toIntegerWithTrunc);
+const durationFieldRefiners = /*@__PURE__*/ zipPropsConst(durationFieldNamesAsc, toStrictInteger);
 const offsetFieldRefiners = { offset(offsetString) {
 	return parseOffsetNano(toStringViaPrimitive(offsetString));
 } };
-const dateTimeFieldRefiners = /* @__PURE__ */ Object.assign({}, dateFieldRefiners, timeFieldRefiners);
-const zonedDateTimeFieldRefiners = /* @__PURE__ */ Object.assign({}, dateTimeFieldRefiners, offsetFieldRefiners);
+const dateTimeFieldRefiners = /*@__PURE__*/ Object.assign({}, dateFieldRefiners, timeFieldRefiners);
+const zonedDateTimeFieldRefiners = /*@__PURE__*/ Object.assign({}, dateTimeFieldRefiners, offsetFieldRefiners);
 function readAndRefineBagFields(bag, validFieldNames, fieldRefiners, requiredFieldNames, disallowEmpty = !requiredFieldNames) {
 	const res = {};
 	let anyMatching = 0;
@@ -1784,7 +1807,9 @@ const timeZonePeriodDaysByName = {
 const minPossibleTransitionSec = -388152e4;
 function refineTimeDisplayTuple(options, maxSmallestUnit = 4) {
 	const subsecDigits = coerceFractionalSecondDigits(options);
-	return [coerceRoundingMode(options, 4), ...resolveSmallestUnitAndSubsecDigits(validateUnitRange(smallestUnitStr, coerceSmallestUnit(options), 0, maxSmallestUnit), subsecDigits)];
+	const roundingMode = coerceRoundingMode(options, 4);
+	const smallestUnit = coerceSmallestUnit(options);
+	return [roundingMode, ...resolveSmallestUnitAndSubsecDigits(validateUnitRange(smallestUnitStr, smallestUnit, 0, maxSmallestUnit), subsecDigits)];
 }
 function refineDateDisplayOptions(options) {
 	return coerceCalendarDisplay(normalizeOptions(options));
@@ -1959,15 +1984,17 @@ function resolveTimeZoneRecord(rawId) {
 		kind: "fixed",
 		...offsetRecord
 	};
-	return queryNamedTimeZoneRecord("UTC" === upperRawId ? "UTC" : ((rawId) => (badCharactersRegExp.test(rawId) && throwRangeError(invalidTimeZone(rawId)), icuRegExp.test(rawId) && throwRangeError("Forbidden ICU TimeZone"), rawId.toLowerCase().split("/").map((part, partI) => (part.length <= 3 || /\d/.test(part)) && !/etc|yap/.test(part) ? part.toUpperCase() : part.replace(/baja|dumont|[a-z]+/g, (a, i) => a.length <= 2 && !partI || "in" === a || "chat" === a ? a.toUpperCase() : a.length > 2 || !i ? capitalize(a).replace(/island|noronha|murdo|rivadavia|urville/, capitalize) : a)).join("/")))(rawId));
+	const normId = "UTC" === upperRawId ? "UTC" : ((rawId) => (badCharactersRegExp.test(rawId) && throwRangeError(invalidTimeZone(rawId)), icuRegExp.test(rawId) && throwRangeError("Forbidden ICU TimeZone"), rawId.toLowerCase().split("/").map((part, partI) => (part.length <= 3 || /\d/.test(part)) && !/etc|yap/.test(part) ? part.toUpperCase() : part.replace(/baja|dumont|[a-z]+/g, (a, i) => a.length <= 2 && !partI || "in" === a || "chat" === a ? a.toUpperCase() : a.length > 2 || !i ? capitalize(a).replace(/island|noronha|murdo|rivadavia|urville/, capitalize) : a)).join("/")))(rawId);
+	return queryNamedTimeZoneRecord(normId);
 }
-const queryNamedTimeZoneRecord = /* @__PURE__ */ memoize((normId) => {
+const queryNamedTimeZoneRecord = /*@__PURE__*/ memoize((normId) => {
 	if ("UTC" === normId) return {
 		kind: "utc",
 		id: normId,
 		o: normId
 	};
-	const format = queryTimeZoneIntlFormat(normId.toUpperCase());
+	const upperNormId = normId.toUpperCase();
+	const format = queryTimeZoneIntlFormat(upperNormId);
 	return {
 		kind: "named",
 		id: normId,
@@ -1975,7 +2002,7 @@ const queryNamedTimeZoneRecord = /* @__PURE__ */ memoize((normId) => {
 		o: format.resolvedOptions().timeZone
 	};
 });
-const queryTimeZoneIntlFormat = /* @__PURE__ */ memoize((upperNormId) => new RawDateTimeFormat("en-u-hc-h23", {
+const queryTimeZoneIntlFormat = /*@__PURE__*/ memoize((upperNormId) => new RawDateTimeFormat("en-u-hc-h23", {
 	calendar: "iso8601",
 	timeZone: upperNormId,
 	era: "short",
@@ -1990,7 +2017,7 @@ function queryTimeZone(rawTimeZoneId) {
 	const record = resolveTimeZoneRecord(rawTimeZoneId);
 	return queryTimeZoneRecord(record.id, record);
 }
-const queryTimeZoneRecord = /* @__PURE__ */ memoize((normTimeZoneId, record) => "named" === record.kind ? new IntlTimeZone(normTimeZoneId, record.o, record.format) : new FixedTimeZone(normTimeZoneId, record.o, "fixed" === record.kind ? record._ : 0));
+const queryTimeZoneRecord = /*@__PURE__*/ memoize((normTimeZoneId, record) => "named" === record.kind ? new IntlTimeZone(normTimeZoneId, record.o, record.format) : new FixedTimeZone(normTimeZoneId, record.o, "fixed" === record.kind ? record._ : 0));
 var FixedTimeZone = class {
 	constructor(id, compareKey, offsetNano) {
 		this.id = id, this.o = compareKey, this._ = offsetNano;
@@ -2072,7 +2099,8 @@ var IntlTimeZone = class {
 				return void 0 !== intlParts.era && "bce" === normalizeEraName(intlParts.era) ? 1 - year : year;
 			})(intlParts), parseInt(intlParts.month), parseInt(intlParts.day)) + 3600 * parseInt(intlParts.hour) + 60 * parseInt(intlParts.minute) + parseInt(intlParts.second) - epochSec;
 		})(format), ((timeZoneId) => {
-			return timeZonePeriodDaysByName[timeZoneId.split("/").pop()] || 60;
+			const timeZoneName = timeZoneId.split("/").pop();
+			return timeZonePeriodDaysByName[timeZoneName] || 60;
 		})(id));
 	}
 	C(epochNano) {
@@ -2296,12 +2324,12 @@ function offsetRegExpStr(separatorIndex) {
 	return "([+-])" + timeRegExpStr(separatorIndex);
 }
 const dateTimeRegExpStr = "(?:(?:([+-])(\\d{6}))|(\\d{4}))(-?)(\\d{2})\\4(\\d{2})(?:[T ]" + timeRegExpStr(8) + "(Z|" + offsetRegExpStr(15) + ")?)?";
-const yearMonthRegExp = /* @__PURE__ */ createRegExp("(?:(?:([+-])(\\d{6}))|(\\d{4}))-?(\\d{2})((?:\\[(!?)([^\\]]*)\\]){0,9})");
-const monthDayRegExp = /* @__PURE__ */ createRegExp("(?:--)?(\\d{2})-?(\\d{2})((?:\\[(!?)([^\\]]*)\\]){0,9})");
-const dateTimeRegExp = /* @__PURE__ */ createRegExp(dateTimeRegExpStr + "((?:\\[(!?)([^\\]]*)\\]){0,9})");
-const timeRegExp = /* @__PURE__ */ createRegExp("T?" + timeRegExpStr(2) + `(${offsetRegExpStr(9)})?((?:\\[(!?)([^\\]]*)\\]){0,9})`);
-const annotationRegExp = /* @__PURE__ */ new RegExp("\\[(!?)([^\\]]*)\\]", "g");
-const durationRegExp = /* @__PURE__ */ createRegExp("([+-])?P(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(?:T(?:(\\d+)(?:[.,](\\d{1,9}))?H)?(?:(\\d+)(?:[.,](\\d{1,9}))?M)?(?:(\\d+)(?:[.,](\\d{1,9}))?S)?)?");
+const yearMonthRegExp = /*@__PURE__*/ createRegExp("(?:(?:([+-])(\\d{6}))|(\\d{4}))-?(\\d{2})((?:\\[(!?)([^\\]]*)\\]){0,9})");
+const monthDayRegExp = /*@__PURE__*/ createRegExp("(?:--)?(\\d{2})-?(\\d{2})((?:\\[(!?)([^\\]]*)\\]){0,9})");
+const dateTimeRegExp = /*@__PURE__*/ createRegExp(dateTimeRegExpStr + "((?:\\[(!?)([^\\]]*)\\]){0,9})");
+const timeRegExp = /*@__PURE__*/ createRegExp("T?" + timeRegExpStr(2) + `(${offsetRegExpStr(9)})?((?:\\[(!?)([^\\]]*)\\]){0,9})`);
+const annotationRegExp = /*@__PURE__*/ new RegExp("\\[(!?)([^\\]]*)\\]", "g");
+const durationRegExp = /*@__PURE__*/ createRegExp("([+-])?P(\\d+Y)?(\\d+M)?(\\d+W)?(\\d+D)?(?:T(?:(\\d+)(?:[.,](\\d{1,9}))?H)?(?:(\\d+)(?:[.,](\\d{1,9}))?M)?(?:(\\d+)(?:[.,](\\d{1,9}))?S)?)?");
 function parseDateTimeLike(s) {
 	const parts = dateTimeRegExp.exec(s);
 	return parts ? ((parts) => {
@@ -2579,8 +2607,8 @@ const timeDefaultShapeFields = {
 	minute: "numeric",
 	second: "numeric"
 };
-const dateTimeDefaultShapeFields = /* @__PURE__ */ Object.assign({}, dateDefaultShapeFields, timeDefaultShapeFields);
-const zonedDateTimeDefaultShapeFields = /* @__PURE__ */ Object.assign({}, dateTimeDefaultShapeFields, { timeZoneName: "short" });
+const dateTimeDefaultShapeFields = /*@__PURE__*/ Object.assign({}, dateDefaultShapeFields, timeDefaultShapeFields);
+const zonedDateTimeDefaultShapeFields = /*@__PURE__*/ Object.assign({}, dateTimeDefaultShapeFields, { timeZoneName: "short" });
 const yearMonthDefaultShapeFields = {
 	year: "numeric",
 	month: "numeric"
@@ -2604,15 +2632,15 @@ const timeShapeFieldNames = [
 	"fractionalSecondDigits",
 	"timeStyle"
 ];
-const dateTimeShapeFieldNames = /* @__PURE__ */ dateShapeFieldNames.concat(timeShapeFieldNames);
-const yearMonthIgnoredFieldNames = /* @__PURE__ */ ["weekday", "day"].concat(timeShapeFieldNames);
-const monthDayIgnoredFieldNames = /* @__PURE__ */ ["weekday", "year"].concat(timeShapeFieldNames);
-const transformInstantOptions = /* @__PURE__ */ createOptionsTransformer(dateTimeShapeFieldNames, [], [], dateTimeDefaultShapeFields);
-const transformZonedOptions = /* @__PURE__ */ createOptionsTransformer(dateTimeShapeFieldNames, [], [], zonedDateTimeDefaultShapeFields);
-const transformDateTimeOptions = /* @__PURE__ */ createOptionsTransformer(dateTimeShapeFieldNames, [], ["timeZoneName"], dateTimeDefaultShapeFields);
-const transformDateOptions = /* @__PURE__ */ createOptionsTransformer(dateShapeFieldNames, timeShapeFieldNames, ["timeZoneName"], dateDefaultShapeFields);
-const transformTimeOptions = /* @__PURE__ */ createOptionsTransformer(timeShapeFieldNames, dateShapeFieldNames, ["timeZoneName", "era"], timeDefaultShapeFields);
-const transformYearMonthOptions = /* @__PURE__ */ createOptionsTransformer([
+const dateTimeShapeFieldNames = /*@__PURE__*/ dateShapeFieldNames.concat(timeShapeFieldNames);
+const yearMonthIgnoredFieldNames = /*@__PURE__*/ ["weekday", "day"].concat(timeShapeFieldNames);
+const monthDayIgnoredFieldNames = /*@__PURE__*/ ["weekday", "year"].concat(timeShapeFieldNames);
+const transformInstantOptions = /*@__PURE__*/ createOptionsTransformer(dateTimeShapeFieldNames, [], [], dateTimeDefaultShapeFields);
+const transformZonedOptions = /*@__PURE__*/ createOptionsTransformer(dateTimeShapeFieldNames, [], [], zonedDateTimeDefaultShapeFields);
+const transformDateTimeOptions = /*@__PURE__*/ createOptionsTransformer(dateTimeShapeFieldNames, [], ["timeZoneName"], dateTimeDefaultShapeFields);
+const transformDateOptions = /*@__PURE__*/ createOptionsTransformer(dateShapeFieldNames, timeShapeFieldNames, ["timeZoneName"], dateDefaultShapeFields);
+const transformTimeOptions = /*@__PURE__*/ createOptionsTransformer(timeShapeFieldNames, dateShapeFieldNames, ["timeZoneName", "era"], timeDefaultShapeFields);
+const transformYearMonthOptions = /*@__PURE__*/ createOptionsTransformer([
 	"year",
 	"month",
 	"dateStyle"
@@ -2634,7 +2662,7 @@ const transformYearMonthOptions = /* @__PURE__ */ createOptionsTransformer([
 		month: "numeric"
 	}
 });
-const transformMonthDayOptions = /* @__PURE__ */ createOptionsTransformer([
+const transformMonthDayOptions = /*@__PURE__*/ createOptionsTransformer([
 	"month",
 	"day",
 	"dateStyle"
@@ -2808,8 +2836,8 @@ function resolveBasicCalendarId(rawCalendarId) {
 function resolveBasicCalendarArg(rawCalendarId = isoCalendarId) {
 	return resolveBasicCalendarId(rawCalendarId);
 }
-const zonedDateTimeSlotsMap = /* @__PURE__ */ new WeakMap();
-const ZonedDateTime = /* @__PURE__ */ defineTemporalClass(ZonedDateTimeBranding, class {
+const zonedDateTimeSlotsMap = /*@__PURE__*/ new WeakMap();
+const ZonedDateTime = /*@__PURE__*/ defineTemporalClass(ZonedDateTimeBranding, class {
 	constructor(epochNanoseconds, timeZoneId, calendar = void 0) {
 		const epochNano = checkEpochNanoInBounds(toBigInt(epochNanoseconds));
 		const timeZone = queryTimeZone(refineTimeZoneId(timeZoneId));
@@ -2957,8 +2985,8 @@ function refineTimeZoneArg(arg) {
 	}
 	return ((arg) => resolveTimeZoneId(parseTimeZoneId(requireString(arg))))(arg);
 }
-const instantSlotsMap = /* @__PURE__ */ new WeakMap();
-const Instant = /* @__PURE__ */ defineTemporalClass(InstantBranding, class {
+const instantSlotsMap = /*@__PURE__*/ new WeakMap();
+const Instant = /*@__PURE__*/ defineTemporalClass(InstantBranding, class {
 	constructor(epochNanoseconds) {
 		const epochNano = checkEpochNanoInBounds(toBigInt(epochNanoseconds));
 		initInstant(this, createEpochNanoSlots(epochNano));
@@ -3043,8 +3071,8 @@ const { toTemporalInstant: toTemporalInstant$1 } = { toTemporalInstant() {
 function initInstant(instance, slots) {
 	return instantSlotsMap.set(instance, slots), attachDebugString(instance), instance;
 }
-const plainMonthDaySlotsMap = /* @__PURE__ */ new WeakMap();
-const PlainMonthDay = /* @__PURE__ */ defineTemporalClass(PlainMonthDayBranding, class {
+const plainMonthDaySlotsMap = /*@__PURE__*/ new WeakMap();
+const PlainMonthDay = /*@__PURE__*/ defineTemporalClass(PlainMonthDayBranding, class {
 	constructor(isoMonth, isoDay, calendar = void 0, referenceIsoYear) {
 		const isoMonthInt = toIntegerWithTrunc(isoMonth);
 		const isoDayInt = toIntegerWithTrunc(isoDay);
@@ -3108,8 +3136,8 @@ function toPlainMonthDaySlots(arg, options) {
 function initPlainMonthDay(instance, slots) {
 	return plainMonthDaySlotsMap.set(instance, slots), attachDebugString(instance), instance;
 }
-const plainYearMonthSlotsMap = /* @__PURE__ */ new WeakMap();
-const PlainYearMonth = /* @__PURE__ */ defineTemporalClass(PlainYearMonthBranding, class {
+const plainYearMonthSlotsMap = /*@__PURE__*/ new WeakMap();
+const PlainYearMonth = /*@__PURE__*/ defineTemporalClass(PlainYearMonthBranding, class {
 	constructor(isoYear, isoMonth, calendar = void 0, referenceIsoDay) {
 		const isoYearInt = toIntegerWithTrunc(isoYear);
 		const isoMonthInt = toIntegerWithTrunc(isoMonth);
@@ -3201,8 +3229,8 @@ function getTemporalBrandingAndSlots(obj) {
 function validateBag(bag) {
 	return (getTemporalBrandingAndSlots(bag) || void 0 !== bag.calendar || void 0 !== bag.timeZone) && throwTypeError("Invalid bag"), bag;
 }
-const plainTimeSlotsMap = /* @__PURE__ */ new WeakMap();
-const PlainTime = /* @__PURE__ */ defineTemporalClass(PlainTimeBranding, class {
+const plainTimeSlotsMap = /*@__PURE__*/ new WeakMap();
+const PlainTime = /*@__PURE__*/ defineTemporalClass(PlainTimeBranding, class {
 	constructor(hour = 0, minute = 0, second = 0, millisecond = 0, microsecond = 0, nanosecond = 0) {
 		const fields = validateTimeFields(mapProps(toIntegerWithTrunc, {
 			hour,
@@ -3284,8 +3312,8 @@ function optionalToPlainTimeFields(timeArg) {
 function initPlainTime(instance, slots) {
 	return plainTimeSlotsMap.set(instance, slots), attachDebugString(instance), instance;
 }
-const plainDateTimeSlotsMap = /* @__PURE__ */ new WeakMap();
-const PlainDateTime = /* @__PURE__ */ defineTemporalClass(PlainDateTimeBranding, class {
+const plainDateTimeSlotsMap = /*@__PURE__*/ new WeakMap();
+const PlainDateTime = /*@__PURE__*/ defineTemporalClass(PlainDateTimeBranding, class {
 	constructor(isoYear, isoMonth, isoDay, hour = 0, minute = 0, second = 0, millisecond = 0, microsecond = 0, nanosecond = 0, calendar = void 0) {
 		const fields = checkIsoDateTimeInBounds(validateIsoDateTimeFields(mapProps(toIntegerWithTrunc, {
 			year: isoYear,
@@ -3396,8 +3424,8 @@ function toPlainDateTimeSlots(arg, options) {
 function initPlainDateTime(instance, slots) {
 	return plainDateTimeSlotsMap.set(instance, slots), attachDebugString(instance), instance;
 }
-const plainDateSlotsMap = /* @__PURE__ */ new WeakMap();
-const PlainDate = /* @__PURE__ */ defineTemporalClass(PlainDateBranding, class {
+const plainDateSlotsMap = /*@__PURE__*/ new WeakMap();
+const PlainDate = /*@__PURE__*/ defineTemporalClass(PlainDateBranding, class {
 	constructor(isoYear, isoMonth, isoDay, calendar = void 0) {
 		const fields = checkIsoDateInBounds(validateIsoDateFields(mapProps(toIntegerWithTrunc, {
 			year: isoYear,
@@ -3515,8 +3543,8 @@ function refineCalendarArg(arg) {
 	}
 	return ((arg) => resolveBasicCalendarId(parseCalendarId(requireString(arg))))(arg);
 }
-const durationSlotsMap = /* @__PURE__ */ new WeakMap();
-const Duration = /* @__PURE__ */ defineTemporalClass(DurationBranding, class {
+const durationSlotsMap = /*@__PURE__*/ new WeakMap();
+const Duration = /*@__PURE__*/ defineTemporalClass(DurationBranding, class {
 	constructor(years = 0, months = 0, weeks = 0, days = 0, hours = 0, minutes = 0, seconds = 0, milliseconds = 0, microseconds = 0, nanoseconds = 0) {
 		const fields = validateDurationFields(mapProps(toStrictInteger, {
 			years,
@@ -3609,7 +3637,7 @@ function refinePublicRelativeTo(relativeTo) {
 function initDuration(instance, slots) {
 	return durationSlotsMap.set(instance, slots), attachDebugString(instance), instance;
 }
-const Now = /* @__PURE__ */ Object.defineProperties({}, {
+const Now = /*@__PURE__*/ Object.defineProperties({}, {
 	...createStringTagDescriptors("Temporal.Now"),
 	...createPropDescriptors({
 		timeZoneId() {
@@ -3633,7 +3661,7 @@ const Now = /* @__PURE__ */ Object.defineProperties({}, {
 		}
 	})
 });
-const Temporal$2 = /* @__PURE__ */ Object.defineProperties({}, {
+const Temporal$2 = /*@__PURE__*/ Object.defineProperties({}, {
 	...createStringTagDescriptors("Temporal"),
 	...createPropDescriptors({
 		PlainYearMonth,
@@ -3652,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.
@@ -3671,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
@@ -3718,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;
 		}
 	}
@@ -3751,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) {
@@ -3772,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)([
@@ -3845,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),
@@ -3861,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
@@ -3887,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
@@ -3916,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