github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 19:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use per-account action config for Discord and Telegram gating

Browse Source 
listActions now unions gates across all enabled accounts (matching the
Signal pattern), and handleDiscordAction/handleTelegramAction resolve
through the per-account merged config instead of reading only the
top-level channel actions object.  This lets account-specific
moderation/sticker/presence overrides take effect at both listing and
execution time.
This commit is contained in:
El-Fitz
2026-02-16 14:22:52 +01:00
committed by Peter Steinberger
parent 1faf8e8e9d
commit a03fec2a3f
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/agents/tools/discord-actions.ts
View File

@@ -1,5 +1,6 @@
import type { AgentToolResult } from "@mariozechner/pi-agent-core";
import type { OpenClawConfig } from "../../config/config.js";
import { resolveDiscordAccount } from "../../discord/accounts.js";
import { createActionGate, readStringParam } from "./common.js";
import { handleDiscordGuildAction } from "./discord-actions-guild.js";
import { handleDiscordMessagingAction } from "./discord-actions-messaging.js";
@@ -59,7 +60,9 @@ export async function handleDiscordAction(
cfg: OpenClawConfig,
): Promise<AgentToolResult<unknown>> {
const action = readStringParam(params, "action", { required: true });
const isActionEnabled = createActionGate(cfg.channels?.discord?.actions);
const accountId = readStringParam(params, "accountId");
const account = resolveDiscordAccount({ cfg, accountId });
const isActionEnabled = createActionGate(account.config.actions);
if (messagingActions.has(action)) {
return await handleDiscordMessagingAction(action, params, isActionEnabled);

4
src/agents/tools/telegram-actions.ts
View File

@@ -1,5 +1,6 @@
import type { AgentToolResult } from "@mariozechner/pi-agent-core";
import type { OpenClawConfig } from "../../config/config.js";
import { resolveTelegramAccount } from "../../telegram/accounts.js";
import type { TelegramButtonStyle, TelegramInlineButtons } from "../../telegram/button-types.js";
import {
resolveTelegramInlineButtonsScope,
@@ -87,7 +88,8 @@ export async function handleTelegramAction(
): Promise<AgentToolResult<unknown>> {
const action = readStringParam(params, "action", { required: true });
const accountId = readStringParam(params, "accountId");
const isActionEnabled = createActionGate(cfg.channels?.telegram?.actions);
const account = resolveTelegramAccount({ cfg, accountId });
const isActionEnabled = createActionGate(account.config.actions);
if (action === "react") {
// Check reaction level first