nodebb-plugin-mentions 3.0.0 → 3.0.4

package/library.js

@@ -170,10 +170,12 @@ async function getGroupsToNotify(matches) {
 }
 
 Mentions.actionPostPurge = async (hookData) => {
-	await db.deleteAll([
-		`mentions:pid:${hookData.postData.pid}:uids`,
-		`mentions:pid:${hookData.postData.pid}:groups`,
-	]);
+	if (hookData && hookData.post) {
+		await db.deleteAll([
+			`mentions:pid:${hookData.post.pid}:uids`,
+			`mentions:pid:${hookData.post.pid}:groups`,
+		]);
+	}
 };
 
 async function filterUidsAlreadyMentioned(uids, pid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "scripts": {
@@ -32,8 +32,8 @@
   },
   "devDependencies": {
     "mocha": "9.1.3",
-    "eslint": "8.1.0",
-    "eslint-config-nodebb": "^0.0.3",
-    "eslint-plugin-import": "^2.24.2"
+    "eslint": "8.4.0",
+    "eslint-config-nodebb": "0.1.1",
+    "eslint-plugin-import": "2.25.3"
   }
 }

package/static/admin.js

@@ -1,36 +1,37 @@
-'use strict';
-/* globals $, app, socket */
-
-define('admin/plugins/mentions', ['settings'], function (Settings) {
-
-	var ACP = {};
-
-	ACP.init = function () {
-		Settings.load('mentions', $('.mentions-settings'));
-
-		$(window).on('action:admin.settingsLoaded', applyDefaults);
-
-		$('#save').on('click', function () {
-			Settings.save('mentions', $('.mentions-settings'), function () {
-				app.alert({
-					type: 'success',
-					alert_id: 'mentions-saved',
-					title: 'Settings Saved',
-					message: 'Please reload your NodeBB to apply these settings',
-					clickfn: function () {
-						socket.emit('admin.reload');
-					}
-				});
-			});
-		});
-	};
-
-	function applyDefaults() {
-		if (!ajaxify.data.settings || !ajaxify.data.settings.hasOwnProperty('autofillGroups')) {
-			$('input#autofillGroups').parents('.mdl-switch').toggleClass('is-checked', false);
-			$('input#autofillGroups').prop('checked', false);
-		}
-	}
-
-	return ACP;
+'use strict';
+
+/* globals $, app, socket, define */
+
+define('admin/plugins/mentions', ['settings', 'alerts'], function (Settings, alerts) {
+
+	var ACP = {};
+
+	ACP.init = function () {
+		Settings.load('mentions', $('.mentions-settings'));
+
+		$(window).on('action:admin.settingsLoaded', applyDefaults);
+
+		$('#save').on('click', function () {
+			Settings.save('mentions', $('.mentions-settings'), function () {
+				alerts.alert({
+					type: 'success',
+					alert_id: 'mentions-saved',
+					title: 'Settings Saved',
+					message: 'Please reload your NodeBB to apply these settings',
+					clickfn: function () {
+						socket.emit('admin.reload');
+					}
+				});
+			});
+		});
+	};
+
+	function applyDefaults() {
+		if (!ajaxify.data.settings || !ajaxify.data.settings.hasOwnProperty('autofillGroups')) {
+			$('input#autofillGroups').parents('.mdl-switch').toggleClass('is-checked', false);
+			$('input#autofillGroups').prop('checked', false);
+		}
+	}
+
+	return ACP;
 });

package/static/autofill.js

@@ -118,7 +118,10 @@ $(document).ready(function() {
 	function loadGroupList() {
 		socket.emit('plugins.mentions.listGroups', function(err, groupNames) {
 			if (err) {
-				return app.alertError(err.message);
+				require(['alerts'], function (alerts) {
+					alerts.error(err);
+				})
+				return;
 			}
 			groupList = groupNames;
 		});

package/upgrades/mentions_delete_mentions_set_zset.js

@@ -7,12 +7,14 @@ module.exports = {
 	name: 'Delete mentions:sent:<pid> sorted sets',
 	timestamp: Date.UTC(2021, 10, 2),
 	method: async function () {
+        const { progress } = this;
         const nextPid = await db.getObjectField('global', 'nextPid');
         const allPids = [];
         for (let pid = 1; pid < nextPid; ++ pid) {
             allPids.push(pid);
         }
         await batch.processArray(allPids, async (pids) => {
+            progress.incr(pids.length);
             await db.deleteAll(pids.map(pid => `mentions:sent:${pid}`));
         }, {
             batch: 500,