nodebb-plugin-mentions 4.8.0 → 4.8.1

package/library.js

@@ -360,11 +360,17 @@ Mentions.getMatches = async (content) => {
 	// Exported method only accepts markdown, also filters out dupes and matches to ensure slugs exist
 	let { matches } = await getMatches(content, true);
 	matches = await filterMatches(matches);
+	if (!matches.length) {
+		return new Set();
+	}
+
 	const normalized = matches.map(match => match.slice(1).toLowerCase());
-	const [uids, cids] = await Promise.all([
+	let [uids, localCids, remoteCids] = await Promise.all([
 		User.getUidsByUserslugs(normalized),
 		db.sortedSetScores('categoryhandle:cid', normalized),
+		db.getObjectFields('handle:cid', normalized),
 	]);
+	remoteCids = Object.values(remoteCids);
 
 	matches = matches.map((slug, idx) => {
 		if (uids[idx]) {
@@ -373,10 +379,10 @@ Mentions.getMatches = async (content) => {
 				id: uids[idx],
 				slug,
 			};
-		} else if (cids[idx]) {
+		} else if (localCids[idx] || remoteCids[idx]) {
 			return {
 				type: 'cid',
-				id: cids[idx],
+				id: localCids[idx] || remoteCids[idx],
 				slug,
 			};
 		}
@@ -389,9 +395,11 @@ Mentions.getMatches = async (content) => {
 
 async function filterMatches(matches) {
 	matches = Array.from(new Set(matches));
-	const exists = await meta.userOrGroupExists(matches.map(match => match.slice(1)));
+	const slugs = matches.map(match => match.slice(1));
+	const exists = await meta.slugTaken(slugs);
+	const remoteCidExists = await db.isObjectFields('handle:cid', slugs);
 
-	return matches.filter((m, i) => exists[[i]]);
+	return matches.filter((m, i) => exists[i] || remoteCidExists[i]);
 }
 
 Mentions.parseRaw = async (content, type = 'default') => {

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "nodebb-plugin-mentions",
-      "version": "4.8.0",
+      "version": "4.8.1",
       "license": "MIT",
       "dependencies": {
         "html-entities": "^2.3.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "repository": {

package/static/autofill.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
 	let categoryList;
 	const categorySlugMap = new Map();
 	let localUserList = [];
+	let helpers;
 
 	$(window).on('composer:autocomplete:init chat:autocomplete:init', function (ev, data) {
 		loadTopicUsers(data.element);
@@ -22,11 +23,11 @@ $(document).ready(function () {
 		const strategy = {
 			match: /\B@([^\s\n]*)?$/,
 			search: function (term, callback) {
-				require(['composer', 'helpers', 'slugify'], function (composer, helpers, _slugify) {
+				require(['composer', 'helpers', 'slugify'], function (composer, _helpers, _slugify) {
 					slugify = _slugify;
-					let mentions = [];
+					helpers = _helpers;
 					if (!term) {
-						mentions = entriesToMentions(sortEntries(localUserList), helpers);
+						const mentions = entriesToMentions(sortEntries(localUserList), helpers);
 						return callback(mentions);
 					}
 
@@ -56,7 +57,7 @@ $(document).ready(function () {
 						// remove local matches from search results, add category matches
 						users = users.filter(u => !localMatches.find(lu => lu.uid === u.uid));
 						users = sortEntries(localMatches).concat(sortEntries([...users, ...categoryMatches]));
-						mentions = entriesToMentions(users, helpers);
+						// mentions = entriesToMentions(users, helpers);
 
 						// Add groups that start with the search term
 						const groupMentions = groupList.filter(function (groupName) {
@@ -66,27 +67,20 @@ $(document).ready(function () {
 						});
 
 						// Add group mentions at the bottom of dropdown
-						mentions = mentions.concat(groupMentions);
+						// mentions = mentions.concat(groupMentions);
 
-						callback(mentions);
+						callback([...users, ...groupMentions]);
 					});
 				});
 			},
 			index: 1,
+			template: entryToMention,
 			replace: function (mention) {
-				// Strip (fullname) part from mentions
-				mention = mention.replace(/ \(.+\)$/, '');
-				mention = $('<div/>').html(mention);
-				// Strip letter avatar
-				mention.find('span').remove();
-
-				const text = mention.text().trim();
-				const categoryHandle = categorySlugMap.get(text.toLowerCase());
-				if (categoryHandle) {
-					return `@${categoryHandle}`;
+				if (mention.uid) {
+					return `@${mention.userslug}`;
+				} else if (mention.cid) {
+					return `@${utils.isNumber(mention.cid) ? mention.handle : mention.slug}`;
 				}
-
-				return '@' + slugify(text, true) + ' ';
 			},
 			cache: true,
 		};
@@ -107,6 +101,25 @@ $(document).ready(function () {
 		});
 	}
 
+	function entryToMention(entry) {
+		// Format suggestions as 'avatar username/name (fullname/slug)'
+		switch(true) {
+			case entry.hasOwnProperty('uid'): {
+				const avatar = helpers.buildAvatar(entry, '24px', true);
+				const fullname = entry.fullname ? `(${entry.fullname})` : '';
+				return `${avatar} ${entry.username || entry.name} ${helpers.escape(fullname)}`;
+			}
+
+			case entry.hasOwnProperty('cid'): {
+				const avatar = helpers.buildCategoryIcon(entry, '24px', 'rounded-circle');
+				return `${avatar} ${entry.name}${!utils.isNumber(entry.cid) ? ` (${entry.slug})` : ''}`;
+			}
+
+			default:
+				return entry.name;
+		}
+	}
+
 	function entriesToMentions(entries, helpers) {
 		return entries.reduce(function (carry, entry) {
 			// Don't add current user to suggestions
@@ -114,25 +127,7 @@ $(document).ready(function () {
 				return carry;
 			}
 
-			// Format suggestions as 'avatar username/name (fullname/slug)'
-			switch(true) {
-				case entry.hasOwnProperty('uid'): {
-					const avatar = helpers.buildAvatar(entry, '24px', true);
-					const fullname = entry.fullname ? `(${entry.fullname})` : '';
-					carry.push(`${avatar} ${entry.username || entry.name} ${helpers.escape(fullname)}`);
-					break;
-				}
-
-				case entry.hasOwnProperty('cid'): {
-					const avatar = helpers.buildCategoryIcon(entry, '24px', 'rounded-circle');
-					carry.push(`${avatar} ${entry.name}${!utils.isNumber(entry.cid) ? ` (${entry.slug})` : ''}`);
-					break;
-				}
-
-				default:
-					carry.push(entry.name);
-			}
-
+			carry.push(entryToMention(entry));
 			return carry;
 		}, []);
 	}