nodebb-plugin-mentions 4.5.3 → 4.6.1

package/.eslintrc

@@ -1,3 +1,3 @@
-{
-	"extends": "nodebb/lib"
+{
+	"extends": "nodebb/lib"
 }

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/languages/ar/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> ذكرَ اسمك في <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> ذكرَ اسمك في <strong>%2</strong>"
 }

package/languages/bg/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>"
 }

package/languages/bn/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন"
+{
+    "user-mentioned-you-in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন"
 }

package/languages/da/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>"
 }

package/languages/de/notifications.json

@@ -1,6 +1,6 @@
-{
-    "mentions": "Erwähnungen",
-    "user-mentioned-you-in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
-    "user-mentioned-group-in": "<strong>%1</strong> erwähnte <strong>%2</strong> in <strong>%3</strong>",
-    "notificationType_mention": "Wenn dich jemand erwähnt"
+{
+    "mentions": "Erwähnungen",
+    "user-mentioned-you-in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
+    "user-mentioned-group-in": "<strong>%1</strong> erwähnte <strong>%2</strong> in <strong>%3</strong>",
+    "notificationType_mention": "Wenn dich jemand erwähnt"
 }

package/languages/el/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "Ο/Η <strong>%1</strong> σε ανέφερε στο <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "Ο/Η <strong>%1</strong> σε ανέφερε στο <strong>%2</strong>"
 }

package/languages/en@pirate/notifications.json

@@ -1,4 +1,4 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> spoke yer name in <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> called fer <strong>%2</strong> in <strong>%3</strong>"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> spoke yer name in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> called fer <strong>%2</strong> in <strong>%3</strong>"
+}

package/languages/en_GB/mentions.json

@@ -1,3 +1,3 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>"
+}

package/languages/en_GB/notifications.json

@@ -1,7 +1,7 @@
-{
-	"mentions": "Mentions",
-	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user-mentioned-you-in-room": "<strong>%1</strong> mentioned you in <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>",
-	"notificationType-mention": "When someone mentions you"
-}
+{
+	"mentions": "Mentions",
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user-mentioned-you-in-room": "<strong>%1</strong> mentioned you in <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>",
+	"notificationType-mention": "When someone mentions you"
+}

package/languages/en_US/notifications.json

@@ -1,4 +1,4 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
+}

package/languages/es/notifications.json

@@ -1,4 +1,4 @@
-{
-    "mentions": "Menciones",
-    "user-mentioned-you-in": "<strong>%1</strong> te mencionó en <strong>%2</strong>"
+{
+    "mentions": "Menciones",
+    "user-mentioned-you-in": "<strong>%1</strong> te mencionó en <strong>%2</strong>"
 }

package/languages/et/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> mainis sind postituses <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> mainis sind postituses <strong>%2</strong>"
 }

package/languages/fa_IR/notifications.json

@@ -1,4 +1,4 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> شما رو در <strong>%2</strong> منشن کرده",
-	"user-mentioned-group-in": "<strong>%1</strong> گروه <strong>%2</strong> رو در <strong>%3</strong> منشن کرده"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> شما رو در <strong>%2</strong> منشن کرده",
+	"user-mentioned-group-in": "<strong>%1</strong> گروه <strong>%2</strong> رو در <strong>%3</strong> منشن کرده"
+}

package/languages/fi/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> mainitsi sinut viestissä <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> mainitsi sinut viestissä <strong>%2</strong>"
 }

package/languages/fr/notifications.json

@@ -1,6 +1,6 @@
-{
-	"mentions": "Mentions",
-	"user-mentioned-you-in": "<strong>%1</strong> vous a mentionné dans <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> a mentionné <strong>%2</strong> dans <strong>%3</strong>",
-	"notificationType_mention": "Lorsque quelqu'un vous mentionne"
+{
+	"mentions": "Mentions",
+	"user-mentioned-you-in": "<strong>%1</strong> vous a mentionné dans <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> a mentionné <strong>%2</strong> dans <strong>%3</strong>",
+	"notificationType_mention": "Lorsque quelqu'un vous mentionne"
 }

package/languages/gl/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> mencionóute en <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> mencionóute en <strong>%2</strong>"
 }

