@fedify/botkit 0.5.0-dev.210 → 0.5.0-dev.226

package/dist/bot-impl.test.js

@@ -139,7 +139,7 @@ test("BotImpl.dispatchActor()", async () => {
 	assert.ok(publicKey != null);
 	assert.deepStrictEqual(publicKey.ownerId, actor.id);
 	assert.ok(publicKey.publicKey != null);
-	const keys = await repository.getKeyPairs();
+	const keys = await repository.getKeyPairs("bot");
 	assert.ok(keys != null);
 	assert.deepStrictEqual(publicKey.publicKey, keys[0].publicKey);
 	const assertionMethods = await Array.fromAsync(actor.getAssertionMethods());
@@ -166,7 +166,7 @@ test("BotImpl.dispatchActorKeyPairs()", async () => {
 	const ctx = bot.federation.createContext(new URL("https://example.com"), void 0);
 	assert.deepStrictEqual(await bot.dispatchActorKeyPairs(ctx, "non-existent"), []);
 	const keyPairs = await bot.dispatchActorKeyPairs(ctx, "bot");
-	const storedKeyPairs = await repository.getKeyPairs();
+	const storedKeyPairs = await repository.getKeyPairs("bot");
 	assert.deepStrictEqual(keyPairs, storedKeyPairs);
 	const keyPairs2 = await bot.dispatchActorKeyPairs(ctx, "bot");
 	assert.deepStrictEqual(keyPairs2, storedKeyPairs);
@@ -187,17 +187,17 @@ test("BotImpl.dispatchFollowers()", async () => {
 		items: [],
 		nextCursor: null
 	});
-	await repository.addFollower(new URL("https://example.com/actor/1#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/1#follow"), new Person({
 		id: new URL("https://example.com/actor/1"),
 		preferredUsername: "john",
 		inbox: new URL("https://example.com/actor/1/inbox")
 	}));
-	await repository.addFollower(new URL("https://example.com/actor/2#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/2#follow"), new Person({
 		id: new URL("https://example.com/actor/2"),
 		preferredUsername: "jane",
 		inbox: new URL("https://example.com/actor/2/inbox")
 	}));
-	await repository.addFollower(new URL("https://example.com/actor/3#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/3#follow"), new Person({
 		id: new URL("https://example.com/actor/3"),
 		preferredUsername: "joe",
 		inbox: new URL("https://example.com/actor/3/inbox")
@@ -249,17 +249,17 @@ test("BotImpl.countFollowers()", async () => {
 	const ctx = bot.federation.createContext(new URL("https://example.com"), void 0);
 	assert.deepStrictEqual(await bot.countFollowers(ctx, "non-existent"), null);
 	assert.deepStrictEqual(await bot.countFollowers(ctx, "bot"), 0);
-	await repository.addFollower(new URL("https://example.com/actor/1#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/1#follow"), new Person({
 		id: new URL("https://example.com/actor/1"),
 		preferredUsername: "john",
 		inbox: new URL("https://example.com/actor/1/inbox")
 	}));
-	await repository.addFollower(new URL("https://example.com/actor/2#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/2#follow"), new Person({
 		id: new URL("https://example.com/actor/2"),
 		preferredUsername: "jane",
 		inbox: new URL("https://example.com/actor/2/inbox")
 	}));
-	await repository.addFollower(new URL("https://example.com/actor/3#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/3#follow"), new Person({
 		id: new URL("https://example.com/actor/3"),
 		preferredUsername: "joe",
 		inbox: new URL("https://example.com/actor/3/inbox")
@@ -298,7 +298,7 @@ test("BotImpl.getPermissionChecker()", async () => {
 	assert.deepStrictEqual(nonFollower(unlistedPost), true);
 	assert.deepStrictEqual(nonFollower(followersPost), false);
 	assert.deepStrictEqual(nonFollower(directPost), false);
-	await repository.addFollower(new URL("https://example.com/actor/john#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/john#follow"), new Person({
 		id: new URL("https://example.com/actor/john"),
 		preferredUsername: "john"
 	}));
@@ -337,7 +337,7 @@ test("BotImpl.dispatchOutbox()", async () => {
 		items: [],
 		nextCursor: null
 	});
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -352,7 +352,7 @@ test("BotImpl.dispatchOutbox()", async () => {
 		}),
 		published: Temporal.Instant.from("2025-01-01T00:00:00Z")
 	}));
-	await repository.addMessage("46442170-836d-4a0d-9142-f31242abe2f9", new Create({
+	await repository.addMessage("bot", "46442170-836d-4a0d-9142-f31242abe2f9", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/46442170-836d-4a0d-9142-f31242abe2f9"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -367,7 +367,7 @@ test("BotImpl.dispatchOutbox()", async () => {
 		}),
 		published: Temporal.Instant.from("2025-01-02T00:00:00Z")
 	}));
-	await repository.addMessage("8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
+	await repository.addMessage("bot", "8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/8386a4c7-06f8-409f-ad72-2bba43e83363"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: new URL("https://example.com/ap/actor/john"),
@@ -427,7 +427,7 @@ test("BotImpl.countOutbox()", async () => {
 	const ctx = bot.federation.createContext(new URL("https://example.com"), void 0);
 	assert.deepStrictEqual(await bot.countOutbox(ctx, "non-existent"), null);
 	assert.deepStrictEqual(await bot.countOutbox(ctx, "bot"), 0);
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -440,7 +440,7 @@ test("BotImpl.countOutbox()", async () => {
 			content: "Hello, world!"
 		})
 	}));
-	await repository.addMessage("46442170-836d-4a0d-9142-f31242abe2f9", new Create({
+	await repository.addMessage("bot", "46442170-836d-4a0d-9142-f31242abe2f9", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/46442170-836d-4a0d-9142-f31242abe2f9"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -453,7 +453,7 @@ test("BotImpl.countOutbox()", async () => {
 			content: "Hello, followers!"
 		})
 	}));
-	await repository.addMessage("8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
+	await repository.addMessage("bot", "8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/8386a4c7-06f8-409f-ad72-2bba43e83363"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: new URL("https://example.com/ap/actor/john"),
@@ -475,14 +475,20 @@ test("BotImpl.dispatchFollow()", async () => {
 		username: "bot"
 	});
 	const ctx = bot.federation.createContext(new Request("https://example.com/"), void 0);
-	assert.deepStrictEqual(await bot.dispatchFollow(ctx, { id: crypto.randomUUID() }), null);
-	await repository.addSentFollow("b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a", new Follow({
+	assert.deepStrictEqual(await bot.dispatchFollow(ctx, {
+		identifier: "bot",
+		id: crypto.randomUUID()
+	}), null);
+	await repository.addSentFollow("bot", "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a", new Follow({
 		id: new URL("https://example.com/ap/follow/b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		object: new URL("https://example.com/ap/actor/john"),
 		to: new URL("https://example.com/ap/actor/john")
 	}));
-	const follow = await bot.dispatchFollow(ctx, { id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a" });
+	const follow = await bot.dispatchFollow(ctx, {
+		identifier: "bot",
+		id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"
+	});
 	assert.ok(follow instanceof Follow);
 	assert.deepStrictEqual(follow.id, new URL("https://example.com/ap/follow/b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"));
 	assert.deepStrictEqual(follow.actorId, new URL("https://example.com/ap/actor/bot"));
@@ -497,7 +503,7 @@ test("BotImpl.authorizeFollow()", async () => {
 		username: "bot"
 	});
 	const ctx = bot.federation.createContext(new Request("https://example.com/"), void 0);
-	await repository.addSentFollow("b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a", new Follow({
+	await repository.addSentFollow("bot", "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a", new Follow({
 		id: new URL("https://example.com/ap/follow/b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		object: new URL("https://example.com/ap/actor/john"),
@@ -511,13 +517,25 @@ test("BotImpl.authorizeFollow()", async () => {
 		});
 	};
 	setSignedKeyOwner(new Person({ id: new URL("https://example.com/ap/actor/john") }));
-	assert.ok(await bot.authorizeFollow(ctx, { id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a" }));
+	assert.ok(await bot.authorizeFollow(ctx, {
+		identifier: "bot",
+		id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"
+	}));
 	setSignedKeyOwner(await new SessionImpl(bot, ctx).getActor());
-	assert.ok(await bot.authorizeFollow(ctx, { id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a" }));
+	assert.ok(await bot.authorizeFollow(ctx, {
+		identifier: "bot",
+		id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"
+	}));
 	setSignedKeyOwner(new Person({ id: new URL("https://example.com/ap/actor/alice") }));
-	assert.deepStrictEqual(await bot.authorizeFollow(ctx, { id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a" }), false);
+	assert.deepStrictEqual(await bot.authorizeFollow(ctx, {
+		identifier: "bot",
+		id: "b51f6ca8-53e6-4f7d-ac1f-d039e8c6df5a"
+	}), false);
 	setSignedKeyOwner(new Person({ id: new URL("https://example.com/ap/actor/john") }));
-	assert.deepStrictEqual(await bot.authorizeFollow(ctx, { id: crypto.randomUUID() }), false);
+	assert.deepStrictEqual(await bot.authorizeFollow(ctx, {
+		identifier: "bot",
+		id: crypto.randomUUID()
+	}), false);
 });
 test("BotImpl.dispatchCreate()", async () => {
 	const repository = new MemoryRepository();
@@ -527,8 +545,11 @@ test("BotImpl.dispatchCreate()", async () => {
 		username: "bot"
 	});
 	const ctx = bot.federation.createContext(new Request("https://example.com/"), void 0);
-	assert.deepStrictEqual(await bot.dispatchCreate(ctx, { id: "non-existent" }), null);
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	assert.deepStrictEqual(await bot.dispatchCreate(ctx, {
+		identifier: "bot",
+		id: "non-existent"
+	}), null);
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -541,14 +562,20 @@ test("BotImpl.dispatchCreate()", async () => {
 			content: "Hello, world!"
 		})
 	}));
-	const create = await bot.dispatchCreate(ctx, { id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e" });
+	const create = await bot.dispatchCreate(ctx, {
+		identifier: "bot",
+		id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"
+	});
 	assert.ok(create instanceof Create);
 	assert.deepStrictEqual(create.id, new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"));
 	const ctx2 = bot.federation.createContext(new Request("https://example.com/"), void 0);
 	const actor = new Person({ id: new URL("https://example.com/ap/actor/john") });
 	ctx2.getSignedKeyOwner = () => Promise.resolve(actor);
-	assert.deepStrictEqual(await bot.dispatchCreate(ctx2, { id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e" }), create);
-	await repository.addMessage("8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
+	assert.deepStrictEqual(await bot.dispatchCreate(ctx2, {
+		identifier: "bot",
+		id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"
+	}), create);
+	await repository.addMessage("bot", "8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/8386a4c7-06f8-409f-ad72-2bba43e83363"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: new URL("https://example.com/ap/actor/john"),
@@ -559,18 +586,27 @@ test("BotImpl.dispatchCreate()", async () => {
 			content: "Hello, followers!"
 		})
 	}));
-	assert.deepStrictEqual(await bot.dispatchCreate(ctx, { id: "8386a4c7-06f8-409f-ad72-2bba43e83363" }), null);
-	const create2 = await bot.dispatchCreate(ctx2, { id: "8386a4c7-06f8-409f-ad72-2bba43e83363" });
+	assert.deepStrictEqual(await bot.dispatchCreate(ctx, {
+		identifier: "bot",
+		id: "8386a4c7-06f8-409f-ad72-2bba43e83363"
+	}), null);
+	const create2 = await bot.dispatchCreate(ctx2, {
+		identifier: "bot",
+		id: "8386a4c7-06f8-409f-ad72-2bba43e83363"
+	});
 	assert.ok(create2 instanceof Create);
 	assert.deepStrictEqual(create2.id, new URL("https://example.com/ap/actor/bot/create/8386a4c7-06f8-409f-ad72-2bba43e83363"));
-	await repository.addMessage("ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
+	await repository.addMessage("bot", "ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
 		id: new URL("https://example.com/ap/actor/bot/announce/ce8081ac-f238-484b-9a70-5d8a4b66d829"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
 		cc: new URL("https://example.com/ap/actor/bot/followers"),
 		object: new URL("https://example.com/ap/actor/bot/note/2")
 	}));
-	assert.deepStrictEqual(await bot.dispatchCreate(ctx, { id: "ce8081ac-f238-484b-9a70-5d8a4b66d829" }), null);
+	assert.deepStrictEqual(await bot.dispatchCreate(ctx, {
+		identifier: "bot",
+		id: "ce8081ac-f238-484b-9a70-5d8a4b66d829"
+	}), null);
 });
 test("BotImpl.dispatchMessage()", async () => {
 	const repository = new MemoryRepository();
@@ -581,7 +617,7 @@ test("BotImpl.dispatchMessage()", async () => {
 	});
 	const ctx = bot.federation.createContext(new Request("https://example.com/"), void 0);
 	assert.deepStrictEqual(await bot.dispatchMessage(Note, ctx, "non-existent"), null);
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -602,7 +638,7 @@ test("BotImpl.dispatchMessage()", async () => {
 	ctx2.getSignedKeyOwner = () => Promise.resolve(actor);
 	assert.deepStrictEqual(await bot.dispatchMessage(Note, ctx2, "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"), note);
 	assert.deepStrictEqual(await bot.dispatchMessage(Article, ctx, "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"), null);
-	await repository.addMessage("8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
+	await repository.addMessage("bot", "8386a4c7-06f8-409f-ad72-2bba43e83363", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/8386a4c7-06f8-409f-ad72-2bba43e83363"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: new URL("https://example.com/ap/actor/john"),
@@ -617,7 +653,7 @@ test("BotImpl.dispatchMessage()", async () => {
 	const note2 = await bot.dispatchMessage(Note, ctx2, "8386a4c7-06f8-409f-ad72-2bba43e83363");
 	assert.ok(note2 instanceof Note);
 	assert.deepStrictEqual(note2.id, new URL("https://example.com/ap/actor/bot/note/3"));
-	await repository.addMessage("ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
+	await repository.addMessage("bot", "ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
 		id: new URL("https://example.com/ap/actor/bot/announce/ce8081ac-f238-484b-9a70-5d8a4b66d829"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -634,18 +670,24 @@ test("BotImpl.dispatchAnnounce()", async () => {
 		username: "bot"
 	});
 	const ctx = bot.federation.createContext(new Request("https://example.com/"), void 0);
-	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, { id: "non-existent" }), null);
-	await repository.addMessage("ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
+	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, {
+		identifier: "bot",
+		id: "non-existent"
+	}), null);
+	await repository.addMessage("bot", "ce8081ac-f238-484b-9a70-5d8a4b66d829", new Announce({
 		id: new URL("https://example.com/ap/actor/bot/announce/ce8081ac-f238-484b-9a70-5d8a4b66d829"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
 		cc: new URL("https://example.com/ap/actor/bot/followers"),
 		object: new URL("https://example.com/ap/actor/bot/note/2")
 	}));
-	const announce = await bot.dispatchAnnounce(ctx, { id: "ce8081ac-f238-484b-9a70-5d8a4b66d829" });
+	const announce = await bot.dispatchAnnounce(ctx, {
+		identifier: "bot",
+		id: "ce8081ac-f238-484b-9a70-5d8a4b66d829"
+	});
 	assert.ok(announce instanceof Announce);
 	assert.deepStrictEqual(announce.id, new URL("https://example.com/ap/actor/bot/announce/ce8081ac-f238-484b-9a70-5d8a4b66d829"));
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -658,18 +700,27 @@ test("BotImpl.dispatchAnnounce()", async () => {
 			content: "Hello, world!"
 		})
 	}));
-	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, { id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e" }), null);
-	await repository.addMessage("d4a7ef9b-682c-4de9-b23c-87747d6725cb", new Announce({
+	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, {
+		identifier: "bot",
+		id: "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"
+	}), null);
+	await repository.addMessage("bot", "d4a7ef9b-682c-4de9-b23c-87747d6725cb", new Announce({
 		id: new URL("https://example.com/ap/actor/bot/announce/d4a7ef9b-682c-4de9-b23c-87747d6725cb"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: new URL("https://example.com/ap/actor/john"),
 		object: new URL("https://example.com/ap/actor/bot/note/2")
 	}));
-	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, { id: "d4a7ef9b-682c-4de9-b23c-87747d6725cb" }), null);
+	assert.deepStrictEqual(await bot.dispatchAnnounce(ctx, {
+		identifier: "bot",
+		id: "d4a7ef9b-682c-4de9-b23c-87747d6725cb"
+	}), null);
 	const ctx2 = bot.federation.createContext(new Request("https://example.com/"), void 0);
 	const actor = new Person({ id: new URL("https://example.com/ap/actor/john") });
 	ctx2.getSignedKeyOwner = () => Promise.resolve(actor);
-	const announce2 = await bot.dispatchAnnounce(ctx2, { id: "d4a7ef9b-682c-4de9-b23c-87747d6725cb" });
+	const announce2 = await bot.dispatchAnnounce(ctx2, {
+		identifier: "bot",
+		id: "d4a7ef9b-682c-4de9-b23c-87747d6725cb"
+	});
 	assert.ok(announce2 instanceof Announce);
 	assert.deepStrictEqual(announce2.id, new URL("https://example.com/ap/actor/bot/announce/d4a7ef9b-682c-4de9-b23c-87747d6725cb"));
 });
@@ -762,7 +813,7 @@ for (const policy of [
 			object: new URL("https://example.com/ap/actor/bot")
 		});
 		await bot.onFollowed(ctx, followWithoutActor);
-		assert.deepStrictEqual(await repository.countFollowers(), 0);
+		assert.deepStrictEqual(await repository.countFollowers("bot"), 0);
 	});
 	await t.test("with wrong actor", async () => {
 		const followWithWrongActor = new Follow({
@@ -771,7 +822,7 @@ for (const policy of [
 			object: new URL("https://example.com/ap/actor/bot")
 		});
 		await bot.onFollowed(ctx, followWithWrongActor);
-		assert.deepStrictEqual(await repository.countFollowers(), 0);
+		assert.deepStrictEqual(await repository.countFollowers("bot"), 0);
 	});
 	const actor = new Person({
 		id: new URL("https://example.com/ap/actor/john"),
@@ -784,7 +835,7 @@ for (const policy of [
 			object: new URL("https://example.com/ap/actor/non-existent")
 		});
 		await bot.onFollowed(ctx, followWithWrongRecipient);
-		assert.deepStrictEqual(await repository.countFollowers(), 0);
+		assert.deepStrictEqual(await repository.countFollowers("bot"), 0);
 	});
 	await t.test("with correct follow", async () => {
 		const follow = new Follow({
@@ -794,9 +845,9 @@ for (const policy of [
 		});
 		await bot.onFollowed(ctx, follow);
 		if (policy === "accept") {
-			assert.deepStrictEqual(await repository.countFollowers(), 1);
-			assert.ok(await repository.hasFollower(new URL("https://example.com/ap/actor/john")));
-			const [storedFollower] = await Array.fromAsync(repository.getFollowers());
+			assert.deepStrictEqual(await repository.countFollowers("bot"), 1);
+			assert.ok(await repository.hasFollower("bot", new URL("https://example.com/ap/actor/john")));
+			const [storedFollower] = await Array.fromAsync(repository.getFollowers("bot"));
 			assert.ok(storedFollower instanceof Person);
 			assert.deepStrictEqual(storedFollower.id, actor.id);
 			assert.deepStrictEqual(ctx.sentActivities.length, 1);
@@ -809,7 +860,7 @@ for (const policy of [
 			assert.deepStrictEqual(ctx.forwardedRecipients, []);
 			assert.deepStrictEqual(followRequests.length, 1);
 		} else {
-			assert.deepStrictEqual(await repository.countFollowers(), 0);
+			assert.deepStrictEqual(await repository.countFollowers("bot"), 0);
 			if (policy === "reject") {
 				assert.deepStrictEqual(ctx.sentActivities.length, 1);
 				const { activity, recipients } = ctx.sentActivities[0];
@@ -838,13 +889,13 @@ test("BotImpl.onUnfollowed()", async (t) => {
 	const unfollowed = [];
 	bot.onUnfollow = (session, actor) => void unfollowed.push([session, actor]);
 	const ctx = createMockInboxContext(bot, "https://example.com", "bot");
-	await repository.addFollower(new URL("https://example.com/ap/actor/john/follows/bot"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/ap/actor/john/follows/bot"), new Person({
 		id: new URL("https://example.com/ap/actor/john"),
 		preferredUsername: "john"
 	}));
 	async function assertNoEffect() {
-		assert.deepStrictEqual(await repository.countFollowers(), 1);
-		const [follower] = await Array.fromAsync(repository.getFollowers());
+		assert.deepStrictEqual(await repository.countFollowers("bot"), 1);
+		const [follower] = await Array.fromAsync(repository.getFollowers("bot"));
 		assert.ok(follower instanceof Person);
 		assert.deepStrictEqual(follower.id, new URL("https://example.com/ap/actor/john"));
 		assert.deepStrictEqual(follower.preferredUsername, "john");
@@ -890,7 +941,7 @@ test("BotImpl.onUnfollowed()", async (t) => {
 			object: new Follow({ id: new URL("https://example.com/ap/actor/john/follows/bot") })
 		});
 		await bot.onUnfollowed(ctx, undo);
-		assert.deepStrictEqual(await repository.countFollowers(), 0);
+		assert.deepStrictEqual(await repository.countFollowers("bot"), 0);
 		assert.deepStrictEqual(ctx.sentActivities, []);
 		assert.deepStrictEqual(ctx.forwardedRecipients, []);
 		assert.deepStrictEqual(unfollowed.length, 1);
@@ -930,7 +981,7 @@ test("BotImpl.onFollowAccepted()", async (t) => {
 		assert.deepStrictEqual(accepted, []);
 	});
 	await t.test("with non-actor", async () => {
-		await repository.addSentFollow("2ca58e2a-a34a-43e6-81af-c4f21ffed0c5", new Follow({
+		await repository.addSentFollow("bot", "2ca58e2a-a34a-43e6-81af-c4f21ffed0c5", new Follow({
 			id: new URL("https://example.com/ap/follow/2ca58e2a-a34a-43e6-81af-c4f21ffed0c5"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Note({})
@@ -942,7 +993,7 @@ test("BotImpl.onFollowAccepted()", async (t) => {
 		assert.deepStrictEqual(accepted, []);
 	});
 	await t.test("with actor without URI", async () => {
-		await repository.addSentFollow("a99ff3bf-72a2-412b-83b9-cba894d38805", new Follow({
+		await repository.addSentFollow("bot", "a99ff3bf-72a2-412b-83b9-cba894d38805", new Follow({
 			id: new URL("https://example.com/ap/follow/a99ff3bf-72a2-412b-83b9-cba894d38805"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Person({ preferredUsername: "john" })
@@ -954,7 +1005,7 @@ test("BotImpl.onFollowAccepted()", async (t) => {
 		assert.deepStrictEqual(accepted, []);
 	});
 	await t.test("with actor", async () => {
-		await repository.addSentFollow("3bca0b8e-503a-47ea-ad69-6b7c29369fbd", new Follow({
+		await repository.addSentFollow("bot", "3bca0b8e-503a-47ea-ad69-6b7c29369fbd", new Follow({
 			id: new URL("https://example.com/ap/follow/3bca0b8e-503a-47ea-ad69-6b7c29369fbd"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Person({
@@ -972,7 +1023,7 @@ test("BotImpl.onFollowAccepted()", async (t) => {
 		assert.deepStrictEqual(session.context, ctx);
 		assert.ok(actor instanceof Person);
 		assert.deepStrictEqual(actor.id, new URL("https://example.com/ap/actor/john"));
-		const follow = await repository.getFollowee(new URL("https://example.com/ap/actor/john"));
+		const follow = await repository.getFollowee("bot", new URL("https://example.com/ap/actor/john"));
 		assert.ok(follow != null);
 		assert.ok(follow instanceof Follow);
 		assert.deepStrictEqual(follow.id, new URL("https://example.com/ap/follow/3bca0b8e-503a-47ea-ad69-6b7c29369fbd"));
@@ -1008,7 +1059,7 @@ test("BotImpl.onFollowRejected()", async (t) => {
 		assert.deepStrictEqual(rejected, []);
 	});
 	await t.test("with non-actor", async () => {
-		await repository.addSentFollow("2ca58e2a-a34a-43e6-81af-c4f21ffed0c5", new Follow({
+		await repository.addSentFollow("bot", "2ca58e2a-a34a-43e6-81af-c4f21ffed0c5", new Follow({
 			id: new URL("https://example.com/ap/follow/2ca58e2a-a34a-43e6-81af-c4f21ffed0c5"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Note({})
@@ -1020,7 +1071,7 @@ test("BotImpl.onFollowRejected()", async (t) => {
 		assert.deepStrictEqual(rejected, []);
 	});
 	await t.test("with actor without URI", async () => {
-		await repository.addSentFollow("a99ff3bf-72a2-412b-83b9-cba894d38805", new Follow({
+		await repository.addSentFollow("bot", "a99ff3bf-72a2-412b-83b9-cba894d38805", new Follow({
 			id: new URL("https://example.com/ap/follow/a99ff3bf-72a2-412b-83b9-cba894d38805"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Person({ preferredUsername: "john" })
@@ -1032,7 +1083,7 @@ test("BotImpl.onFollowRejected()", async (t) => {
 		assert.deepStrictEqual(rejected, []);
 	});
 	await t.test("with actor", async () => {
-		await repository.addSentFollow("3bca0b8e-503a-47ea-ad69-6b7c29369fbd", new Follow({
+		await repository.addSentFollow("bot", "3bca0b8e-503a-47ea-ad69-6b7c29369fbd", new Follow({
 			id: new URL("https://example.com/ap/follow/3bca0b8e-503a-47ea-ad69-6b7c29369fbd"),
 			actor: new URL("https://example.com/ap/actor/bot"),
 			object: new Person({
@@ -1050,7 +1101,7 @@ test("BotImpl.onFollowRejected()", async (t) => {
 		assert.deepStrictEqual(session.context, ctx);
 		assert.ok(actor instanceof Person);
 		assert.deepStrictEqual(actor.id, new URL("https://example.com/ap/actor/john"));
-		assert.deepStrictEqual(await repository.getSentFollow("3bca0b8e-503a-47ea-ad69-6b7c29369fbd"), void 0);
+		assert.deepStrictEqual(await repository.getSentFollow("bot", "3bca0b8e-503a-47ea-ad69-6b7c29369fbd"), void 0);
 	});
 });
 test("BotImpl.onCreated()", async (t) => {
@@ -1088,7 +1139,7 @@ test("BotImpl.onCreated()", async (t) => {
 		assert.deepStrictEqual(ctx.sentActivities, []);
 		assert.deepStrictEqual(ctx.forwardedRecipients, []);
 	});
-	await repository.addMessage("a6358f1b-c978-49d3-8065-37a1df6168de", new Create({
+	await repository.addMessage("bot", "a6358f1b-c978-49d3-8065-37a1df6168de", new Create({
 		id: new URL("https://example.com/ap/create/a6358f1b-c978-49d3-8065-37a1df6168de"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		to: PUBLIC_COLLECTION,
@@ -1257,7 +1308,7 @@ test("BotImpl.onAnnounced()", async () => {
 		to: PUBLIC_COLLECTION,
 		cc: new URL("https://example.com/ap/actor/bot/followers"),
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1289,7 +1340,7 @@ test("BotImpl.onLiked()", async () => {
 		id: new URL("https://example.com/ap/actor/bot/like/1"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1320,7 +1371,7 @@ test("BotImpl.onUnliked()", async () => {
 		id: new URL("https://example.com/ap/actor/bot/like/1"),
 		actor: new URL("https://example.com/ap/actor/bot"),
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1361,7 +1412,7 @@ test("BotImpl.onReacted()", async () => {
 		actor: new URL("https://example.com/ap/actor/bot"),
 		name: ":heart:",
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1395,7 +1446,7 @@ test("BotImpl.onReacted()", async () => {
 		actor: new URL("https://example.com/ap/actor/bot"),
 		name: ":thumbsup:",
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1437,7 +1488,7 @@ test("BotImpl.onUnreacted()", async () => {
 		actor: new URL("https://example.com/ap/actor/bot"),
 		name: ":heart:",
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1476,7 +1527,7 @@ test("BotImpl.onUnreacted()", async () => {
 		actor: new URL("https://example.com/ap/actor/bot"),
 		name: ":thumbsup:",
 		object: new Note({
-			id: new URL("https://example.com/ap/actor/bot/note/1"),
+			id: new URL("https://example.com/notes/1"),
 			attribution: new URL("https://example.com/ap/actor/bot"),
 			to: PUBLIC_COLLECTION,
 			cc: new URL("https://example.com/ap/actor/bot/followers"),
@@ -1582,12 +1633,12 @@ test("BotImpl.fetch() includes FEP-5711 inverse properties", async () => {
 		collectionWindow: 1
 	});
 	const actorId = new URL("https://example.com/ap/actor/bot");
-	await repository.addFollower(new URL("https://example.com/actor/1#follow"), new Person({
+	await repository.addFollower("bot", new URL("https://example.com/actor/1#follow"), new Person({
 		id: new URL("https://example.com/actor/1"),
 		preferredUsername: "john",
 		inbox: new URL("https://example.com/actor/1/inbox")
 	}));
-	await repository.addMessage("78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
+	await repository.addMessage("bot", "78acb1ea-4ac6-46b7-bcd4-3a8965d8126e", new Create({
 		id: new URL("https://example.com/ap/actor/bot/create/78acb1ea-4ac6-46b7-bcd4-3a8965d8126e"),
 		actor: actorId,
 		to: PUBLIC_COLLECTION,
@@ -1815,7 +1866,7 @@ test("BotImpl.onVote()", async (t) => {
 		}),
 		published: Temporal.Now.instant()
 	});
-	await repository.addMessage(pollId, poll);
+	await repository.addMessage("bot", pollId, poll);
 	const voter = new Person({
 		id: new URL("https://hollo.social/@alice"),
 		preferredUsername: "alice"
@@ -1858,7 +1909,7 @@ test("BotImpl.onVote()", async (t) => {
 		assert.ok(updateActivity != null, "Update activity should be found");
 		assert.ok(updateActivity.activity instanceof Update);
 		assert.deepStrictEqual(updateActivity.activity.objectId, poll.id);
-		const updatedPoll = await repository.getMessage(pollId);
+		const updatedPoll = await repository.getMessage("bot", pollId);
 		assert.ok(updatedPoll instanceof Create);
 		const updatedQuestion = await updatedPoll.getObject(ctx);
 		assert.ok(updatedQuestion instanceof Question);
@@ -1901,7 +1952,7 @@ test("BotImpl.onVote()", async (t) => {
 			}),
 			published: Temporal.Now.instant()
 		});
-		await repository.addMessage(multiPollId, multiPoll);
+		await repository.addMessage("bot", multiPollId, multiPoll);
 		ctx.sentActivities = [];
 		ctx.forwardedRecipients = [];
 		receivedVote = null;
@@ -1978,7 +2029,7 @@ test("BotImpl.onVote()", async (t) => {
 			}),
 			published: Temporal.Now.instant()
 		});
-		await repository.addMessage(expiredPollId, expiredPoll);
+		await repository.addMessage("bot", expiredPollId, expiredPoll);
 		ctx.sentActivities = [];
 		ctx.forwardedRecipients = [];
 		receivedVote = null;
@@ -2021,6 +2072,93 @@ test("BotImpl.onVote()", async (t) => {
 		assert.deepStrictEqual(receivedVote, null, "onVote should not be called for invalid option");
 	});
 });
+test("BotImpl.fetch() redirects legacy object URIs", async (t) => {
+	const bot = new BotImpl({
+		kv: new MemoryKvStore(),
+		username: "bot"
+	});
+	await t.test("redirects GET requests", async () => {
+		const response = await bot.fetch(new Request("https://example.com/ap/follow/2ca58e2a-a34a-43e6-81af-c4f21ffed0c5"), void 0);
+		assert.deepStrictEqual(response.status, 301);
+		assert.deepStrictEqual(response.headers.get("Location"), "https://example.com/ap/actor/bot/follow/2ca58e2a-a34a-43e6-81af-c4f21ffed0c5");
+	});
+	await t.test("redirects HEAD requests", async () => {
+		const response = await bot.fetch(new Request("https://example.com/ap/note/123", { method: "HEAD" }), void 0);
+		assert.deepStrictEqual(response.status, 301);
+		assert.deepStrictEqual(response.headers.get("Location"), "https://example.com/ap/actor/bot/note/123");
+	});
+	await t.test("preserves the query string", async () => {
+		const response = await bot.fetch(new Request("https://example.com/ap/note/123?foo=bar"), void 0);
+		assert.deepStrictEqual(response.status, 301);
+		assert.deepStrictEqual(response.headers.get("Location"), "https://example.com/ap/actor/bot/note/123?foo=bar");
+	});
+	await t.test("does not redirect POST requests", async () => {
+		const response = await bot.fetch(new Request("https://example.com/ap/note/123", { method: "POST" }), void 0);
+		assert.notDeepStrictEqual(response.status, 301);
+	});
+	await t.test("does not redirect canonical or unrelated paths", async () => {
+		const canonical = await bot.fetch(new Request("https://example.com/ap/actor/bot/note/123"), void 0);
+		assert.notDeepStrictEqual(canonical.status, 301);
+		const inbox = await bot.fetch(new Request("https://example.com/ap/inbox"), void 0);
+		assert.notDeepStrictEqual(inbox.status, 301);
+	});
+});
+test("BotImpl.onFollowAccepted() with canonical follow URIs", async () => {
+	const repository = new MemoryRepository();
+	const bot = new BotImpl({
+		kv: new MemoryKvStore(),
+		repository,
+		username: "bot"
+	});
+	const accepted = [];
+	bot.onAcceptFollow = (_, actor) => void accepted.push(actor);
+	const ctx = createMockInboxContext(bot, "https://example.com", "bot");
+	await repository.addSentFollow("bot", "9d952a10-77e6-46bd-a48a-208b47e5e2bb", new Follow({
+		id: new URL("https://example.com/ap/actor/bot/follow/9d952a10-77e6-46bd-a48a-208b47e5e2bb"),
+		actor: new URL("https://example.com/ap/actor/bot"),
+		object: new Person({
+			id: new URL("https://example.com/ap/actor/john"),
+			preferredUsername: "john"
+		})
+	}));
+	await bot.onFollowAccepted(ctx, new Accept({
+		actor: new URL("https://example.com/ap/actor/john"),
+		object: new URL("https://example.com/ap/actor/bot/follow/9d952a10-77e6-46bd-a48a-208b47e5e2bb")
+	}));
+	assert.deepStrictEqual(accepted.length, 1);
+	assert.deepStrictEqual(accepted[0].id, new URL("https://example.com/ap/actor/john"));
+	assert.ok(await repository.getFollowee("bot", new URL("https://example.com/ap/actor/john")) != null);
+});
+test("BotImpl.onLiked() with legacy message URIs", async () => {
+	const repository = new MemoryRepository();
+	const bot = new BotImpl({
+		kv: new MemoryKvStore(),
+		repository,
+		username: "bot"
+	});
+	const likes = [];
+	bot.onLike = (_, like) => void likes.push(like);
+	const ctx = createMockInboxContext(bot, "https://example.com", "bot");
+	const messageId = "01941f29-7c00-7fe8-ab0a-7b593990a3c0";
+	await repository.addMessage("bot", messageId, new Create({
+		id: new URL(`https://example.com/ap/actor/bot/create/${messageId}`),
+		actor: new URL("https://example.com/ap/actor/bot"),
+		to: PUBLIC_COLLECTION,
+		object: new Note({
+			id: new URL(`https://example.com/ap/actor/bot/note/${messageId}`),
+			attribution: new URL("https://example.com/ap/actor/bot"),
+			to: PUBLIC_COLLECTION,
+			content: "Hello, world!"
+		})
+	}));
+	await bot.onLiked(ctx, new Like({
+		id: new URL("https://remote.example/likes/1"),
+		actor: new URL("https://example.com/ap/actor/bot"),
+		object: new URL(`https://example.com/ap/note/${messageId}`)
+	}));
+	assert.deepStrictEqual(likes.length, 1);
+	assert.deepStrictEqual(likes[0].message.id, new URL(`https://example.com/ap/actor/bot/note/${messageId}`));
+});
 
 //#endregion
 //# sourceMappingURL=bot-impl.test.js.map