let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reduce redundant envelope formatting for iMessage and Signal

Browse Source
This commit is contained in:
Tyler Yust
2026-01-16 23:45:37 -08:00
committed by Peter Steinberger
parent 64d21f5ea8
commit d0bc08a934
5 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imessage/monitor.skips-group-messages-without-mention-by-default.test.ts
View File

@@ -381,8 +381,9 @@ describe("monitorIMessageProvider", () => {
expect(replyMock).toHaveBeenCalledOnce();
const ctx = replyMock.mock.calls[0]?.[0] as { Body?: string; ChatType?: string };
expect(ctx.ChatType).toBe("group");
expect(String(ctx.Body ?? "")).toContain("[from:");
expect(String(ctx.Body ?? "")).toContain("+15550002222");
// Sender should appear as prefix in group messages (no redundant [from:] suffix)
expect(String(ctx.Body ?? "")).toContain("+15550002222:");
expect(String(ctx.Body ?? "")).not.toContain("[from:");
expect(sendMock).toHaveBeenCalledWith(
"chat_id:42",

23
src/imessage/monitor/monitor-provider.ts
View File

@@ -165,16 +165,8 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
async function handleMessageNow(message: IMessagePayload) {
const senderRaw = message.sender ?? "";
const sender = senderRaw.trim();
if (!sender) {
logVerbose(`imessage: skipping message (no sender), chat_id=${message.chat_id}`);
return;
}
if (!sender) return;
const senderNormalized = normalizeIMessageHandle(sender);
if (!senderNormalized) {
logVerbose(
`imessage: sender normalized to empty, raw="${sender}", chat_id=${message.chat_id}`,
);
}
if (message.is_from_me) return;
const chatId = message.chat_id ?? undefined;
@@ -391,14 +383,13 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P
}
const chatTarget = formatIMessageChatTarget(chatId);
// For groups: use chat name or just "Group" (channel "iMessage" is already shown)
// For DMs: show sender, only add id: suffix if raw differs from normalized
const fromLabel = isGroup
? `${message.chat_name || "iMessage Group"} id:${chatId ?? "unknown"}`
: `${senderNormalized} id:${sender}`;
if (isGroup && !senderNormalized) {
logVerbose(
`imessage: group message missing normalized sender, raw="${sender}", chat_id=${chatId}`,
);
}
? `${message.chat_name || "Group"} id:${chatId ?? "unknown"}`
: senderNormalized === sender
? senderNormalized
: `${senderNormalized} id:${sender}`;
const body = formatInboundEnvelope({
channel: "iMessage",
from: fromLabel,