From 4ae861457339e150f7c25a43a3c852c5dddba941 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Sep 2024 11:19:50 -0400 Subject: [PATCH 1/7] feat: service worker icon and badge support --- public/src/service-worker.js | 7 ++++++- src/notifications.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/src/service-worker.js b/public/src/service-worker.js index 63cb1704e5..3f1c5e0bc5 100644 --- a/public/src/service-worker.js +++ b/public/src/service-worker.js @@ -43,8 +43,13 @@ self.addEventListener('push', function (event) { const { title, body, tag, data } = event.data.json(); if (title && body) { + const icon = data.icon; + delete data.icon; + const badge = data.badge; + delete data.badge; + event.waitUntil( - self.registration.showNotification(title, { body, tag, data }) + self.registration.showNotification(title, { body, tag, data, icon, badge }) ); } else if (tag) { event.waitUntil( diff --git a/src/notifications.js b/src/notifications.js index ce4245fba7..1d020e536b 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -127,7 +127,7 @@ Notifications.findRelated = async function (mergeIds, set) { return []; } // A related notification is one in a zset that has the same mergeId - const nids = await db.getSortedSetRevRange(set, 0, -1); + const nids = await db.getSortedSetMembers(set); const keys = nids.map(nid => `notifications:${nid}`); const notificationData = await db.getObjectsFields(keys, ['mergeId']); From d55c3f03990cc81dce87e0bd303748e27057464d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:17:45 -0400 Subject: [PATCH 2/7] chore(deps): update dependency nyc to v17.1.0 (#12806) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 336b6ba7ed..1cc99315f0 100644 --- a/install/package.json +++ b/install/package.json @@ -171,7 +171,7 @@ "mocha": "10.7.3", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", - "nyc": "17.0.0", + "nyc": "17.1.0", "smtp-server": "3.13.5" }, "optionalDependencies": { From 8a6ced2d8e0f9a457bfbccbe4aca84c811ad9686 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:42:09 -0400 Subject: [PATCH 3/7] chore(deps): update dependency sass-embedded to v1.79.2 (#12811) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 1cc99315f0..f69ae6041b 100644 --- a/install/package.json +++ b/install/package.json @@ -175,7 +175,7 @@ "smtp-server": "3.13.5" }, "optionalDependencies": { - "sass-embedded": "1.79.1" + "sass-embedded": "1.79.2" }, "resolutions": { "*/jquery": "3.7.1" From 2a5d481fb92f9fd8aec7324596acaa39cbbb8293 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:42:17 -0400 Subject: [PATCH 4/7] fix(deps): update dependency sass to v1.79.2 (#12812) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f69ae6041b..89b67b6089 100644 --- a/install/package.json +++ b/install/package.json @@ -128,7 +128,7 @@ "rss": "1.2.2", "rtlcss": "4.3.0", "sanitize-html": "2.13.0", - "sass": "1.79.1", + "sass": "1.79.2", "semver": "7.6.3", "serve-favicon": "2.5.0", "sharp": "0.32.6", From aa060d31d130cd54d18cd8dc2f25ba7de58f4fea Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Sep 2024 14:03:51 -0400 Subject: [PATCH 5/7] fix(deps): swap ntfy for web-push plugin --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9159c87784..84f458db79 100644 --- a/install/package.json +++ b/install/package.json @@ -105,8 +105,8 @@ "nodebb-plugin-emoji-android": "4.0.0", "nodebb-plugin-markdown": "13.0.0-pre.9", "nodebb-plugin-mentions": "4.6.8", - "nodebb-plugin-ntfy": "1.7.6", "nodebb-plugin-spam-be-gone": "2.2.2", + "nodebb-plugin-web-push": "0.6.0", "nodebb-rewards-essentials": "1.0.0", "nodebb-theme-harmony": "2.0.0-pre.36", "nodebb-theme-lavender": "7.1.8", From 34c4cefe0c7bda7c63ed5542f46df0e25208bb1b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Sep 2024 14:04:45 -0400 Subject: [PATCH 6/7] feat: enable web-push plugin on first install --- src/install.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/install.js b/src/install.js index 53a6941c54..04c8ed569a 100644 --- a/src/install.js +++ b/src/install.js @@ -528,6 +528,7 @@ async function enableDefaultPlugins() { 'nodebb-plugin-composer-default', 'nodebb-plugin-markdown', 'nodebb-plugin-mentions', + 'nodebb-plugin-web-push', 'nodebb-widget-essentials', 'nodebb-rewards-essentials', 'nodebb-plugin-emoji', From 86f624f8172fb96fbd3c83683affd8814e8b5156 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 20 Sep 2024 14:07:44 -0400 Subject: [PATCH 7/7] chore: beta tag --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 84f458db79..bb9c38aadd 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "4.0.0-alpha", + "version": "4.0.0-beta.1", "homepage": "https://www.nodebb.org", "repository": { "type": "git", @@ -199,4 +199,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +}