nodebb-plugin-web-push 0.7.7 → 0.7.9

package/lib/controllers.js

@@ -1,11 +1,10 @@
 'use strict';
 
-const user = require.main.require('./src/user');
+const user = nodebb.require('./src/user');
+const helpers = nodebb.require('./src/controllers/helpers');
 
 const subscriptions = require('./subscriptions');
 
-const helpers = require.main.require('./src/controllers/helpers');
-
 const Controllers = module.exports;
 
 Controllers.renderSettings = async function (req, res) {
@@ -21,7 +20,10 @@ Controllers.renderSettings = async function (req, res) {
 	const payload = {
 		...res.locals.userData,
 		title: '[[web-push:profile.label]]',
-		breadcrumbs: helpers.buildBreadcrumbs([{ text: username, url: `/user/${userslug}` }, { text: '[[web-push:profile.label]]' }]),
+		breadcrumbs: helpers.buildBreadcrumbs([
+			{ text: username, url: `/user/${userslug}` },
+			{ text: '[[web-push:profile.label]]' },
+		]),
 		count,
 	};
 

package/lib/subscriptions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const db = require.main.require('./src/database');
+const db = nodebb.require('./src/database');
 
 const Subscriptions = module.exports;
 

package/library.js

@@ -1,23 +1,24 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
-const winston = require.main.require('winston');
 const webPush = require('web-push');
 const validator = require('validator');
 
-const db = require.main.require('./src/database');
-const user = require.main.require('./src/user');
-const meta = require.main.require('./src/meta');
-const utils = require.main.require('./src/utils');
-const translator = require.main.require('./src/translator');
-const notifications = require.main.require('./src/notifications');
+const nconf = nodebb.require('nconf');
+const winston = nodebb.require('winston');
+
+const db = nodebb.require('./src/database');
+const user = nodebb.require('./src/user');
+const meta = nodebb.require('./src/meta');
+const utils = nodebb.require('./src/utils');
+const translator = nodebb.require('./src/translator');
+const notifications = nodebb.require('./src/notifications');
+
+const routeHelpers = nodebb.require('./src/routes/helpers');
 
 const controllers = require('./lib/controllers');
 const subscriptions = require('./lib/subscriptions');
 
-const routeHelpers = require.main.require('./src/routes/helpers');
-
-const plugin = {};
+const plugin = module.exports;
 
 plugin.init = async (params) => {
 	const { router, middleware/* , controllers */ } = params;
@@ -104,7 +105,8 @@ plugin.addRoutes = async ({ router, middleware, helpers }) => {
 		const payload = await constructPayload({
 			nid: utils.generateUUID(),
 			bodyShort: 'Test notification',
-			bodyLong: 'This is a test message sent from NodeBB',
+			// test notification shouln't show any html chars
+			bodyLong: 'This is a &lt;bdi&gt;test&lt;/bid&gt; message sent from <strong>NodeBB</strong>',
 			path: `/me/web-push`,
 		}, req.uid, userLang);
 		await webPush.sendNotification(subscription, JSON.stringify(payload));
@@ -217,7 +219,7 @@ async function constructPayload(notification, uid, lang) {
 	const { nid, mergeId, bodyShort, bodyLong, path } = notification;
 
 	let [title, body] = await translator.translateKeys([bodyShort, bodyLong], lang);
-	([title, body] = [title, body].map(str => validator.unescape(utils.stripHTMLTags(str))));
+	([title, body] = [title, body].map(str => utils.stripHTMLTags(utils.decodeHTMLEntities(str))));
 	title = `${dir === 'rtl' ? '\u200f' : '\u200e'}${title}`;
 	const tag = mergeId || nid;
 	const url = `${nconf.get('url')}${path}`;
@@ -247,5 +249,3 @@ async function constructPayload(notification, uid, lang) {
 		data: { url, icon, badge },
 	};
 }
-
-module.exports = plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodebb-plugin-web-push",
-  "version": "0.7.7",
-  "description": "A starter kit for quickly creating NodeBB plugins",
+  "version": "0.7.9",
+  "description": "A plugin for adding native push notifications to NodeBB via the Web Push API.",
   "main": "library.js",
   "repository": {
     "type": "git",
@@ -35,16 +35,15 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^4.0.0"
+    "compatibility": "^4.12.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.4.3",
-    "@commitlint/config-angular": "20.4.3",
-    "eslint": "^10.0.0",
-    "eslint-config-nodebb": "^2.0.0",
-    "eslint-plugin-import": "^2.31.0",
+    "@commitlint/cli": "21.0.2",
+    "@commitlint/config-angular": "21.0.2",
+    "@eslint/js": "^10.0.1",
+    "eslint-config-nodebb": "^2.0.2",
     "husky": "9.1.7",
-    "lint-staged": "16.3.2"
+    "lint-staged": "17.0.8"
   },
   "dependencies": {
     "validator": "^13.12.0",

package/public/lib/settings.js

@@ -83,15 +83,15 @@ export async function init() {
 // as value for applicationServerKey in pushManager.subscribe yet
 // https://bugs.chromium.org/p/chromium/issues/detail?id=802280
 function urlBase64ToUint8Array(base64String) {
-	var padding = '='.repeat((4 - (base64String.length % 4)) % 4);
-	var base64 = (base64String + padding)
+	const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
+	const base64 = (base64String + padding)
 		.replace(/-/g, '+')
 		.replace(/_/g, '/');
 
-	var rawData = window.atob(base64);
-	var outputArray = new Uint8Array(rawData.length);
+	const rawData = window.atob(base64);
+	const outputArray = new Uint8Array(rawData.length);
 
-	for (var i = 0; i < rawData.length; ++i) {
+	for (let i = 0; i < rawData.length; ++i) {
 		outputArray[i] = rawData.charCodeAt(i);
 	}
 	return outputArray;

package/test/index.js

@@ -20,7 +20,7 @@
 
 const assert = require('assert');
 
-const db = require.main.require('./test/mocks/databasemock');
+const db = nodebb.require('./test/mocks/databasemock');
 
 describe('nodebb-plugin-web-push', () => {
 	before(() => {