vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-05 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: adopt shared account merge helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-22 18:20:29 +00:00
parent ff759f991e
commit 017d295edb
7 changed files with 53 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/bluebubbles/src/accounts.ts
View File

@@ -1,4 +1,4 @@
import { createAccountListHelpers } from "openclaw/plugin-sdk/account-helpers";
import { createAccountListHelpers, mergeAccountConfig } from "openclaw/plugin-sdk/account-helpers";
import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
import { hasConfiguredSecretInput, normalizeSecretInputString } from "./secret-input.js";
@@ -34,14 +34,14 @@ function mergeBlueBubblesAccountConfig(
cfg: OpenClawConfig,
accountId: string,
): BlueBubblesAccountConfig {
const base = (cfg.channels?.bluebubbles ?? {}) as BlueBubblesAccountConfig & {
accounts?: unknown;
defaultAccount?: unknown;
};
const { accounts: _ignored, defaultAccount: _ignoredDefaultAccount, ...rest } = base;
const account = resolveAccountConfig(cfg, accountId) ?? {};
const chunkMode = account.chunkMode ?? rest.chunkMode ?? "length";
return { ...rest, ...account, chunkMode };
const merged = mergeAccountConfig<BlueBubblesAccountConfig>({
channelConfig: cfg.channels?.bluebubbles as BlueBubblesAccountConfig | undefined,
accountConfig: account,
omitKeys: ["defaultAccount"],
});
const chunkMode = account.chunkMode ?? merged.chunkMode ?? "length";
return { ...merged, chunkMode };
}
export function resolveBlueBubblesAccount(params: {