nodebb-plugin-mentions 4.8.13 → 4.8.15

package/library.js

@@ -607,8 +607,10 @@ SocketPlugins.mentions.listGroups = async function () {
 	const noMentionGroups = await getNoMentionGroups();
 	const filteredGroups = groups.filter(g => g && !noMentionGroups.includes(g))
 		.map(g => validator.escape(String(g)));
-
-	return filteredGroups;
+	const fields = ['name', 'slug', 'icon', 'memberCount', 'labelColor', 'textColor'];
+	return (await Groups.getGroupsFields(filteredGroups, fields))
+		.filter(g => g && g.name && g.slug)
+		.map(g => ({ ..._.pick(g, fields), isGroup: true }));
 };
 
 SocketPlugins.mentions.userSearch = async (socket, data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.8.13",
+  "version": "4.8.15",
   "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

@@ -24,6 +24,7 @@ $(document).ready(function () {
 		if (!categoryList) {
 			loadCategoryList();
 		}
+
 		let slugify;
 		const strategy = {
 			match: /\B@([^\s\n]*)?$/,
@@ -62,8 +63,7 @@ $(document).ready(function () {
 						const groupMentions = groupList.filter(
 							group => group.name.toLocaleLowerCase().startsWith(termLowerCase) ||
 								group.slug.startsWith(termLowerCase)
-						).sort((a, b) =>a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase() ? 1 : -1)
-							.map(group => group.name);
+						).sort((a, b) => a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase() ? 1 : -1);
 
 						// Add group mentions at the bottom of dropdown
 						callback([...users, ...groupMentions]);
@@ -77,6 +77,8 @@ $(document).ready(function () {
 					return `@${mention.userslug} `;
 				} else if (mention.cid) {
 					return `@${utils.isNumber(mention.cid) ? mention.handle : mention.slug} `;
+				} else if (mention.isGroup) {
+					return `@${slugify(mention.name, true)} `;
 				} else if (mention) {
 					return `@${slugify(mention, true)} `;
 				}
@@ -119,6 +121,14 @@ $(document).ready(function () {
 				const avatar = helpers.buildCategoryIcon(entry, '24px', 'rounded-circle');
 				return `${avatar} ${entry.name}${!utils.isNumber(entry.cid) ? ` (${entry.slug})` : ''}`;
 			}
+			case entry.isGroup: {
+				const icon = helpers.buildCategoryIcon({
+					icon: entry.icon || 'fa-users',
+					bgColor: entry.labelColor,
+					color: entry.textColor,
+				}, '24px', 'rounded-circle');
+				return `${icon} ${entry.name} <span class="text-sm text-secondary">(${entry.memberCountText})</span>`;
+			}
 
 			default:
 				return entry.hasOwnProperty('name') ? entry.name : entry;
@@ -158,14 +168,14 @@ $(document).ready(function () {
 		});
 	}
 
-	function loadGroupList() {
-		socket.emit('plugins.mentions.listGroups', async function (err, groupNames) {
-			if (err) {
-				return showAlert('error', err.message);
-			}
-			const s = await app.require('slugify');
-			groupList = groupNames.map(name => ({ name, slug: s(name) }));
-		});
+	async function loadGroupList() {
+		groupList = await socket.emit('plugins.mentions.listGroups');
+		const [translator, helpers] = await app.require(['translator', 'helpers']);
+		await Promise.all(groupList.map(async (group) => {
+			group.memberCount = 12312313;
+			const key = translator.compile('groups:x-members', helpers.formattedNumber(group.memberCount));
+			group.memberCountText = await translator.translate(key);
+		}));
 	}
 
 	function loadCategoryList() {