nodebb-plugin-mentions 4.7.6 → 4.8.1

package/LICENSE

@@ -1,8 +1,8 @@
-Copyright (c) 2013-2014, Julian Lam <julian@designcreateplay.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Copyright (c) 2013-2014, Julian Lam <julian@designcreateplay.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,14 +1,14 @@
-# Username/Group Mentions
-
-This NodeBB plugin allows posters to reference (or *mention*) other users or groups on a NodeBB by simply
-precluding the `@` symbol before a username.
-
-A link is automatically added to the post.
-
-## Installation
-
-This plugin is bundled with every NodeBB install. If not, you can install it via the Plugins page of the ACP.
-
-Alternatively,
-
+# Username/Group Mentions
+
+This NodeBB plugin allows posters to reference (or *mention*) other users or groups on a NodeBB by simply
+precluding the `@` symbol before a username.
+
+A link is automatically added to the post.
+
+## Installation
+
+This plugin is bundled with every NodeBB install. If not, you can install it via the Plugins page of the ACP.
+
+Alternatively,
+
     npm install nodebb-plugin-mentions

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') => {
@@ -593,17 +601,21 @@ SocketPlugins.mentions.userSearch = async (socket, data) => {
 		).concat(fullnameUsers);
 	}
 
-	if (Mentions._settings.privilegedDirectReplies !== 'on') {
-		return users;
-	}
+	if (Mentions._settings.privilegedDirectReplies === 'on') {
+		if (data.composerObj) {
+			const cid = Topics.getTopicField(data.composerObj.tid, 'cid');
+			const filteredUids = await filterPrivilegedUids(users.map(userObj => userObj.uid), cid, data.composerObj.toPid);
 
-	if (data.composerObj) {
-		const cid = Topics.getTopicField(data.composerObj.tid, 'cid');
-		const filteredUids = await filterPrivilegedUids(users.map(userObj => userObj.uid), cid, data.composerObj.toPid);
+			users = users.filter(userObj => filteredUids.includes(userObj.uid));
+		}
 
-		users = users.filter(userObj => filteredUids.includes(userObj.uid));
+		return users;
 	}
 
-	return users;
+	// Remote categories
+	let { categories: categoriesObj } = await categories.search(data);
+	categoriesObj = categoriesObj.filter(category => !utils.isNumber(category.cid));
+
+	return [...users, ...categoriesObj];
 };