package/languages/id/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> menyebut mu di <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> menyebut mu di <strong>%2</strong>"
 }

package/languages/it/notifications.json

@@ -1,4 +1,4 @@
-{
-    "mentions": "Menzioni",
-    "user-mentioned-you-in": "<strong>%1</strong> ti ha menzionato in <strong>%2</strong>"
+{
+    "mentions": "Menzioni",
+    "user-mentioned-you-in": "<strong>%1</strong> ti ha menzionato in <strong>%2</strong>"
 }

package/languages/ja/notifications.json

@@ -1,5 +1,5 @@
-{
-	"mentions": "メンション",
-	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
+{
+	"mentions": "メンション",
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
 }

package/languages/jbo/notifications.json

@@ -1,4 +1,4 @@
-{
-	"user-mentioned-you-in": "la .<strong>%1</strong>. klacpe do la .<strong>%2</strong>.",
-	"user-mentioned-group-in": "la .<strong>%1</strong>. klacpe la .<strong>%2</strong>. la .<strong>%3</strong>."
-}
+{
+	"user-mentioned-you-in": "la .<strong>%1</strong>. klacpe do la .<strong>%2</strong>.",
+	"user-mentioned-group-in": "la .<strong>%1</strong>. klacpe la .<strong>%2</strong>. la .<strong>%3</strong>."
+}

package/languages/ko/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong>님이 <strong>%2</strong>에서 나를 언급했습니다."
+{
+    "user-mentioned-you-in": "<strong>%1</strong>님이 <strong>%2</strong>에서 나를 언급했습니다."
 }

package/languages/lt/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> paminėjo Jus <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> paminėjo Jus <strong>%2</strong>"
 }

package/languages/ms/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> sebut anda di <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> sebut anda di <strong>%2</strong>"
 }

package/languages/nl/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "Onze naam is genoemd door <strong>%1</strong> in <strong>%2</strong>."
+{
+    "user-mentioned-you-in": "Onze naam is genoemd door <strong>%1</strong> in <strong>%2</strong>."
 }

package/languages/pl/mentions.json

@@ -1,3 +1,3 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>"
+}

package/languages/pl/notifications.json

@@ -1,6 +1,6 @@
-{
-	"mentions": "Wspomnienia",
-	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> wspomniał <strong>%2</strong> w <strong>%3</strong>",
-	"notificationType_mention": "Kiedy ktoś o Tobie wspomni"
-}
+{
+	"mentions": "Wspomnienia",
+	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> wspomniał <strong>%2</strong> w <strong>%3</strong>",
+	"notificationType_mention": "Kiedy ktoś o Tobie wspomni"
+}

package/languages/pt-PT/notifications.json

@@ -1,6 +1,6 @@
-{
-	"mentions": "Menções",
-	"user-mentioned-you-in": "<strong>%1</strong> mencionou-te no tópico <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> mencionou o grupo <strong>%2</strong> no tópico <strong>%3</strong>",
-	"notificationType_mention": "Quando alguém te menciona"
-}
+{
+	"mentions": "Menções",
+	"user-mentioned-you-in": "<strong>%1</strong> mencionou-te no tópico <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mencionou o grupo <strong>%2</strong> no tópico <strong>%3</strong>",
+	"notificationType_mention": "Quando alguém te menciona"
+}

package/languages/pt_BR/notifications.json

@@ -1,4 +1,4 @@
-{
-    "mentions": "Menções",
-    "user-mentioned-you-in": "<strong>%1</strong> mencionou você em <strong>%2</strong>"
+{
+    "mentions": "Menções",
+    "user-mentioned-you-in": "<strong>%1</strong> mencionou você em <strong>%2</strong>"
 }

package/languages/ro/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> te-a menționat în <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> te-a menționat în <strong>%2</strong>"
 }

package/languages/rw/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> yakuvuze muri <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> yakuvuze muri <strong>%2</strong>"
 }

package/languages/sl/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> te je omenil v <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> te je omenil v <strong>%2</strong>"
 }

