vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-04 22:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Matrix: clarify room merge path

Browse Source
This commit is contained in:
Daanvdplas
2026-03-31 17:55:41 +02:00
committed by Gustavo Madeira Santana
parent 59d84731d6
commit 5881e50638
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/matrix/src/matrix/accounts.ts
View File

@@ -184,8 +184,9 @@ export function resolveMatrixAccountConfig(params: {
}): MatrixConfig {
const env = params.env ?? process.env;
const accountId = normalizeAccountId(params.accountId);
const base = resolveMatrixBaseConfig(params.cfg);
const merged = resolveMergedAccountConfig<MatrixConfig>({
channelConfig: resolveMatrixBaseConfig(params.cfg),
channelConfig: base,
accounts: params.cfg.channels?.matrix?.accounts as
| Record<string, Partial<MatrixConfig>>
| undefined,
@@ -193,7 +194,6 @@ export function resolveMatrixAccountConfig(params: {
normalizeAccountId,
nestedObjectKeys: ["dm", "actions"],
});
const base = resolveMatrixBaseConfig(params.cfg);
const accountConfig = findMatrixAccountConfig(params.cfg, accountId);
const isMultiAccount = resolveConfiguredMatrixAccountIds(params.cfg, env).length > 1;
const groups = mergeMatrixRoomEntries(
@@ -212,6 +212,7 @@ export function resolveMatrixAccountConfig(params: {
}),
accountConfig?.rooms,
);
// Room maps need custom scoping, so keep the generic merge for all other fields.
const { groups: _ignoredGroups, rooms: _ignoredRooms, ...rest } = merged;
return {
...rest,