centersl/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-27 09:21:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): format discord provider follow-up

Browse Source
This commit is contained in:
Tak Hoffman
2026-03-26 16:05:25 -05:00
parent aeee72426d
commit 0805078118
3 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/discord/src/monitor/provider.test.ts
View File

@@ -136,16 +136,16 @@ describe("monitorDiscordProvider", () => {
beforeEach(() => {
resetDiscordProviderMonitorMocks();
providerTesting.setFetchDiscordApplicationId(async () => "app-1");
providerTesting.setCreateDiscordNativeCommand(
((...args: Parameters<typeof providerTesting.setCreateDiscordNativeCommand>[0] extends
providerTesting.setCreateDiscordNativeCommand(((
...args: Parameters<typeof providerTesting.setCreateDiscordNativeCommand>[0] extends
| ((...inner: infer P) => unknown)
| undefined
? P
: never) =>
createDiscordNativeCommandMock(
...(args as Parameters<typeof createDiscordNativeCommandMock>),
)) as NonNullable<Parameters<typeof providerTesting.setCreateDiscordNativeCommand>[0]>,
);
: never
) =>
createDiscordNativeCommandMock(
...(args as Parameters<typeof createDiscordNativeCommandMock>),
)) as NonNullable<Parameters<typeof providerTesting.setCreateDiscordNativeCommand>[0]>);
providerTesting.setRunDiscordGatewayLifecycle((...args) =>
monitorLifecycleMock(...(args as Parameters<typeof monitorLifecycleMock>)),
);
@@ -186,14 +186,24 @@ describe("monitorDiscordProvider", () => {
getPlugin: (name: string) => clientGetPluginMock(name),
} as never;
});
providerTesting.setGetPluginCommandSpecs((provider?: string) => getPluginCommandSpecsMock(provider));
providerTesting.setResolveDiscordAccount((...args) => resolveDiscordAccountMock(...args) as never);
providerTesting.setResolveNativeCommandsEnabled((...args) => resolveNativeCommandsEnabledMock(...args));
providerTesting.setResolveNativeSkillsEnabled((...args) => resolveNativeSkillsEnabledMock(...args));
providerTesting.setGetPluginCommandSpecs((provider?: string) =>
getPluginCommandSpecsMock(provider),
);
providerTesting.setResolveDiscordAccount(
(...args) => resolveDiscordAccountMock(...args) as never,
);
providerTesting.setResolveNativeCommandsEnabled((...args) =>
resolveNativeCommandsEnabledMock(...args),
);
providerTesting.setResolveNativeSkillsEnabled((...args) =>
resolveNativeSkillsEnabledMock(...args),
);
providerTesting.setListNativeCommandSpecsForConfig((...args) =>
listNativeCommandSpecsForConfigMock(...args),
);
providerTesting.setListSkillCommandsForAgents((...args) => listSkillCommandsForAgentsMock(...args) as never);
providerTesting.setListSkillCommandsForAgents(
(...args) => listSkillCommandsForAgentsMock(...args) as never,
);
providerTesting.setIsVerbose(() => isVerboseMock());
providerTesting.setShouldLogVerbose(() => shouldLogVerboseMock());
});

15
extensions/discord/src/monitor/provider.ts
View File

@@ -111,9 +111,7 @@ let createDiscordNativeCommandForTesting: typeof createDiscordNativeCommand | un
let runDiscordGatewayLifecycleForTesting: typeof runDiscordGatewayLifecycle | undefined;
let createDiscordGatewayPluginForTesting: typeof createDiscordGatewayPlugin | undefined;
let createDiscordGatewaySupervisorForTesting: typeof createDiscordGatewaySupervisor | undefined;
let loadDiscordVoiceRuntimeForTesting:
| (() => Promise<DiscordVoiceRuntimeModule>)
| undefined;
let loadDiscordVoiceRuntimeForTesting: (() => Promise<DiscordVoiceRuntimeModule>) | undefined;
let loadDiscordProviderSessionRuntimeForTesting:
| (() => Promise<DiscordProviderSessionRuntimeModule>)
| undefined;
@@ -652,8 +650,7 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
providerSetting: discordCfg.commands?.native,
globalSetting: cfg.commands?.native,
});
const nativeSkillsEnabled = (resolveNativeSkillsEnabledForTesting ?? resolveNativeSkillsEnabled)(
{
const nativeSkillsEnabled = (resolveNativeSkillsEnabledForTesting ?? resolveNativeSkillsEnabled)({
providerId: "discord",
providerSetting: discordCfg.commands?.nativeSkills,
globalSetting: cfg.commands?.nativeSkills,
@@ -949,13 +946,13 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
},
clientPlugins,
);
gatewaySupervisor = (createDiscordGatewaySupervisorForTesting ?? createDiscordGatewaySupervisor)(
{
gatewaySupervisor = (
createDiscordGatewaySupervisorForTesting ?? createDiscordGatewaySupervisor
)({
client,
isDisallowedIntentsError: isDiscordDisallowedIntentsError,
runtime,
},
);
});
const lifecycleGateway = client.getPlugin<GatewayPlugin>("gateway");
earlyGatewayEmitter = gatewaySupervisor.emitter;

22
test/helpers/extensions/discord-provider.test-support.ts
View File

@@ -36,9 +36,14 @@ type ProviderMonitorTestMocks = {
>;
getPluginCommandSpecsMock: Mock<(provider?: string) => PluginCommandSpecMock[]>;
listNativeCommandSpecsForConfigMock: Mock<
(cfg?: unknown, params?: { skillCommands?: unknown[]; provider?: string }) => NativeCommandSpecMock[]
(
cfg?: unknown,
params?: { skillCommands?: unknown[]; provider?: string },
) => NativeCommandSpecMock[]
>;
listSkillCommandsForAgentsMock: Mock<
(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]
>;
listSkillCommandsForAgentsMock: Mock<(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]>;
monitorLifecycleMock: Mock<(params: { threadBindings: { stop: () => void } }) => Promise<void>>;
resolveDiscordAccountMock: Mock<
(params?: { cfg?: unknown; accountId?: string | null; token?: string | null }) => unknown
@@ -111,11 +116,14 @@ const providerMonitorTestMocks: ProviderMonitorTestMocks = vi.hoisted(() => {
),
getPluginCommandSpecsMock: vi.fn<(provider?: string) => PluginCommandSpecMock[]>(() => []),
listNativeCommandSpecsForConfigMock: vi.fn<
(cfg?: unknown, params?: { skillCommands?: unknown[]; provider?: string }) => NativeCommandSpecMock[]
>(() => [
{ name: "cmd", description: "built-in", acceptsArgs: false },
]),
listSkillCommandsForAgentsMock: vi.fn<(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]>(() => []),
(
cfg?: unknown,
params?: { skillCommands?: unknown[]; provider?: string },
) => NativeCommandSpecMock[]
>(() => [{ name: "cmd", description: "built-in", acceptsArgs: false }]),
listSkillCommandsForAgentsMock: vi.fn<
(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]
>(() => []),
monitorLifecycleMock: vi.fn(async (params: { threadBindings: { stop: () => void } }) => {
params.threadBindings.stop();
}),