refactor: extract shared string normalization helpers

This commit is contained in:
Peter Steinberger
2026-02-18 03:17:20 +00:00
parent 8984f31876
commit 8407eeb33c
5 changed files with 32 additions and 29 deletions

View File

@@ -9,6 +9,7 @@ import type {
GroupToolPolicyBySenderConfig,
GroupToolPolicyConfig,
} from "../../config/types.tools.js";
import { normalizeHyphenSlug } from "../../shared/string-normalization.js";
import { resolveSlackAccount } from "../../slack/accounts.js";
type GroupMentionParams = {
@@ -38,16 +39,6 @@ function normalizeDiscordSlug(value?: string | null) {
return text;
}
function normalizeSlackSlug(raw?: string | null) {
const trimmed = raw?.trim().toLowerCase() ?? "";
if (!trimmed) {
return "";
}
const dashed = trimmed.replace(/\s+/g, "-");
const cleaned = dashed.replace(/[^a-z0-9#@._+-]+/g, "-");
return cleaned.replace(/-{2,}/g, "-").replace(/^[-.]+|[-.]+$/g, "");
}
function parseTelegramGroupId(value?: string | null) {
const raw = value?.trim() ?? "";
if (!raw) {
@@ -231,7 +222,7 @@ export function resolveSlackGroupRequireMention(params: GroupMentionParams): boo
const channelId = params.groupId?.trim();
const groupChannel = params.groupChannel;
const channelName = groupChannel?.replace(/^#/, "");
const normalizedName = normalizeSlackSlug(channelName);
const normalizedName = normalizeHyphenSlug(channelName);
const candidates = [
channelId ?? "",
channelName ? `#${channelName}` : "",
@@ -363,7 +354,7 @@ export function resolveSlackGroupToolPolicy(
const channelId = params.groupId?.trim();
const groupChannel = params.groupChannel;
const channelName = groupChannel?.replace(/^#/, "");
const normalizedName = normalizeSlackSlug(channelName);
const normalizedName = normalizeHyphenSlug(channelName);
const candidates = [
channelId ?? "",
channelName ? `#${channelName}` : "",

View File

@@ -1,17 +1,12 @@
import type { MsgContext } from "../../auto-reply/templating.js";
import { normalizeHyphenSlug } from "../../shared/string-normalization.js";
import { listDeliverableMessageChannels } from "../../utils/message-channel.js";
import type { GroupKeyResolution } from "./types.js";
const getGroupSurfaces = () => new Set<string>([...listDeliverableMessageChannels(), "webchat"]);
function normalizeGroupLabel(raw?: string) {
const trimmed = raw?.trim().toLowerCase() ?? "";
if (!trimmed) {
return "";
}
const dashed = trimmed.replace(/\s+/g, "-");
const cleaned = dashed.replace(/[^a-z0-9#@._+-]+/g, "-");
return cleaned.replace(/-{2,}/g, "-").replace(/^[-.]+|[-.]+$/g, "");
return normalizeHyphenSlug(raw);
}
function shortenGroupId(value?: string) {

View File

@@ -1,4 +1,5 @@
import { createNonExitingRuntime, type RuntimeEnv } from "../../runtime.js";
import { normalizeStringEntries } from "../../shared/string-normalization.js";
import type { MonitorIMessageOpts } from "./types.js";
export function resolveRuntime(opts: MonitorIMessageOpts): RuntimeEnv {
@@ -6,5 +7,5 @@ export function resolveRuntime(opts: MonitorIMessageOpts): RuntimeEnv {
}
export function normalizeAllowList(list?: Array<string | number>) {
return (list ?? []).map((entry) => String(entry).trim()).filter(Boolean);
return normalizeStringEntries(list);
}

View File

@@ -0,0 +1,17 @@
export function normalizeStringEntries(list?: Array<string | number>) {
return (list ?? []).map((entry) => String(entry).trim()).filter(Boolean);
}
export function normalizeStringEntriesLower(list?: Array<string | number>) {
return normalizeStringEntries(list).map((entry) => entry.toLowerCase());
}
export function normalizeHyphenSlug(raw?: string | null) {
const trimmed = raw?.trim().toLowerCase() ?? "";
if (!trimmed) {
return "";
}
const dashed = trimmed.replace(/\s+/g, "-");
const cleaned = dashed.replace(/[^a-z0-9#@._+-]+/g, "-");
return cleaned.replace(/-{2,}/g, "-").replace(/^[-.]+|[-.]+$/g, "");
}

View File

@@ -1,21 +1,20 @@
import type { AllowlistMatch } from "../../channels/allowlist-match.js";
import {
normalizeHyphenSlug,
normalizeStringEntries,
normalizeStringEntriesLower,
} from "../../shared/string-normalization.js";
export function normalizeSlackSlug(raw?: string) {
const trimmed = raw?.trim().toLowerCase() ?? "";
if (!trimmed) {
return "";
}
const dashed = trimmed.replace(/\s+/g, "-");
const cleaned = dashed.replace(/[^a-z0-9#@._+-]+/g, "-");
return cleaned.replace(/-{2,}/g, "-").replace(/^[-.]+|[-.]+$/g, "");
return normalizeHyphenSlug(raw);
}
export function normalizeAllowList(list?: Array<string | number>) {
return (list ?? []).map((entry) => String(entry).trim()).filter(Boolean);
return normalizeStringEntries(list);
}
export function normalizeAllowListLower(list?: Array<string | number>) {
return normalizeAllowList(list).map((entry) => entry.toLowerCase());
return normalizeStringEntriesLower(list);
}
export type SlackAllowListMatch = AllowlistMatch<