From 01429d7ff0b27c03ad927e323fc0400bf1ef1586 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:13:35 +0100
Subject: [PATCH 1/5] Swapped to array index

---
 src/main/plugins/playbackNotifications.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 92df3724..44c1aaf9 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -36,10 +36,6 @@ export default class playbackNotifications {
                     {
                         'type': 'button',
                         'text': 'Play/Pause'
-                    },
-                    {
-                        'type': 'button',
-                        'text': 'Next'
                     }
                 ],
                 toastXml: `<toast>
@@ -64,9 +60,9 @@ export default class playbackNotifications {
                 this._notification = undefined;
             })
             this._notification.on('action', (event: any, action: any) => {
-                if (action === 'Play/Pause') {
+                if (action === 0) {
                     this._utils.playback.playPause()
-                } else if (action === 'Next') {
+                } else if (action === 1) {
                     this._utils.playback.next()
                 }
             })

From 4806db7b08001826b75bb739798776295f8230ad Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:14:34 +0100
Subject: [PATCH 2/5] keeping this here until for now

---
 src/main/plugins/playbackNotifications.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 44c1aaf9..93806e60 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -36,6 +36,10 @@ export default class playbackNotifications {
                     {
                         'type': 'button',
                         'text': 'Play/Pause'
+                    },
+                    {
+                        'type': 'button',
+                        'text': 'Next'
                     }
                 ],
                 toastXml: `<toast>

From 41ff0e45ffa8ddf710c39ca63eba2a2c7d56eec3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:38:19 +0100
Subject: [PATCH 3/5] debuggin

---
 src/main/plugins/playbackNotifications.ts | 33 +++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 93806e60..12a5762c 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -24,7 +24,24 @@ export default class playbackNotifications {
         if (this._notification) {
             this._notification.close();
         }
-        fetch(a.artwork.url.replace('/{w}x{h}bb', '/512x512bb').replace('/2000x2000bb', '/35x35bb')).then(async blob => {
+        const artworkUrl = a.artwork.url.replace('/{w}x{h}bb', '/512x512bb').replace('/2000x2000bb', '/35x35bb')
+        console.log(artworkUrl)
+        const toastXML = `
+        <toast>
+            <visual>
+                <binding template="ToastGeneric">
+                    <image placement="appLogoOverride" src="${artworkUrl}"/>
+                    <text id="1">${a?.name.replace(/&/g, '&amp;')}</text>
+                    <text id="2">${a?.artistName.replace(/&/g, '&amp;')} — ${a?.albumName.replace(/&/g, '&amp;')}</text>
+                </binding>
+            </visual>
+            <actions>
+                <action content="Play/Pause" activationType="protocol" arguments="cider://playpause/"/>
+                <action content="Next" activationType="protocol" arguments="cider://nextitem/"/>
+            </actions>
+        </toast>`
+        console.log(toastXML)
+        fetch(artworkUrl).then(async blob => {
             const artworkImage = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
             this._notification = new Notification({
                 title: a.name,
@@ -42,19 +59,7 @@ export default class playbackNotifications {
                         'text': 'Next'
                     }
                 ],
-                toastXml: `<toast>
-                        <visual>
-                            <binding template="ToastGeneric">
-                                <text id="1">${a.name ?? ''}</text>
-                                <text id="2">${a.artistName ?? ''} - ${a.albumName ?? ''
-                }</text>
-                            </binding>
-                        </visual>
-                        <actions>
-                            <action content="Play/Pause" activationType="protocol" arguments="cider://playpause/"/>
-                            <action content="Next" activationType="protocol" arguments="cider://nextitem/"/>
-                        </actions>
-                    </toast>`
+                toastXml: toastXML
             });
             this._notification.on('click', (event: any) => {
                 this._utils.getWindow().show()

From 88cda41647e11c349d60f4e308ce2cdf1c2d1ced Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 31 Jul 2022 19:04:35 +0700
Subject: [PATCH 4/5] allow noti button on macs

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4e4080a2..3c025836 100644
--- a/package.json
+++ b/package.json
@@ -228,7 +228,10 @@
       "darkModeSupport": true,
       "target": [
         "dmg"
-      ]
+      ],
+      "extendInfo": {
+        "NSUserNotificationAlertStyle": "alert"
+      }
     }
   }
 }

From 233b34a58b3c44aa9eb4d9572b2cecb1fb1e2829 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sun, 31 Jul 2022 13:05:20 +0100
Subject: [PATCH 5/5] No image for now

---
 src/main/plugins/playbackNotifications.ts | 31 ++++++++++-------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 12a5762c..4381432e 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -25,22 +25,6 @@ export default class playbackNotifications {
             this._notification.close();
         }
         const artworkUrl = a.artwork.url.replace('/{w}x{h}bb', '/512x512bb').replace('/2000x2000bb', '/35x35bb')
-        console.log(artworkUrl)
-        const toastXML = `
-        <toast>
-            <visual>
-                <binding template="ToastGeneric">
-                    <image placement="appLogoOverride" src="${artworkUrl}"/>
-                    <text id="1">${a?.name.replace(/&/g, '&amp;')}</text>
-                    <text id="2">${a?.artistName.replace(/&/g, '&amp;')} — ${a?.albumName.replace(/&/g, '&amp;')}</text>
-                </binding>
-            </visual>
-            <actions>
-                <action content="Play/Pause" activationType="protocol" arguments="cider://playpause/"/>
-                <action content="Next" activationType="protocol" arguments="cider://nextitem/"/>
-            </actions>
-        </toast>`
-        console.log(toastXML)
         fetch(artworkUrl).then(async blob => {
             const artworkImage = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
             this._notification = new Notification({
@@ -59,7 +43,20 @@ export default class playbackNotifications {
                         'text': 'Next'
                     }
                 ],
-                toastXml: toastXML
+                toastXml: `
+                <toast>
+                    <visual>
+                        <binding template="ToastText02">
+                            <!-- <image id="1" src="${artworkUrl}" alt="img"/> -->
+                            <text id="1">${a?.name.replace(/&/g, '&amp;')}</text>
+                            <text id="2">${a?.artistName.replace(/&/g, '&amp;')} — ${a?.albumName.replace(/&/g, '&amp;')}</text>
+                        </binding>
+                    </visual>
+                    <actions>
+                        <action content="Play/Pause" activationType="protocol" arguments="cider://playpause/"/>
+                        <action content="Next" activationType="protocol" arguments="cider://nextitem/"/>
+                    </actions>
+                </toast>`
             });
             this._notification.on('click', (event: any) => {
                 this._utils.getWindow().show()