fixed notification buttons not work

eric2788 · Mar 22, 2024 · 15a1a16 · 15a1a16
1 parent add3e8a
commit 15a1a16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/background/messages/notify.ts b/src/background/messages/notify.ts
@@ -2,7 +2,8 @@ import type { PlasmoMessaging } from "@plasmohq/messaging"
 
 import icon from 'raw:assets/icon.png'
 
-export type RequestBody = Partial<chrome.notifications.NotificationOptions<true>> & {
+export type RequestBody = Partial<Omit<chrome.notifications.NotificationOptions<true>, 'buttons'>> & {
+    messages?: string[],
     buttons?: (chrome.notifications.ButtonOptions & { clicked: (id: string, index: number) => void })[],
     onClicked?: (id: string) => void
 }
@@ -20,11 +21,12 @@ async function createNotification(option: chrome.notifications.NotificationOptio
 }
 
 const handler: PlasmoMessaging.MessageHandler<RequestBody, string> = async (req, res) => {
-    const { title, message, type, buttons, onClicked, ...option } = req.body
+    const { title, message, messages, type, buttons, onClicked, ...option } = req.body
     const id = await createNotification({
         type: type ?? 'basic',
         title,
-        message,
+        message: message ?? messages?.join('\n') ?? '',
+        buttons: buttons?.map(({ clicked, ...option }) => option),
         ...option,
         iconUrl: icon
     })

diff --git a/src/background/update-listener.ts b/src/background/update-listener.ts
@@ -71,8 +71,8 @@ getSettingStorage('settings.version').then(async (settings) => {
         await sendInternal('notify', {
             type: 'list',
             title: 'bilibili-vup-stream-enhancer 已推出新版本',
-            message: `当前版本: v${currentVersion}`,
             items: [
+                { title: '当前版本', message: `v${currentVersion}` },
                 { title: '最新版本', message: `v${latest.tag_name}` },
                 { title: '发布日期', message: new Date(latest.published_at).toDateString() }
             ],