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

Re-increate Dexie version number

pull/751/head
binwiederhier 2023-06-14 13:08:35 -04:00
parent ad36f5db46
commit 9403873a7b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,13 @@ class SubscriptionManager {
); );
} }
/** List of topics for which Web Push is enabled, excludes internal topics; returns empty list if Web Push is disabled */ /**
* List of topics for which Web Push is enabled. This excludes (a) internal topics, (b) topics that are muted,
* and (c) topics from other hosts. Returns an empty list if Web Push is disabled.
*
* 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() { async webPushTopics() {
// the Promise.resolve wrapper is not superfluous, without it the live query breaks: // 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 // https://dexie.org/docs/dexie-react-hooks/useLiveQuery()#calling-non-dexie-apis-from-querier
@ -28,8 +34,10 @@ class SubscriptionManager {
if (!pushEnabled) { if (!pushEnabled) {
return []; return [];
} }
const subscriptions = await this.db.subscriptions.where({ mutedUntil: 0, baseUrl: config.base_url }).toArray(); 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) { async get(subscriptionId) {

4
web/src/app/WebPush.js
View File

@ -21,11 +21,11 @@ export const useWebPushTopicListener = () => {
(async () => { (async () => {
try { try {
console.log("[useWebPushUpdateWorker] Refreshing web push subscriptions"); console.log("[useWebPushTopicListener] Refreshing web push subscriptions", topics);
await subscriptionManager.updateWebPushSubscriptions(topics); await subscriptionManager.updateWebPushSubscriptions(topics);
setLastTopics(topics); setLastTopics(topics);
} catch (e) { } catch (e) {
console.error("[useWebPushUpdateWorker] Error refreshing web push subscriptions", e); console.error("[useWebPushTopicListener] Error refreshing web push subscriptions", e);
} }
})(); })();
}, [topics, lastTopics]); }, [topics, lastTopics]);

2
web/src/app/db.js
View File

@ -11,7 +11,7 @@ const createDatabase = (username) => {
const dbName = username ? `ntfy-${username}` : "ntfy"; // IndexedDB database is based on the logged-in user const dbName = username ? `ntfy-${username}` : "ntfy"; // IndexedDB database is based on the logged-in user
const db = new Dexie(dbName); const db = new Dexie(dbName);
db.version(1).stores({ db.version(2).stores({
subscriptions: "&id,baseUrl,[baseUrl+mutedUntil]", subscriptions: "&id,baseUrl,[baseUrl+mutedUntil]",
notifications: "&id,subscriptionId,time,new,[subscriptionId+new]", // compound key for query performance notifications: "&id,subscriptionId,time,new,[subscriptionId+new]", // compound key for query performance
users: "&baseUrl,username", users: "&baseUrl,username",