From 73fbe89a4b4e545796e9cc6aae707de0a4eed3a1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 25 Oct 2023 18:58:33 +0300
Subject: initial work on showing notifications through serviceworkers

---
 src/boot/after_store.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/boot')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 395d4834..6489ef87 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -16,6 +16,7 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme, applyConfig } from '../services/style_setter/style_setter.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
+import { initServiceWorker, updateFocus } from '../services/sw/sw.js'
 
 let staticInitialResults = null
 
@@ -344,6 +345,9 @@ const afterStoreSetup = async ({ store, i18n }) => {
   store.dispatch('setLayoutHeight', windowHeight())
 
   FaviconService.initFaviconService()
+  initServiceWorker()
+
+  window.addEventListener('focus', () => updateFocus())
 
   const overrides = window.___pleromafe_dev_overrides || {}
   const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
-- 
cgit v1.2.3-70-g09d2


From a17defc5abfe60b6aa0dc3275dac2cbec507472a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 16 Nov 2023 20:41:41 +0200
Subject: handle desktop notifications clicks

---
 src/boot/after_store.js                       |  2 +-
 src/components/notifications/notifications.js | 12 +++++++-----
 src/modules/notifications.js                  | 15 +++++++++++++++
 src/services/sw/sw.js                         | 10 ++++++++--
 4 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 6489ef87..84fea954 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -345,7 +345,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
   store.dispatch('setLayoutHeight', windowHeight())
 
   FaviconService.initFaviconService()
-  initServiceWorker()
+  initServiceWorker(store)
 
   window.addEventListener('focus', () => updateFocus())
 
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index a1088dff..a210e19d 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -159,14 +159,16 @@ const Notifications = {
     updateScrollPosition () {
       this.showScrollTop = this.$refs.root.offsetTop < this.scrollerRef.scrollTop
     },
+    /* "Interacted" really refers to "actionable" notifications that require user input,
+     * everything else (likes/repeats/reacts) cannot be acted and therefore we just clear
+     * the "seen" status upon any clicks on them
+     */
     notificationClicked (notification) {
-      // const { type, id, seen } = notification
+      const { id } = notification
+      this.$store.dispatch('notificationClicked', { id })
     },
     notificationInteracted (notification) {
-      const { id, seen } = notification
-      if (!seen) this.markOneAsSeen(id)
-    },
-    markOneAsSeen (id) {
+      const { id } = notification
       this.$store.dispatch('markSingleNotificationAsSeen', { id })
     },
     markAsSeen () {
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index 9b91f291..febff488 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -113,6 +113,21 @@ export const notifications = {
         }
       })
     },
+    notificationClicked ({ state, commit }, id) {
+      const notification = state.idStore[id]
+      const { type, seen } = notification
+
+      if (!seen) {
+        switch (type) {
+          case 'mention':
+          case 'pleroma:report':
+          case 'follow_request':
+            break
+          default:
+            commit('markSingleNotificationAsSeen', { id })
+        }
+      }
+    },
     setNotificationsLoading ({ rootState, commit }, { value }) {
       commit('setNotificationsLoading', { value })
     },
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index d4ae8f4f..e28f9168 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -82,12 +82,18 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
     return responseData
   })
 }
-export async function initServiceWorker () {
+export async function initServiceWorker (store) {
   if (!isSWSupported()) return
   await getOrCreateServiceWorker()
   navigator.serviceWorker.addEventListener('message', (event) => {
+    const { dispatch } = store
     console.log('SW MESSAGE', event)
-    // TODO actually act upon click (open drawer on mobile, open chat/thread etc)
+    const { type, ...rest } = event
+
+    switch (type) {
+      case 'notificationClicked':
+        dispatch('notificationClicked', { id: rest.id })
+    }
   })
 }
 
-- 
cgit v1.2.3-70-g09d2