Skip to content

Commit 0fc8ebe

Browse files
committed
fix(popup): simplify platform information structure and improve error handling for custom payload
1 parent 986942a commit 0fc8ebe

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

popup/popup.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,7 @@ document
9191
status: activeTab.status,
9292
},
9393
browser: browserInfo,
94-
platform: {
95-
name: platformInfo.name || "unknown",
96-
version: platformInfo.version || "unknown",
97-
architecture: platformInfo.architecture || "unknown",
98-
os: platformInfo.os || "unknown",
99-
},
94+
platform: platformInfo,
10095
triggeredAt: new Date().toISOString(),
10196
};
10297

@@ -121,9 +116,8 @@ document
121116
"{{tab.incognito}}": activeTab.incognito,
122117
"{{tab.status}}": activeTab.status,
123118
"{{browser}}": JSON.stringify(browserInfo),
124-
"{{platform.architecture}}": platformInfo.architecture,
125-
"{{platform.name}}": platformInfo.name,
126-
"{{platform.os}}": platformInfo.os,
119+
"{{platform.arch}}": platformInfo.arch || "unknown",
120+
"{{platform.os}}": platformInfo.os || "unknown",
127121
"{{platform.version}}": platformInfo.version,
128122
"{{triggeredAt}}": new Date().toISOString(),
129123
"{{identifier}}": webhook.identifier || ""
@@ -154,8 +148,7 @@ document
154148
// Use the custom payload instead of the default one
155149
payload = customPayload;
156150
} catch (error) {
157-
console.error("Error parsing custom payload:", error);
158-
// Fall back to default payload if custom payload is invalid
151+
throw new Error(browser.i18n.getMessage("popupErrorCustomPayloadJsonParseError", error.message));
159152
}
160153
}
161154
// Prepare headers

0 commit comments

Comments
 (0)