about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/util
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2020-12-01 10:50:41 -0600
committerStarfall <us@starfall.systems>2020-12-01 10:50:41 -0600
commit63f2eb0c84d0c51f7ece341cc3f35518a3d69520 (patch)
tree57d362f393ff7ae7fdf6b4a00d654f8dbd9c9d7c /app/javascript/flavours/glitch/util
parent19548d0a4bc303ca8017599577e21a6d522eb7bd (diff)
parent29812c2e59e02ea5ff8e4818a38b59944e2367ba (diff)
Merge branch 'glitch' into main
Diffstat (limited to 'app/javascript/flavours/glitch/util')
-rw-r--r--app/javascript/flavours/glitch/util/notifications.js3
-rw-r--r--app/javascript/flavours/glitch/util/stream.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/util/notifications.js b/app/javascript/flavours/glitch/util/notifications.js
index ab119c2e3..7634cac21 100644
--- a/app/javascript/flavours/glitch/util/notifications.js
+++ b/app/javascript/flavours/glitch/util/notifications.js
@@ -3,6 +3,7 @@
 
 const checkNotificationPromise = () => {
   try {
+    // eslint-disable-next-line promise/catch-or-return
     Notification.requestPermission().then();
   } catch(e) {
     return false;
@@ -22,7 +23,7 @@ const handlePermission = (permission, callback) => {
 
 export const requestNotificationPermission = (callback) => {
   if (checkNotificationPromise()) {
-    Notification.requestPermission().then((permission) => handlePermission(permission, callback));
+    Notification.requestPermission().then((permission) => handlePermission(permission, callback)).catch(console.warn);
   } else {
     Notification.requestPermission((permission) => handlePermission(permission, callback));
   }
diff --git a/app/javascript/flavours/glitch/util/stream.js b/app/javascript/flavours/glitch/util/stream.js
index cf1388aed..c6d12cd6f 100644
--- a/app/javascript/flavours/glitch/util/stream.js
+++ b/app/javascript/flavours/glitch/util/stream.js
@@ -16,7 +16,7 @@ let sharedConnection;
  * @property {function(): void} onDisconnect
  */
 
- /**
+/**
   * @typedef StreamEvent
   * @property {string} event
   * @property {object} payload