astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set PWA web push enabled on launch instead

Browse source
This commit is contained in:
nimbleghost 2023-06-25 21:57:08 +02:00
parent a8d3297c4e
commit 833293ad77
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web/src/app/SubscriptionManager.js
View file

@ -2,7 +2,7 @@ import api from "./Api";
import notifier from "./Notifier";
import prefs from "./Prefs";
import db from "./db";
import { isLaunchedPWA, topicUrl } from "./utils";
import { topicUrl } from "./utils";
class SubscriptionManager {
constructor(dbImpl) {
@ -27,14 +27,15 @@ class SubscriptionManager {
* It is important to note that "mutedUntil" must be part of the where() query, otherwise the Dexie live query
* will not react to it, and the Web Push topics will not be updated when the user mutes a topic.
*/
async webPushTopics(isStandalone = isLaunchedPWA(), pushPossible = notifier.pushPossible()) {
async webPushTopics(pushPossible = notifier.pushPossible()) {
if (!pushPossible) {
return [];
}
// the Promise.resolve wrapper is not superfluous, without it the live query breaks:
// https://dexie.org/docs/dexie-react-hooks/useLiveQuery()#calling-non-dexie-apis-from-querier
if (!(isStandalone || (await Promise.resolve(prefs.webPushEnabled())))) {
const enabled = await Promise.resolve(prefs.webPushEnabled());
if (!enabled) {
return [];
}