Flaschengeist/flaschengeist-frontend
Flaschengeist
/
flaschengeist-frontend
7
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

[notification] Disable native is not available

This commit is contained in:
Ferdinand Thiessen 2021-03-31 14:25:58 +02:00
parent 6891a3ffba
commit 1b1888d4fd
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/layouts/MainLayout.vue
View File

@ -25,7 +25,7 @@
><q-badge color="negative" floating>{{ notifications.length }}</q-badge> ><q-badge color="negative" floating>{{ notifications.length }}</q-badge>
<q-menu style="max-height: 400px; overflow: auto"> <q-menu style="max-height: 400px; overflow: auto">
<q-btn <q-btn
v-if="noPermission" v-if="useNative && noPermission"
label="Benachrichtigungen erlauben" label="Benachrichtigungen erlauben"
@click="requestPermission" @click="requestPermission"
/> />
@ -131,8 +131,9 @@ export default defineComponent({
const shortcuts = flaschengeist?.shortcuts || []; const shortcuts = flaschengeist?.shortcuts || [];
const mainLinks = flaschengeist?.menuLinks || []; const mainLinks = flaschengeist?.menuLinks || [];
const notifications = computed(() => mainStore.notifications.slice().reverse()); const notifications = computed(() => mainStore.notifications.slice().reverse());
const noPermission = ref(window.Notification.permission !== 'granted');
const polling = ref(NaN); const polling = ref(NaN);
const useNative = 'Notification' in window && window.Notification !== undefined;
const noPermission = ref(!useNative || window.Notification.permission !== 'granted');
onBeforeMount(() => pollNotification()); onBeforeMount(() => pollNotification());
onBeforeUnmount(() => window.clearInterval(polling.value)); onBeforeUnmount(() => window.clearInterval(polling.value));
@ -170,7 +171,17 @@ export default defineComponent({
function pollNotification() { function pollNotification() {
polling.value = window.setInterval(() => { polling.value = window.setInterval(() => {
void mainStore.loadNotifications(<FG_Plugin.Flaschengeist>flaschengeist); void mainStore
.loadNotifications(<FG_Plugin.Flaschengeist>flaschengeist)
.then((notifications) => {
if (useNative && !noPermission.value)
notifications.forEach(
(notif) =>
new window.Notification(notif.text, {
timestamp: notif.time.getTime(),
})
);
});
}, config.pollingInterval); }, config.pollingInterval);
} }
@ -187,6 +198,7 @@ export default defineComponent({
requestPermission, requestPermission,
shortcuts, shortcuts,
subLinks, subLinks,
useNative,
}; };
}, },
}); });

19
src/stores/index.ts
View File

@ -114,19 +114,18 @@ export const useMainStore = defineStore({
? { from: this.notifications[this.notifications.length - 1].time } ? { from: this.notifications[this.notifications.length - 1].time }
: {}; : {};
const { data } = await api.get<FG.Notification[]>('/notifications', { params: params }); const { data } = await api.get<FG.Notification[]>('/notifications', { params: params });
const notifications: FG_Plugin.Notification[] = [];
data.forEach((n) => { data.forEach((n) => {
n.time = new Date(n.time); n.time = new Date(n.time);
const notif = ( notifications.push(
flaschengeist?.plugins.filter((p) => p.name === n.plugin)[0]?.notification || (
translateNotification flaschengeist?.plugins.filter((p) => p.name === n.plugin)[0]?.notification ||
)(n); translateNotification
this.notifications.push(notif); )(n)
);
if (window.Notification.permission === 'granted')
new window.Notification(notif.text, {
timestamp: notif.time.getTime(),
});
}); });
this.notifications.push(...notifications);
return notifications;
}, },
async removeNotification(id: number) { async removeNotification(id: number) {