From a327fe802ee4164ebc7874b6ca44f26b40742e55 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 25 Mar 2022 11:01:07 -0400
Subject: [PATCH] Make web app work for updated notifications
---
web/src/app/SubscriptionManager.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/web/src/app/SubscriptionManager.js b/web/src/app/SubscriptionManager.js
index b1e44498..01d18280 100644
--- a/web/src/app/SubscriptionManager.js
+++ b/web/src/app/SubscriptionManager.js
@@ -65,13 +65,17 @@ class SubscriptionManager {
/** Adds notification, or returns false if it already exists */
async addNotification(subscriptionId, notification) {
- const exists = await db.notifications.get(notification.id);
- if (exists) {
- return false;
+ const existingNotification = await db.notifications.get(notification.id);
+ if (existingNotification) {
+ const upToDate = (existingNotification?.updated ?? 0) >= (notification.updated ?? 0);
+ if (upToDate) {
+ console.error(`[SubscriptionManager] up to date`, existingNotification, notification);
+ return false;
+ }
}
try {
notification.new = 1; // New marker (used for bubble indicator); cannot be boolean; Dexie index limitation
- await db.notifications.add({ ...notification, subscriptionId }); // FIXME consider put() for double tab
+ await db.notifications.put({ ...notification, subscriptionId });
await db.subscriptions.update(subscriptionId, {
last: notification.id
});