diff --git a/src/channels/plugins/status-issues/discord.ts b/src/channels/plugins/status-issues/discord.ts index d3e6b795ca0..f3e8765093f 100644 --- a/src/channels/plugins/status-issues/discord.ts +++ b/src/channels/plugins/status-issues/discord.ts @@ -1,5 +1,10 @@ import type { ChannelAccountSnapshot, ChannelStatusIssue } from "../types.js"; -import { appendMatchMetadata, asString, isRecord } from "./shared.js"; +import { + appendMatchMetadata, + asString, + isRecord, + resolveEnabledConfiguredAccountId, +} from "./shared.js"; type DiscordIntentSummary = { messageContent?: "enabled" | "limited" | "disabled"; @@ -111,10 +116,8 @@ export function collectDiscordStatusIssues( if (!account) { continue; } - const accountId = asString(account.accountId) ?? "default"; - const enabled = account.enabled !== false; - const configured = account.configured === true; - if (!enabled || !configured) { + const accountId = resolveEnabledConfiguredAccountId(account); + if (!accountId) { continue; } diff --git a/src/channels/plugins/status-issues/shared.ts b/src/channels/plugins/status-issues/shared.ts index da3606c2e9f..d4f5be878c1 100644 --- a/src/channels/plugins/status-issues/shared.ts +++ b/src/channels/plugins/status-issues/shared.ts @@ -30,3 +30,14 @@ export function appendMatchMetadata( const meta = formatMatchMetadata(params); return meta ? `${message} (${meta})` : message; } + +export function resolveEnabledConfiguredAccountId(account: { + accountId?: unknown; + enabled?: unknown; + configured?: unknown; +}): string | null { + const accountId = asString(account.accountId) ?? "default"; + const enabled = account.enabled !== false; + const configured = account.configured === true; + return enabled && configured ? accountId : null; +} diff --git a/src/channels/plugins/status-issues/telegram.ts b/src/channels/plugins/status-issues/telegram.ts index 8853bf4b1c8..97998eb4da4 100644 --- a/src/channels/plugins/status-issues/telegram.ts +++ b/src/channels/plugins/status-issues/telegram.ts @@ -1,5 +1,10 @@ import type { ChannelAccountSnapshot, ChannelStatusIssue } from "../types.js"; -import { appendMatchMetadata, asString, isRecord } from "./shared.js"; +import { + appendMatchMetadata, + asString, + isRecord, + resolveEnabledConfiguredAccountId, +} from "./shared.js"; type TelegramAccountStatus = { accountId?: unknown; @@ -81,10 +86,8 @@ export function collectTelegramStatusIssues( if (!account) { continue; } - const accountId = asString(account.accountId) ?? "default"; - const enabled = account.enabled !== false; - const configured = account.configured === true; - if (!enabled || !configured) { + const accountId = resolveEnabledConfiguredAccountId(account); + if (!accountId) { continue; }