mirror of
https://github.com/farcasclaudiu/openclaw.git
synced 2026-06-28 21:01:43 +03:00
fix (discord): ignore empty guild channel maps in allowlist resolution
This commit is contained in:
@@ -308,6 +308,12 @@ function resolveDiscordChannelEntryMatch(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasConfiguredDiscordChannels(
|
||||||
|
channels: DiscordGuildEntryResolved["channels"] | undefined,
|
||||||
|
): channels is NonNullable<DiscordGuildEntryResolved["channels"]> {
|
||||||
|
return Boolean(channels && Object.keys(channels).length > 0);
|
||||||
|
}
|
||||||
|
|
||||||
function resolveDiscordChannelConfigEntry(
|
function resolveDiscordChannelConfigEntry(
|
||||||
entry: DiscordChannelEntry,
|
entry: DiscordChannelEntry,
|
||||||
): DiscordChannelConfigResolved {
|
): DiscordChannelConfigResolved {
|
||||||
@@ -333,7 +339,7 @@ export function resolveDiscordChannelConfig(params: {
|
|||||||
}): DiscordChannelConfigResolved | null {
|
}): DiscordChannelConfigResolved | null {
|
||||||
const { guildInfo, channelId, channelName, channelSlug } = params;
|
const { guildInfo, channelId, channelName, channelSlug } = params;
|
||||||
const channels = guildInfo?.channels;
|
const channels = guildInfo?.channels;
|
||||||
if (!channels) {
|
if (!hasConfiguredDiscordChannels(channels)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const match = resolveDiscordChannelEntryMatch(channels, {
|
const match = resolveDiscordChannelEntryMatch(channels, {
|
||||||
@@ -366,7 +372,7 @@ export function resolveDiscordChannelConfigWithFallback(params: {
|
|||||||
scope,
|
scope,
|
||||||
} = params;
|
} = params;
|
||||||
const channels = guildInfo?.channels;
|
const channels = guildInfo?.channels;
|
||||||
if (!channels) {
|
if (!hasConfiguredDiscordChannels(channels)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const resolvedParentSlug = parentSlug ?? (parentName ? normalizeDiscordSlug(parentName) : "");
|
const resolvedParentSlug = parentSlug ?? (parentName ? normalizeDiscordSlug(parentName) : "");
|
||||||
|
|||||||
Reference in New Issue
Block a user