nodebb-plugin-mentions 3.0.2 → 3.0.6

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.2",
+  "version": "3.0.6",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "scripts": {
@@ -31,9 +31,9 @@
     "xregexp": "^5.1.0"
   },
   "devDependencies": {
-    "mocha": "9.1.3",
-    "eslint": "8.2.0",
-    "eslint-config-nodebb": "0.0.3",
-    "eslint-plugin-import": "2.25.2"
+    "mocha": "9.2.0",
+    "eslint": "8.9.0",
+    "eslint-config-nodebb": "0.1.1",
+    "eslint-plugin-import": "2.25.4"
   }
 }

package/plugin.json

@@ -22,9 +22,9 @@
 	"scripts": [
 		"static/autofill.js"
 	],
-	"acpScripts": [
-		"static/admin.js"
-	],
+	"modules": {
+		"../admin/plugins/mentions.js": "./static/admin.js"
+	},
 	"languages": "languages",
 	"defaultLang": "en_GB",
 	"templates": "templates"

package/static/.eslintrc

@@ -0,0 +1,3 @@
+{
+	"extends": "nodebb/public"
+}

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

@@ -1,12 +1,11 @@
-"use strict";
-/* globals socket, app */
 
+'use strict';
 
-$(document).ready(function() {
+$(document).ready(function () {
 	let groupList = [];
 	let localUserList = [];
 
-	$(window).on('composer:autocomplete:init chat:autocomplete:init', function(ev, data) {
+	$(window).on('composer:autocomplete:init chat:autocomplete:init', function (ev, data) {
 		loadTopicUsers(data.element);
 
 		if (!groupList.length) {
@@ -30,7 +29,7 @@ $(document).ready(function() {
 					socket.emit('plugins.mentions.userSearch', {
 						query: term,
 						composerObj: composer.posts[uuid],
-					}, function(err, users) {
+					}, function (err, users) {
 						if (err) {
 							return callback([]);
 						}
@@ -40,7 +39,7 @@ $(document).ready(function() {
 						// Add groups that start with the search term
 						const groupMentions = groupList.filter(function (groupName) {
 							return groupName.toLocaleLowerCase().startsWith(term.toLocaleLowerCase());
-						}).sort(function(a, b) {
+						}).sort(function (a, b) {
 							return a.toLocaleLowerCase() > b.toLocaleLowerCase() ? 1 : -1;
 						});
 						// Add group mentions at the bottom of dropdown
@@ -59,24 +58,24 @@ $(document).ready(function() {
 				mention.find('span').remove();
 				return '@' + slugify(mention.text(), true) + ' ';
 			},
-			cache: true
+			cache: true,
 		};
 
 		data.strategies.push(strategy);
 	});
 
-	$(window).on('action:composer.loaded', function(e, data) {
+	$(window).on('action:composer.loaded', function (ev, data) {
 		const composer = $('#cmp-uuid-' + data.post_uuid + ' .write');
 		composer.attr('data-mentions', '1');
 	});
 
-	function sortUsers (users) {
+	function sortUsers(users) {
 		return users.sort(function (user1, user2) {
 			return user1.username.toLocaleLowerCase() > user2.username.toLocaleLowerCase() ? 1 : -1;
 		});
 	}
 
-	function usersToMentions (users, helpers) {
+	function usersToMentions(users, helpers) {
 		return users.reduce(function (carry, user) {
 			// Don't add current user to suggestions
 			if (app.user.username && app.user.username === user.username) {
@@ -93,7 +92,7 @@ $(document).ready(function() {
 	}
 
 	function loadTopicUsers(element) {
-		require(['composer'], function (composer) {
+		require(['composer', 'alerts'], function (composer, alerts) {
 			const composerEl = element.parents('.composer').get(0);
 			if (!composerEl) {
 				return;
@@ -110,18 +109,23 @@ $(document).ready(function() {
 			socket.emit('plugins.mentions.getTopicUsers', {
 				tid: composerObj.tid,
 			}, function (err, users) {
+				if (err) {
+					return alerts.error(err);
+				}
 				localUserList = users;
 			});
 		});
 	}
 
 	function loadGroupList() {
-		socket.emit('plugins.mentions.listGroups', function(err, groupNames) {
+		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;
 		});
 	}
-
 });