github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 03:51:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Enable "curly" rule to avoid single-statement if confusion/errors.

Browse Source
This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/routing/bindings.ts
View File

@@ -6,7 +6,9 @@ import { normalizeAccountId, normalizeAgentId } from "./session-key.js";
function normalizeBindingChannelId(raw?: string | null): string | null {
const normalized = normalizeChatChannelId(raw);
if (normalized) return normalized;
if (normalized) {
return normalized;
}
const fallback = (raw ?? "").trim().toLowerCase();
return fallback || null;
}
@@ -17,16 +19,26 @@ export function listBindings(cfg: OpenClawConfig): AgentBinding[] {
export function listBoundAccountIds(cfg: OpenClawConfig, channelId: string): string[] {
const normalizedChannel = normalizeBindingChannelId(channelId);
if (!normalizedChannel) return [];
if (!normalizedChannel) {
return [];
}
const ids = new Set<string>();
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
if (!binding || typeof binding !== "object") {
continue;
}
const match = binding.match;
if (!match || typeof match !== "object") continue;
if (!match || typeof match !== "object") {
continue;
}
const channel = normalizeBindingChannelId(match.channel);
if (!channel || channel !== normalizedChannel) continue;
if (!channel || channel !== normalizedChannel) {
continue;
}
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
if (!accountId || accountId === "*") {
continue;
}
ids.add(normalizeAccountId(accountId));
}
return Array.from(ids).toSorted((a, b) => a.localeCompare(b));
@@ -37,17 +49,29 @@ export function resolveDefaultAgentBoundAccountId(
channelId: string,
): string | null {
const normalizedChannel = normalizeBindingChannelId(channelId);
if (!normalizedChannel) return null;
if (!normalizedChannel) {
return null;
}
const defaultAgentId = normalizeAgentId(resolveDefaultAgentId(cfg));
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
if (normalizeAgentId(binding.agentId) !== defaultAgentId) continue;
if (!binding || typeof binding !== "object") {
continue;
}
if (normalizeAgentId(binding.agentId) !== defaultAgentId) {
continue;
}
const match = binding.match;
if (!match || typeof match !== "object") continue;
if (!match || typeof match !== "object") {
continue;
}
const channel = normalizeBindingChannelId(match.channel);
if (!channel || channel !== normalizedChannel) continue;
if (!channel || channel !== normalizedChannel) {
continue;
}
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
if (!accountId || accountId === "*") {
continue;
}
return normalizeAccountId(accountId);
}
return null;
@@ -56,18 +80,28 @@ export function resolveDefaultAgentBoundAccountId(
export function buildChannelAccountBindings(cfg: OpenClawConfig) {
const map = new Map<string, Map<string, string[]>>();
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
if (!binding || typeof binding !== "object") {
continue;
}
const match = binding.match;
if (!match || typeof match !== "object") continue;
if (!match || typeof match !== "object") {
continue;
}
const channelId = normalizeBindingChannelId(match.channel);
if (!channelId) continue;
if (!channelId) {
continue;
}
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
if (!accountId || accountId === "*") {
continue;
}
const agentId = normalizeAgentId(binding.agentId);
const byAgent = map.get(channelId) ?? new Map<string, string[]>();
const list = byAgent.get(agentId) ?? [];
const normalizedAccountId = normalizeAccountId(accountId);
if (!list.includes(normalizedAccountId)) list.push(normalizedAccountId);
if (!list.includes(normalizedAccountId)) {
list.push(normalizedAccountId);
}
byAgent.set(agentId, list);
map.set(channelId, byAgent);
}
@@ -79,6 +113,8 @@ export function resolvePreferredAccountId(params: {
defaultAccountId: string;
boundAccounts: string[];
}): string {
if (params.boundAccounts.length > 0) return params.boundAccounts[0];
if (params.boundAccounts.length > 0) {
return params.boundAccounts[0];
}
return params.defaultAccountId;
}