package/languages/sr/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> вас помену у <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> вас помену у <strong>%2</strong>"
 }

package/languages/sv/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> nämnde dig i <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> nämnde dig i <strong>%2</strong>"
 }

package/languages/tr/notifications.json

@@ -1,6 +1,6 @@
-{
-	"mentions": "Bahsedilmeler",
-	"user-mentioned-you-in": "<strong>%1</strong> sizden şu konuda bahsetti: <strong>%2</strong>",
-	"user-mentioned-group-in": "<strong>%1</strong> kullanıcısı <strong>%2</strong> grubundan şu konuda bahsetti: <strong>%3</strong>",
-	"notificationType_mention": "Biri sizden bahsettiğinde"
-}
+{
+	"mentions": "Bahsedilmeler",
+	"user-mentioned-you-in": "<strong>%1</strong> sizden şu konuda bahsetti: <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> kullanıcısı <strong>%2</strong> grubundan şu konuda bahsetti: <strong>%3</strong>",
+	"notificationType_mention": "Biri sizden bahsettiğinde"
+}

package/languages/vi/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> nhắc đến bạn trong <strong>%2</strong>"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> nhắc đến bạn trong <strong>%2</strong>"
 }

package/languages/zh-CN/mentions.json

@@ -1,3 +1,3 @@
-{
-	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了您"
-}
+{
+	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了您"
+}

package/languages/zh-CN/notifications.json

