github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 11:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bluebubbles): treat null privateApiStatus as disabled, not enabled

Browse Source 
Bug: privateApiStatus cache expires after 10 minutes, returning null.
The check '!== false' treats null as truthy, causing 500 errors when
trying to use Private API features that aren't actually available.

Root cause: In JavaScript, null !== false evaluates to true.

Fix: Changed all checks from '!== false' to '=== true', so null (cache
expired/unknown) is treated as disabled (safe default).

Files changed:
- extensions/bluebubbles/src/send.ts (line 376)
- extensions/bluebubbles/src/monitor-processing.ts (line 423)
- extensions/bluebubbles/src/attachments.ts (lines 210, 220)

Fixes #23393
This commit is contained in:
echoVic
2026-02-22 18:12:40 +08:00
committed by Peter Steinberger
parent 812bf7c8e1
commit 888b6bc948
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/bluebubbles/src/attachments.ts
View File

@@ -207,7 +207,7 @@ export async function sendBlueBubblesAttachment(params: {
addField("chatGuid", chatGuid); addField("chatGuid", chatGuid);
addField("name", filename); addField("name", filename);
addField("tempGuid", `temp-${Date.now()}-${crypto.randomUUID().slice(0, 8)}`); addField("tempGuid", `temp-${Date.now()}-${crypto.randomUUID().slice(0, 8)}`);
if (privateApiStatus !== false) { if (privateApiStatus === true) {
addField("method", "private-api"); addField("method", "private-api");
} }
@@ -217,7 +217,7 @@ export async function sendBlueBubblesAttachment(params: {
} }
const trimmedReplyTo = replyToMessageGuid?.trim(); const trimmedReplyTo = replyToMessageGuid?.trim();
if (trimmedReplyTo && privateApiStatus !== false) { if (trimmedReplyTo && privateApiStatus === true) {
addField("selectedMessageGuid", trimmedReplyTo); addField("selectedMessageGuid", trimmedReplyTo);
addField("partIndex", typeof replyToPartIndex === "number" ? String(replyToPartIndex) : "0"); addField("partIndex", typeof replyToPartIndex === "number" ? String(replyToPartIndex) : "0");
} }

2
extensions/bluebubbles/src/monitor-processing.ts
View File

@@ -420,7 +420,7 @@ export async function processMessage(
target: WebhookTarget, target: WebhookTarget,
): Promise<void> { ): Promise<void> {
const { account, config, runtime, core, statusSink } = target; const { account, config, runtime, core, statusSink } = target;
const privateApiEnabled = getCachedBlueBubblesPrivateApiStatus(account.accountId) !== false; const privateApiEnabled = getCachedBlueBubblesPrivateApiStatus(account.accountId) === true;
const groupFlag = resolveGroupFlagFromChatGuid(message.chatGuid); const groupFlag = resolveGroupFlagFromChatGuid(message.chatGuid);
const isGroup = typeof groupFlag === "boolean" ? groupFlag : message.isGroup; const isGroup = typeof groupFlag === "boolean" ? groupFlag : message.isGroup;

4
extensions/bluebubbles/src/send.ts
View File

@@ -373,7 +373,7 @@ export async function sendMessageBlueBubbles(
const wantsReplyThread = Boolean(opts.replyToMessageGuid?.trim()); const wantsReplyThread = Boolean(opts.replyToMessageGuid?.trim());
const wantsEffect = Boolean(effectId); const wantsEffect = Boolean(effectId);
const needsPrivateApi = wantsReplyThread || wantsEffect; const needsPrivateApi = wantsReplyThread || wantsEffect;
const canUsePrivateApi = needsPrivateApi && privateApiStatus !== false; const canUsePrivateApi = needsPrivateApi && privateApiStatus === true;
if (wantsEffect && privateApiStatus === false) { if (wantsEffect && privateApiStatus === false) {
throw new Error( throw new Error(
"BlueBubbles send failed: reply/effect requires Private API, but it is disabled on the BlueBubbles server.", "BlueBubbles send failed: reply/effect requires Private API, but it is disabled on the BlueBubbles server.",
@@ -395,7 +395,7 @@ export async function sendMessageBlueBubbles(
} }
// Add message effects support // Add message effects support
if (effectId) { if (effectId && canUsePrivateApi) {
payload.effectId = effectId; payload.effectId = effectId;
} }