hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'notifications-thru-sw' into shigusegubu-vue3

Browse source
This commit is contained in:
Henry Jameson 2023-11-19 14:01:09 +02:00
commit 262bb12e6b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/notifications.js
View file

@ -150,7 +150,7 @@ export const notifications = {
id, id,
credentials: rootState.users.currentUser.credentials credentials: rootState.users.currentUser.credentials
}).then(() => { }).then(() => {
closeDesktopNotification(rootState, id) closeDesktopNotification(rootState, { id })
}) })
}, },
dismissNotificationLocal ({ rootState, commit }, { id }) { dismissNotificationLocal ({ rootState, commit }, { id }) {

4
src/services/desktop_notification_utils/desktop_notification_utils.js
View file

@ -21,7 +21,7 @@ export const showDesktopNotification = (rootState, desktopNotificationOpts) => {
} }
} }
export const closeDesktopNotification = (rootState, id) => { export const closeDesktopNotification = (rootState, { id }) => {
if (!('Notification' in window && window.Notification.permission === 'granted')) return if (!('Notification' in window && window.Notification.permission === 'granted')) return
if (isSWSupported()) { if (isSWSupported()) {
@ -33,6 +33,6 @@ export const closeAllDesktopNotifications = (rootState) => {
if (!('Notification' in window && window.Notification.permission === 'granted')) return if (!('Notification' in window && window.Notification.permission === 'granted')) return
if (isSWSupported()) { if (isSWSupported()) {
swCloseDesktopNotification() swCloseDesktopNotification({})
} }
} }

2
src/services/sw/sw.js
View file

@ -88,7 +88,7 @@ export async function initServiceWorker (store) {
navigator.serviceWorker.addEventListener('message', (event) => { navigator.serviceWorker.addEventListener('message', (event) => {
const { dispatch } = store const { dispatch } = store
console.log('SW MESSAGE', event) console.log('SW MESSAGE', event)
const { type, ...rest } = event const { type, ...rest } = event.data
switch (type) { switch (type) {
case 'notificationClicked': case 'notificationClicked':