nodebb-plugin-mentions 4.0.2 → 4.0.4

package/library.js

@@ -96,12 +96,12 @@ Mentions.notify = async function (data) {
 		return;
 	}
 
-	const [topic, author, topicFollowers] = await Promise.all([
+	const [topic, userData, topicFollowers] = await Promise.all([
 		Topics.getTopicFields(postData.tid, ['title', 'cid']),
-		User.getUserField(postData.uid, 'username'),
+		User.getUserFields(postData.uid, ['username']),
 		Mentions._settings.disableFollowedTopics === 'on' ? Topics.getFollowers(postData.tid) : [],
 	]);
-
+	const { displayname } = userData;
 	const title = entitiesDecode(topic.title);
 	const titleEscaped = title.replace(/%/g, '%').replace(/,/g, ',');
 
@@ -129,7 +129,7 @@ Mentions.notify = async function (data) {
 
 	const filteredUids = await filterUidsAlreadyMentioned(uids, postData.pid);
 	if (filteredUids.length) {
-		await sendNotificationToUids(postData, filteredUids, 'user', `[[notifications:user_mentioned_you_in, ${author}, ${titleEscaped}]]`);
+		await sendNotificationToUids(postData, filteredUids, 'user', `[[notifications:user_mentioned_you_in, ${displayname}, ${titleEscaped}]]`);
 		await db.setAdd(`mentions:pid:${postData.pid}:uids`, filteredUids);
 	}
 
@@ -139,7 +139,7 @@ Mentions.notify = async function (data) {
 			const groupName = groupsToNotify[i].name;
 			const groupMentionSent = await db.isSetMember(`mentions:pid:${postData.pid}:groups`, groupName);
 			if (!groupMentionSent && memberUids.length) {
-				await sendNotificationToUids(postData, memberUids, groupName, `[[notifications:user_mentioned_group_in, ${author} , ${groupName}, ${titleEscaped}]]`);
+				await sendNotificationToUids(postData, memberUids, groupName, `[[notifications:user_mentioned_group_in, ${displayname} , ${groupName}, ${titleEscaped}]]`);
 				await db.setAdd(`mentions:pid:${postData.pid}:groups`, groupName);
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "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": "10.0.0",
-    "eslint": "8.24.0",
-    "eslint-config-nodebb": "0.1.1",
-    "eslint-plugin-import": "2.26.0"
+    "mocha": "10.2.0",
+    "eslint": "8.34.0",
+    "eslint-config-nodebb": "0.2.1",
+    "eslint-plugin-import": "2.27.5"
   }
 }

package/static/admin.js

@@ -1,10 +1,7 @@
 'use strict';
 
-/* globals $, app, socket, define */
-
 define('admin/plugins/mentions', ['settings', 'alerts'], function (Settings, alerts) {
-
-	var ACP = {};
+	const ACP = {};
 
 	ACP.init = function () {
 		Settings.load('mentions', $('.mentions-settings'));
@@ -18,9 +15,10 @@ define('admin/plugins/mentions', ['settings', 'alerts'], function (Settings, ale
 					alert_id: 'mentions-saved',
 					title: 'Settings Saved',
 					message: 'Please reload your NodeBB to apply these settings',
+					timeout: 5000,
 					clickfn: function () {
 						socket.emit('admin.reload');
-					}
+					},
 				});
 			});
 		});
@@ -34,4 +32,4 @@ define('admin/plugins/mentions', ['settings', 'alerts'], function (Settings, ale
 	}
 
 	return ACP;
-});
+});

package/static/autofill.js

@@ -33,12 +33,18 @@ $(document).ready(function () {
 						if (err) {
 							return callback([]);
 						}
+						const termLowerCase = term.toLocaleLowerCase();
+						const localMatches = localUserList.filter(
+							u => u.username.startsWith(termLowerCase)
+						);
 
-						mentions = mentions.concat(usersToMentions(sortUsers(users), helpers));
+						// remove local matches from search results
+						users = users.filter(u => !localMatches.find(lu => lu.uid === u.uid));
+						mentions = usersToMentions(sortUsers(localMatches).concat(sortUsers(users)), helpers);
 
 						// Add groups that start with the search term
 						const groupMentions = groupList.filter(function (groupName) {
-							return groupName.toLocaleLowerCase().startsWith(term.toLocaleLowerCase());
+							return groupName.toLocaleLowerCase().startsWith(termLowerCase);
 						}).sort(function (a, b) {
 							return a.toLocaleLowerCase() > b.toLocaleLowerCase() ? 1 : -1;
 						});
@@ -93,21 +99,28 @@ $(document).ready(function () {
 
 	function loadTopicUsers(element) {
 		require(['composer', 'alerts'], function (composer, alerts) {
-			const composerEl = element.parents('.composer').get(0);
-			if (!composerEl) {
-				return;
+			function findTid() {
+				const composerEl = element.parents('.composer').get(0);
+				if (composerEl) {
+					const uuid = composerEl.getAttribute('data-uuid');
+					const composerObj = composer.posts[uuid];
+					if (composerObj && composerObj.tid) {
+						return composerObj.tid;
+					}
+				}
+				if (ajaxify.data.template.topic) {
+					return ajaxify.data.tid;
+				}
+				return null;
 			}
 
-			const uuid = composerEl.getAttribute('data-uuid');
-			const composerObj = composer.posts[uuid];
-
-			if (!composerObj.tid) {
+			const tid = findTid();
+			if (!tid) {
 				localUserList = [];
 				return;
 			}
-
 			socket.emit('plugins.mentions.getTopicUsers', {
-				tid: composerObj.tid,
+				tid: tid,
 			}, function (err, users) {
 				if (err) {
 					return alerts.error(err);

package/templates/admin/plugins/mentions.tpl

@@ -56,6 +56,4 @@
 	</div>
 </form>
 
-<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-	<i class="material-icons">save</i>
-</button>
+<!-- IMPORT admin/partials/save_button.tpl -->

package/upgrades/mentions_delete_mentions_set_zset.js

@@ -1,23 +1,24 @@
-'use strict';
-
-
-const db = module.parent.require('./database');
-const batch = module.parent.require('./batch');
-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,
-        });
-	},
+'use strict';
+
+
+const db = module.parent.require('./database');
+const batch = module.parent.require('./batch');
+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);
+		}
+		progress.total = allPids.length;
+		await batch.processArray(allPids, async (pids) => {
+			progress.incr(pids.length);
+			await db.deleteAll(pids.map(pid => `mentions:sent:${pid}`));
+		}, {
+			batch: 500,
+		});
+	},
 };