diff --git a/extensions/discord/src/monitor/access-groups.ts b/extensions/discord/src/monitor/access-groups.ts index 47372f6593e..a21dcb1a3af 100644 --- a/extensions/discord/src/monitor/access-groups.ts +++ b/extensions/discord/src/monitor/access-groups.ts @@ -1,6 +1,4 @@ import { - ACCESS_GROUP_ALLOW_FROM_PREFIX, - parseAccessGroupAllowFromEntry, resolveAccessGroupAllowFromMatches, type AccessGroupMembershipResolver, } from "openclaw/plugin-sdk/command-auth"; @@ -9,12 +7,6 @@ import { logVerbose } from "openclaw/plugin-sdk/runtime-env"; import type { RequestClient } from "../internal/discord.js"; import { canViewDiscordGuildChannel } from "../send.permissions.js"; -export const DISCORD_ACCESS_GROUP_PREFIX = ACCESS_GROUP_ALLOW_FROM_PREFIX; - -export function parseDiscordAccessGroupEntry(entry: string): string | null { - return parseAccessGroupAllowFromEntry(entry); -} - export function createDiscordAccessGroupMembershipResolver(params: { token?: string; rest?: RequestClient; diff --git a/extensions/discord/src/monitor/message-handler.preflight.test-helpers.ts b/extensions/discord/src/monitor/message-handler.preflight.test-helpers.ts index e284ed20590..b1d3c433e96 100644 --- a/extensions/discord/src/monitor/message-handler.preflight.test-helpers.ts +++ b/extensions/discord/src/monitor/message-handler.preflight.test-helpers.ts @@ -64,12 +64,14 @@ export function createDiscordMessage(params: { mentionedUsers?: Array<{ id: string }>; mentionedEveryone?: boolean; attachments?: Array>; + webhookId?: string; }): import("../internal/discord.js").Message { return { id: params.id, content: params.content, timestamp: new Date().toISOString(), channelId: params.channelId, + webhookId: params.webhookId, attachments: params.attachments ?? [], mentionedUsers: params.mentionedUsers ?? [], mentionedRoles: [], diff --git a/extensions/discord/src/monitor/message-handler.preflight.test.ts b/extensions/discord/src/monitor/message-handler.preflight.test.ts index d9396e2a158..042088eb9b3 100644 --- a/extensions/discord/src/monitor/message-handler.preflight.test.ts +++ b/extensions/discord/src/monitor/message-handler.preflight.test.ts @@ -696,7 +696,7 @@ describe("preflightDiscordMessage", () => { id: "m-webhook-proxy-1", channelId: threadId, content: "proxied user message", - webhook_id: "pluralkit-webhook-1", + webhookId: "pluralkit-webhook-1", author: { id: "relay-bot-1", bot: true,