dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny fixes

Browse Source
This commit is contained in:
binwiederhier
2023-06-14 13:31:34 -04:00
parent 9403873a7b
commit 4dc89f6bc5
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/app/SubscriptionManager.js
View File

@@ -35,9 +35,7 @@ class SubscriptionManager {
return [];
}
const subscriptions = await this.db.subscriptions.where({ baseUrl: config.base_url, mutedUntil: 0 }).toArray();
return subscriptions
.filter(({ internal }) => !internal)
.map(({ topic }) => topic);
return subscriptions.filter(({ internal }) => !internal).map(({ topic }) => topic);
}
async get(subscriptionId) {
@@ -46,8 +44,7 @@ class SubscriptionManager {
async notify(subscriptionId, notification, defaultClickAction) {
const subscription = await this.get(subscriptionId);
if (subscription.mutedUntil === 1) {
if (subscription.mutedUntil > 0) {
return;
}
@@ -120,7 +117,7 @@ class SubscriptionManager {
async updateWebPushSubscriptions(presetTopics) {
const topics = presetTopics ?? (await this.webPushTopics());
const browserSubscription = await notifier.getBrowserSubscription();
const browserSubscription = await notifier.webPushSubscription();
if (!browserSubscription) {
console.log("[SubscriptionManager] No browser subscription currently exists, so web push was never enabled. Skipping.");