vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-05 02:50:23 +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

21
extensions/irc/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 { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
import { parseOptionalDelimitedEntries } from "openclaw/plugin-sdk/core";
import { tryReadSecretFileSync } from "openclaw/plugin-sdk/infra-runtime";
@@ -60,19 +60,16 @@ function resolveAccountConfig(cfg: CoreConfig, accountId: string): IrcAccountCon
}
function mergeIrcAccountConfig(cfg: CoreConfig, accountId: string): IrcAccountConfig {
const {
accounts: _ignored,
defaultAccount: _ignoredDefaultAccount,
...base
} = (cfg.channels?.irc ?? {}) as IrcAccountConfig & {
accounts?: unknown;
defaultAccount?: unknown;
};
const account = resolveAccountConfig(cfg, accountId) ?? {};
const merged: IrcAccountConfig = { ...base, ...account };
if (base.nickserv || account.nickserv) {
const merged: IrcAccountConfig = mergeAccountConfig<IrcAccountConfig>({
channelConfig: cfg.channels?.irc as IrcAccountConfig | undefined,
accountConfig: account,
omitKeys: ["defaultAccount"],
});
const baseNickServ = (cfg.channels?.irc as IrcAccountConfig | undefined)?.nickserv;
if (baseNickServ || account.nickserv) {
merged.nickserv = {
...base.nickserv,
...baseNickServ,
...account.nickserv,
};
}