@@ -1,6 +1,6 @@
-{
-	"mentions": "提到",
-	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了你",
-	"user-mentioned-group-in": "<strong>%1</strong> 在 <strong>%3</strong> 中提到了 <strong>%2</strong>",
-	"notificationType_mention": "当有人提到你时"
+{
+	"mentions": "提到",
+	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了你",
+	"user-mentioned-group-in": "<strong>%1</strong> 在 <strong>%3</strong> 中提到了 <strong>%2</strong>",
+	"notificationType_mention": "当有人提到你时"
 }

package/languages/zh_TW/notifications.json

@@ -1,3 +1,3 @@
-{
-    "user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong>提到你"
+{
+    "user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong>提到你"
 }

package/library.js

@@ -5,6 +5,7 @@
 const _ = require('lodash');
 const validator = require('validator');
 const entitiesDecode = require('html-entities').decode;
+const cheerio = require('cheerio');
 
 const nconf = require.main.require('nconf');
 const winston = require.main.require('winston');
@@ -36,6 +37,7 @@ const parts = {
 };
 const regex = RegExp(`${parts.before}${parts.main}`, 'gu');
 const isLatinMention = /@[\w\d\-_.@]+$/;
+const hasAnchors = /<a.*>.*<\/a>/i;
 
 const Mentions = module.exports;
 
@@ -332,11 +334,12 @@ async function createNotification(postData, nidType, notificationText) {
 }
 
 Mentions.parsePost = async (data) => {
-	if (!data || !data.postData || !data.postData.content) {
+	const { postData, type } = data;
+	if (!postData.content) {
 		return data;
 	}
 
-	const parsed = await Mentions.parseRaw(data.postData.content);
+	const parsed = await Mentions.parseRaw(postData.content, type);
 	data.postData.content = parsed;
 	return data;
 };
@@ -345,7 +348,7 @@ function removePunctuationSuffix(string) {
 	return string.replace(/[!?.]*$/, '');
 }
 
-function getMatches(content, isMarkdown = false) {
+async function getMatches(content, isMarkdown = false) {
 	const splitContent = utility.split(content, isMarkdown, false, true);
 	let matches = [];
 	splitContent.forEach((cleanedContent, i) => {
@@ -354,12 +357,42 @@ function getMatches(content, isMarkdown = false) {
 		}
 	});
 
-	return { splitContent, matches };
+	const joined = splitContent.join('');
+	const parseAnchors = joined.match(hasAnchors);
+	const urlMap = new Map();
+	if (!isMarkdown && parseAnchors) {
+		const $ = cheerio.load(splitContent.join(''));
+		const anchors = $('a');
+		const urls = new Set();
+		Array.from(anchors).forEach((anchor) => {
+			const text = $(anchor).prop('innerText');
+			const match = text.match(regex);
+			if (match) {
+				urls.add($(anchor).attr('href'));
+			}
+		});
+
+		// Filter out urls that don't backreference to a remote id
+		const backrefs = await db.getObjectFields('remoteUrl:uid', Array.from(urls));
+		const urlAsIdExists = await db.isSortedSetMembers('usersRemote:lastCrawled', Array.from(urls));
+		Array.from(urls).map(async (url, index) => {
+			if (backrefs[url] || urlAsIdExists[index]) {
+				urlMap.set(url, backrefs[url] || url);
+			}
+		});
+		let slugs = await User.getUsersFields(Array.from(urlMap.values()), ['userslug']);
+		slugs = slugs.map(({ userslug }) => userslug);
+		Array.from(urlMap.keys()).forEach((url, idx) => {
+			urlMap.set(url, `/user/${encodeURIComponent(slugs[idx])}`);
+		});
+	}
+
+	return { splitContent, matches, urlMap };
 }
 
 Mentions.getMatches = async (content) => {
 	// Exported method only accepts markdown, also filters out dupes and matches to ensure slugs exist
-	let { matches } = getMatches(content, true);
+	let { matches } = await getMatches(content, true);
 	matches = await filterMatches(matches);
 	const ids = await Promise.all(matches.map(async m => User.getUidByUserslug(m.slice(1).toLowerCase())));
 	matches = matches.map((slug, idx) => (ids[idx] ? {
@@ -377,11 +410,15 @@ async function filterMatches(matches) {
 	return matches.filter((m, i) => exists[[i]]);
 }
 
-Mentions.parseRaw = async (content) => {
+Mentions.parseRaw = async (content, type = 'default') => {
+	if (type === 'plaintext') {
+		return content;
+	}
+
 	// Note: Mentions.clean explicitly can't be called here because I need the content unstripped
-	let { splitContent, matches } = getMatches(content);
+	let { splitContent, matches, urlMap } = await getMatches(content);
 
-	if (!matches.length) {
+	if (!matches.length && !urlMap.size) {
 		return content;
 	}
 
@@ -395,6 +432,7 @@ Mentions.parseRaw = async (content) => {
 		return atIndex !== 0 ? match.slice(atIndex) : match;
 	});
 
+	// Convert matches to anchor html
 	await Promise.all(matches.map(async (match) => {
 		const slug = slugify(match.slice(1));
 		match = removePunctuationSuffix(match);
@@ -402,7 +440,7 @@ Mentions.parseRaw = async (content) => {
 		const cid = await categories.getCidByHandle(slug);
 		const { groupExists, user, category } = await utils.promiseParallel({
 			groupExists: Groups.existsBySlug(slug),
-			user: User.getUserFields(uid, ['uid', 'username', 'fullname', 'url']),
+			user: User.getUserFields(uid, ['uid', 'username', 'userslug', 'fullname', 'url']),
 			category: categories.getCategoryFields(cid, ['slug']),
 		});
 
@@ -411,17 +449,20 @@ Mentions.parseRaw = async (content) => {
 
 			switch (true) {
 				case !!uid: {
-					url = utils.isNumber(user.uid) ? `${nconf.get('url')}/user/${slug}` : (user.url || user.uid);
+					url = `/user/${encodeURIComponent(user.userslug)}`;
+					if (type.startsWith('activitypub') && !utils.isNumber(uid)) {
+						url = user.url || user.uid;
+					}
 					break;
 				}
 
 				case !!cid: {
-					url = `${nconf.get('url')}/category/${category.slug}`;
+					url = `/category/${category.slug}`;
 					break;
 				}
 
 				case !!groupExists: {
-					url = `${nconf.get('url')}/groups/${slug}`;
+					url = `/groups/${slug}`;
 					break;
 				}
 			}
@@ -461,7 +502,20 @@ Mentions.parseRaw = async (content) => {
 		}
 	}));
 
-	return splitContent.join('');
+	const parsed = splitContent.join('');
+
+	// Modify existing anchors to local profile
+	const $ = cheerio.load(parsed);
+	const anchors = $('a');
+	Array.from(anchors).forEach((anchor) => {
+		const $anchor = $(anchor);
+		const url = $anchor.attr('href');
+		if (urlMap.has(url)) {
+			$anchor.attr('href', urlMap.get(url));
+		}
+	});
+
+	return $.html();
 };
 
 Mentions.clean = function (input, isMarkdown, stripBlockquote, stripCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.5.3",
+  "version": "4.6.1",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "repository": {
@@ -22,13 +22,15 @@
     "compatibility": "^4.0.0"
   },
   "dependencies": {
+    "cheerio": "^1.0.0-rc.12",
     "html-entities": "^2.3.2",
     "lodash": "4.17.21",
+    "sanitize-html": "^2.13.0",
     "validator": "^13.0.0"
   },
   "devDependencies": {
     "mocha": "10.4.0",
-    "eslint": "9.2.0",
+    "eslint": "9.3.0",
     "eslint-config-nodebb": "0.2.1",
     "eslint-plugin-import": "2.29.1"
   }

package/plugin.json

@@ -1,32 +1,32 @@
-{
-	"id": "nodebb-plugin-mentions",
-	"name": "Username Mentions",
-	"description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
-	"url": "https://github.com/julianlam/nodebb-plugin-mentions",
-	"library": "./library.js",
-	"upgrades": [
-        "upgrades/mentions_delete_mentions_set_zset.js"
-    ],
-	"hooks": [
-		{ "hook": "static:app.load", "method": "init" },
-		{ "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-		{ "hook": "filter:parse.post", "method": "parsePost" },
-		{ "hook": "filter:parse.raw", "method": "parseRaw" },
-		{ "hook": "action:post.save", "method": "notify" },
-		{ "hook": "action:post.edit", "method": "notify" },
-		{ "hook": "action:posts.purge", "method": "actionPostsPurge" },
-		{ "hook": "action:messaging.save", "method": "notifyMessage" },
-		{ "hook": "filter:notifications.addFilters", "method": "addFilters" },
-		{ "hook": "filter:user.notificationTypes", "method": "notificationTypes" },
-		{ "hook": "filter:users.addFields", "method": "addFields" }
-	],
-	"scripts": [
-		"static/autofill.js"
-	],
-	"modules": {
-		"../admin/plugins/mentions.js": "./static/admin.js"
-	},
-	"languages": "languages",
-	"defaultLang": "en_GB",
-	"templates": "templates"
+{
+	"id": "nodebb-plugin-mentions",
+	"name": "Username Mentions",
+	"description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
+	"url": "https://github.com/julianlam/nodebb-plugin-mentions",
+	"library": "./library.js",
+	"upgrades": [
+        "upgrades/mentions_delete_mentions_set_zset.js"
+    ],
+	"hooks": [
+		{ "hook": "static:app.load", "method": "init" },
+		{ "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
+		{ "hook": "filter:parse.post", "method": "parsePost" },
+		{ "hook": "filter:parse.raw", "method": "parseRaw" },
+		{ "hook": "action:post.save", "method": "notify" },
+		{ "hook": "action:post.edit", "method": "notify" },
+		{ "hook": "action:posts.purge", "method": "actionPostsPurge" },
+		{ "hook": "action:messaging.save", "method": "notifyMessage" },
+		{ "hook": "filter:notifications.addFilters", "method": "addFilters" },
+		{ "hook": "filter:user.notificationTypes", "method": "notificationTypes" },
+		{ "hook": "filter:users.addFields", "method": "addFields" }
+	],
+	"scripts": [
+		"static/autofill.js"
+	],
+	"modules": {
+		"../admin/plugins/mentions.js": "./static/admin.js"
+	},
+	"languages": "languages",
+	"defaultLang": "en_GB",
+	"templates": "templates"
 }

package/static/.eslintrc

@@ -1,3 +1,3 @@
-{
-	"extends": "nodebb/public"
-}
+{
+	"extends": "nodebb/public"
+}