let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1492 from svkozak/fix-discord-accountId

Browse Source 
Discord: preserve accountId in message actions (refs #1489)
This commit is contained in:
Peter Steinberger
2026-01-23 09:15:54 +00:00
committed by GitHub
parent 03e8b7c4ba 1b77e086d4
commit fb6363ae58
2 changed files with 139 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/agents/tools/cron-tool.test.ts
View File

@@ -5,6 +5,10 @@ vi.mock("../../gateway/call.js", () => ({
callGateway: (opts: unknown) => callGatewayMock(opts), callGateway: (opts: unknown) => callGatewayMock(opts),
})); }));
vi.mock("../agent-scope.js", () => ({
resolveSessionAgentId: () => "agent-123",
}));
import { createCronTool } from "./cron-tool.js"; import { createCronTool } from "./cron-tool.js";
describe("cron tool", () => { describe("cron tool", () => {
@@ -85,6 +89,23 @@ describe("cron tool", () => {
}); });
}); });
it("does not default agentId when job.agentId is null", async () => {
const tool = createCronTool({ agentSessionKey: "main" });
await tool.execute("call-null", {
action: "add",
job: {
name: "wake-up",
schedule: { atMs: 123 },
agentId: null,
},
});
const call = callGatewayMock.mock.calls[0]?.[0] as {
params?: { agentId?: unknown };
};
expect(call?.params?.agentId).toBeNull();
});
it("adds recent context for systemEvent reminders when contextMessages > 0", async () => { it("adds recent context for systemEvent reminders when contextMessages > 0", async () => {
callGatewayMock callGatewayMock
.mockResolvedValueOnce({ .mockResolvedValueOnce({

203
src/agents/tools/discord-actions.test.ts
View File

@@ -89,7 +89,7 @@ describe("handleDiscordMessagingAction", () => {
}, },
enableAllActions, enableAllActions,
); );
expect(reactMessageDiscord).toHaveBeenCalledWith("C1", "M1", "✅"); expect(reactMessageDiscord).toHaveBeenCalledWith("C1", "M1", "✅", {});
}); });
it("forwards accountId for reactions", async () => { it("forwards accountId for reactions", async () => {
@@ -116,7 +116,7 @@ describe("handleDiscordMessagingAction", () => {
}, },
enableAllActions, enableAllActions,
); );
expect(removeOwnReactionsDiscord).toHaveBeenCalledWith("C1", "M1"); expect(removeOwnReactionsDiscord).toHaveBeenCalledWith("C1", "M1", {});
}); });
it("removes reactions when remove flag set", async () => { it("removes reactions when remove flag set", async () => {
@@ -130,7 +130,7 @@ describe("handleDiscordMessagingAction", () => {
}, },
enableAllActions, enableAllActions,
); );
expect(removeReactionDiscord).toHaveBeenCalledWith("C1", "M1", "✅"); expect(removeReactionDiscord).toHaveBeenCalledWith("C1", "M1", "✅", {});
}); });
it("rejects removes without emoji", async () => { it("rejects removes without emoji", async () => {
@@ -252,15 +252,18 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(createChannelDiscord).toHaveBeenCalledWith({ expect(createChannelDiscord).toHaveBeenCalledWith(
guildId: "G1", {
name: "test-channel", guildId: "G1",
type: 0, name: "test-channel",
parentId: undefined, type: 0,
topic: "Test topic", parentId: undefined,
position: undefined, topic: "Test topic",
nsfw: undefined, position: undefined,
}); nsfw: undefined,
},
{},
);
expect(result.details).toMatchObject({ ok: true }); expect(result.details).toMatchObject({ ok: true });
}); });
@@ -289,15 +292,18 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(editChannelDiscord).toHaveBeenCalledWith({ expect(editChannelDiscord).toHaveBeenCalledWith(
channelId: "C1", {
name: "new-name", channelId: "C1",
topic: "new topic", name: "new-name",
position: undefined, topic: "new topic",
parentId: undefined, position: undefined,
nsfw: undefined, parentId: undefined,
rateLimitPerUser: undefined, nsfw: undefined,
}); rateLimitPerUser: undefined,
},
{},
);
}); });
it("clears the channel parent when parentId is null", async () => { it("clears the channel parent when parentId is null", async () => {
@@ -309,15 +315,18 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(editChannelDiscord).toHaveBeenCalledWith({ expect(editChannelDiscord).toHaveBeenCalledWith(
channelId: "C1", {
name: undefined, channelId: "C1",
topic: undefined, name: undefined,
position: undefined, topic: undefined,
parentId: null, position: undefined,
nsfw: undefined, parentId: null,
rateLimitPerUser: undefined, nsfw: undefined,
}); rateLimitPerUser: undefined,
},
{},
);
}); });
it("clears the channel parent when clearParent is true", async () => { it("clears the channel parent when clearParent is true", async () => {
@@ -329,20 +338,23 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(editChannelDiscord).toHaveBeenCalledWith({ expect(editChannelDiscord).toHaveBeenCalledWith(
channelId: "C1", {
name: undefined, channelId: "C1",
topic: undefined, name: undefined,
position: undefined, topic: undefined,
parentId: null, position: undefined,
nsfw: undefined, parentId: null,
rateLimitPerUser: undefined, nsfw: undefined,
}); rateLimitPerUser: undefined,
},
{},
);
}); });
it("deletes a channel", async () => { it("deletes a channel", async () => {
await handleDiscordGuildAction("channelDelete", { channelId: "C1" }, channelsEnabled); await handleDiscordGuildAction("channelDelete", { channelId: "C1" }, channelsEnabled);
expect(deleteChannelDiscord).toHaveBeenCalledWith("C1"); expect(deleteChannelDiscord).toHaveBeenCalledWith("C1", {});
}); });
it("moves a channel", async () => { it("moves a channel", async () => {
@@ -356,12 +368,15 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(moveChannelDiscord).toHaveBeenCalledWith({ expect(moveChannelDiscord).toHaveBeenCalledWith(
guildId: "G1", {
channelId: "C1", guildId: "G1",
parentId: "P1", channelId: "C1",
position: 5, parentId: "P1",
}); position: 5,
},
{},
);
}); });
it("clears the channel parent on move when parentId is null", async () => { it("clears the channel parent on move when parentId is null", async () => {
@@ -374,12 +389,15 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(moveChannelDiscord).toHaveBeenCalledWith({ expect(moveChannelDiscord).toHaveBeenCalledWith(
guildId: "G1", {
channelId: "C1", guildId: "G1",
parentId: null, channelId: "C1",
position: undefined, parentId: null,
}); position: undefined,
},
{},
);
}); });
it("clears the channel parent on move when clearParent is true", async () => { it("clears the channel parent on move when clearParent is true", async () => {
@@ -392,12 +410,15 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(moveChannelDiscord).toHaveBeenCalledWith({ expect(moveChannelDiscord).toHaveBeenCalledWith(
guildId: "G1", {
channelId: "C1", guildId: "G1",
parentId: null, channelId: "C1",
position: undefined, parentId: null,
}); position: undefined,
},
{},
);
}); });
it("creates a category with type=4", async () => { it("creates a category with type=4", async () => {
@@ -406,12 +427,15 @@ describe("handleDiscordGuildAction - channel management", () => {
{ guildId: "G1", name: "My Category" }, { guildId: "G1", name: "My Category" },
channelsEnabled, channelsEnabled,
); );
expect(createChannelDiscord).toHaveBeenCalledWith({ expect(createChannelDiscord).toHaveBeenCalledWith(
guildId: "G1", {
name: "My Category", guildId: "G1",
type: 4, name: "My Category",
position: undefined, type: 4,
}); position: undefined,
},
{},
);
}); });
it("edits a category", async () => { it("edits a category", async () => {
@@ -420,16 +444,19 @@ describe("handleDiscordGuildAction - channel management", () => {
{ categoryId: "CAT1", name: "Renamed Category" }, { categoryId: "CAT1", name: "Renamed Category" },
channelsEnabled, channelsEnabled,
); );
expect(editChannelDiscord).toHaveBeenCalledWith({ expect(editChannelDiscord).toHaveBeenCalledWith(
channelId: "CAT1", {
name: "Renamed Category", channelId: "CAT1",
position: undefined, name: "Renamed Category",
}); position: undefined,
},
{},
);
}); });
it("deletes a category", async () => { it("deletes a category", async () => {
await handleDiscordGuildAction("categoryDelete", { categoryId: "CAT1" }, channelsEnabled); await handleDiscordGuildAction("categoryDelete", { categoryId: "CAT1" }, channelsEnabled);
expect(deleteChannelDiscord).toHaveBeenCalledWith("CAT1"); expect(deleteChannelDiscord).toHaveBeenCalledWith("CAT1", {});
}); });
it("sets channel permissions for role", async () => { it("sets channel permissions for role", async () => {
@@ -444,13 +471,16 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(setChannelPermissionDiscord).toHaveBeenCalledWith({ expect(setChannelPermissionDiscord).toHaveBeenCalledWith(
channelId: "C1", {
targetId: "R1", channelId: "C1",
targetType: 0, targetId: "R1",
allow: "1024", targetType: 0,
deny: "2048", allow: "1024",
}); deny: "2048",
},
{},
);
}); });
it("sets channel permissions for member", async () => { it("sets channel permissions for member", async () => {
@@ -464,13 +494,16 @@ describe("handleDiscordGuildAction - channel management", () => {
}, },
channelsEnabled, channelsEnabled,
); );
expect(setChannelPermissionDiscord).toHaveBeenCalledWith({ expect(setChannelPermissionDiscord).toHaveBeenCalledWith(
channelId: "C1", {
targetId: "U1", channelId: "C1",
targetType: 1, targetId: "U1",
allow: "1024", targetType: 1,
deny: undefined, allow: "1024",
}); deny: undefined,
},
{},
);
}); });
it("removes channel permissions", async () => { it("removes channel permissions", async () => {
@@ -479,7 +512,7 @@ describe("handleDiscordGuildAction - channel management", () => {
{ channelId: "C1", targetId: "R1" }, { channelId: "C1", targetId: "R1" },
channelsEnabled, channelsEnabled,
); );
expect(removeChannelPermissionDiscord).toHaveBeenCalledWith("C1", "R1"); expect(removeChannelPermissionDiscord).toHaveBeenCalledWith("C1", "R1", {});
}); });
}); });