nodebb-plugin-mentions 4.8.8 → 4.8.10

package/languages/en_GB/mentions.json

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

package/languages/en_GB/notifications.json

@@ -1,7 +1,7 @@
 {
 	"mentions": "Mentions",
-	"user-mentioned-you-in": "<strong>%1</strong> mentioned you<br/><strong>%2</strong>",
+	"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><br/><strong>%3</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>",
 	"notificationType-mention": "When someone mentions you"
 }

package/library.js

@@ -26,6 +26,7 @@ const slugify = require.main.require('./src/slugify');
 const batch = require.main.require('./src/batch');
 const utils = require.main.require('./src/utils');
 const SocketPlugins = require.main.require('./src/socket.io/plugins');
+const translator = require.main.require('./src/translator');
 
 const utility = require('./lib/utility');
 
@@ -136,7 +137,6 @@ Mentions.notify = async function ({ post }) {
 	]);
 	const { displayname } = userData;
 	const title = entitiesDecode(topic.title);
-	const titleEscaped = title.replace(/%/g, '%').replace(/,/g, ',');
 
 	let uids = uidsToNotify.filter(
 		uid => uid !== postOwner && !topicFollowers.includes(uid)
@@ -162,7 +162,8 @@ Mentions.notify = async function ({ post }) {
 
 	const filteredUids = await filterUidsAlreadyMentioned(uids, post.pid);
 	if (filteredUids.length) {
-		await sendNotificationToUids(post, filteredUids, 'user', `[[notifications:user-mentioned-you-in, ${displayname}, ${titleEscaped}]]`);
+		const notifText = translator.compile('notifications:user-mentioned-you-in', displayname, title);
+		await sendNotificationToUids(post, filteredUids, 'user', notifText);
 		await db.setAdd(`mentions:pid:${post.pid}:uids`, filteredUids);
 	}
 
@@ -172,7 +173,8 @@ Mentions.notify = async function ({ post }) {
 			const groupName = groupsToNotify[i].name;
 			const groupMentionSent = await db.isSetMember(`mentions:pid:${post.pid}:groups`, groupName);
 			if (!groupMentionSent && memberUids.length) {
-				await sendNotificationToUids(post, memberUids, groupName, `[[notifications:user-mentioned-group-in, ${displayname} , ${groupName}, ${titleEscaped}]]`);
+				const notifText = translator.compile('notifications:user-mentioned-group-in', displayname, groupName, title);
+				await sendNotificationToUids(post, memberUids, groupName, notifText);
 				await db.setAdd(`mentions:pid:${post.pid}:groups`, groupName);
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.8.8",
+  "version": "4.8.10",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "repository": {