nodebb-plugin-mentions 4.8.15 → 4.8.17

package/library.js

@@ -587,6 +587,10 @@ async function stripDisallowedFullnames(users) {
 */
 
 SocketPlugins.mentions.getTopicUsers = async (socket, data) => {
+	const canRead = await privileges.topics.can('read', data.tid, socket.uid);
+	if (!canRead) {
+		throw new Error('[[error:no-privileges]]');
+	}
 	const uids = await Topics.getUids(data.tid);
 	let users = await User.getUsers(uids);
 	users = users.filter(u => u && u.userslug);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.8.15",
+  "version": "4.8.17",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "html-entities": "^2.3.2",
-    "lodash": "4.17.21",
+    "lodash": "4.17.23",
     "validator": "^13.0.0"
   },
   "devDependencies": {

package/static/autofill.js

@@ -2,10 +2,10 @@
 'use strict';
 
 $(document).ready(function () {
-	let groupList = [];
+	let groupList;
+	let localUserList;
 	let categoryList;
 	const categorySlugMap = new Map();
-	let localUserList = [];
 	let helpers;
 
 	function showAlert(type, message) {
@@ -15,15 +15,14 @@ $(document).ready(function () {
 	}
 
 	$(window).on('composer:autocomplete:init chat:autocomplete:init', function (ev, data) {
-		loadTopicUsers(data.element);
-
-		if (!groupList.length) {
-			loadGroupList();
-		}
-
-		if (!categoryList) {
-			loadCategoryList();
-		}
+		// load the data for lists on focus of textarea element
+		data.element.one('focus', async function () {
+			await Promise.all([
+				loadTopicUsers(data.element),
+				groupList ? Promise.resolve() : loadGroupList(),
+				categoryList ? Promise.resolve() : loadCategoryList(),
+			]);
+		});
 
 		let slugify;
 		const strategy = {
@@ -135,56 +134,48 @@ $(document).ready(function () {
 		}
 	}
 
-	function loadTopicUsers(element) {
-		require(['composer'], function (composer) {
-			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;
+	async function loadTopicUsers(element) {
+		const composer = await app.require('composer');
+		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;
 				}
-				return null;
 			}
-
-			const tid = findTid();
-			if (!tid) {
-				localUserList = [];
-				return;
+			if (ajaxify.data.template.topic) {
+				return ajaxify.data.tid;
 			}
-			socket.emit('plugins.mentions.getTopicUsers', {
-				tid: tid,
-			}, function (err, users) {
-				if (err) {
-					return showAlert('error', err);
-				}
-				localUserList = users;
-			});
-		});
+			return null;
+		}
+
+		const tid = findTid();
+		if (!tid) {
+			localUserList = [];
+			return;
+		}
+		localUserList = await socket.emit('plugins.mentions.getTopicUsers', {
+			tid: tid,
+		}).catch(err => showAlert('error', err));
 	}
 
 	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() {
-		require(['api'], async (api) => {
-			const { categories } = await api.get('/categories');
-			categoryList = categories;
-			categories.forEach((category) => {
-				categorySlugMap.set(category.name.toLowerCase(), category.handle);
-			});
+	async function loadCategoryList() {
+		const api = await app.require('api');
+		const { categories } = await api.get('/categories');
+		categoryList = categories;
+		categories.forEach((category) => {
+			categorySlugMap.set(category.name.toLowerCase(), category.handle);
 		});
 	}
 });