nodebb-plugin-mentions 4.7.5 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.7.5",
+  "version": "4.8.0",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "repository": {
@@ -33,6 +33,6 @@
     "eslint": "^9.25.1",
     "eslint-config-nodebb": "^1.1.4",
     "eslint-plugin-import": "^2.31.0",
-    "mocha": "11.2.2"
+    "mocha": "11.7.4"
   }
 }

package/static/autofill.js

@@ -64,6 +64,7 @@ $(document).ready(function () {
 						}).sort(function (a, b) {
 							return a.toLocaleLowerCase() > b.toLocaleLowerCase() ? 1 : -1;
 						});
+
 						// Add group mentions at the bottom of dropdown
 						mentions = mentions.concat(groupMentions);
 
@@ -113,10 +114,24 @@ $(document).ready(function () {
 				return carry;
 			}
 
-			// Format suggestions as 'avatar username/name (fullname)'
-			const avatar = entry.uid ? helpers.buildAvatar(entry, '24px', true) : '';
-			const fullname = entry.fullname ? `(${entry.fullname})` : '';
-			carry.push(`${avatar} ${entry.username || entry.name} ${helpers.escape(fullname)}`);
+			// 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);
+			}
 
 			return carry;
 		}, []);