From 501a5fb1e715fe68ea34baa2afa96d06d21edd7d Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Sat, 4 Sep 2021 01:10:00 -0400
Subject: [PATCH 1/2] Fix issue with new notification trying to do a fetch.

---
 src/shared/utils.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 86e513b3..f54e2592 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -686,18 +686,21 @@ export function notifyPrivateMessage(pmv: PrivateMessageView, router: any) {
 function notify(info: NotifyInfo, router: any) {
   messageToastify(info, router);
 
-  if (Notification.permission !== "granted") Notification.requestPermission();
-  else {
-    var notification = new Notification(info.name, {
-      icon: info.icon,
-      body: info.body,
-    });
+  // TODO absolute nightmare bug, but notifs are currently broken.
+  // Notification.new will try to do a browser fetch ???
 
-    notification.onclick = (ev: Event): any => {
-      ev.preventDefault();
-      router.history.push(info.link);
-    };
-  }
+  // if (Notification.permission !== "granted") Notification.requestPermission();
+  // else {
+  //   var notification = new Notification(info.name, {
+  //     icon: info.icon,
+  //     body: info.body,
+  //   });
+
+  //   notification.onclick = (ev: Event): any => {
+  //     ev.preventDefault();
+  //     router.history.push(info.link);
+  //   };
+  // }
 }
 
 export function setupTribute() {

From 982fae53c89ea1fab142e602d600217435b1624e Mon Sep 17 00:00:00 2001
From: Ernest <ernestwisniewski2@gmail.com>
Date: Sun, 24 Jul 2022 14:08:23 +0200
Subject: [PATCH 2/2] Fix Notification browser fetch

---
 src/shared/utils.ts | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index f54e2592..f9c554f8 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -686,21 +686,18 @@ export function notifyPrivateMessage(pmv: PrivateMessageView, router: any) {
 function notify(info: NotifyInfo, router: any) {
   messageToastify(info, router);
 
-  // TODO absolute nightmare bug, but notifs are currently broken.
-  // Notification.new will try to do a browser fetch ???
+  if (Notification.permission !== "granted") Notification.requestPermission();
+  else {
+    var notification = new Notification(info.name, {
+      ...{body: info.body},
+      ...(info.icon && {icon: info.icon})
+    });
 
-  // if (Notification.permission !== "granted") Notification.requestPermission();
-  // else {
-  //   var notification = new Notification(info.name, {
-  //     icon: info.icon,
-  //     body: info.body,
-  //   });
-
-  //   notification.onclick = (ev: Event): any => {
-  //     ev.preventDefault();
-  //     router.history.push(info.link);
-  //   };
-  // }
+    notification.onclick = (ev: Event): any => {
+      ev.preventDefault();
+      router.history.push(info.link);
+    };
+  }
 }
 
 export function setupTribute() {