nodebb-plugin-mentions 4.8.7 → 4.8.9

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 <br/><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 <br/><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);
 			}
 		}
@@ -198,11 +200,12 @@ Mentions.notifyMessage = async (hookData) => {
 	}
 	const io = require.main.require('./src/socket.io');
 
-	const [onlineUidsInRoom, fromUser, isUserInRoom, notifSettings, checks] = await Promise.all([
+	const [onlineUidsInRoom, fromUser, isUserInRoom, notifSettings, parsedMessage, checks] = await Promise.all([
 		io.getUidsInRoom(`chat_room_${roomId}`),
 		User.getUserFields(message.fromuid, ['username']),
 		Messaging.isUsersInRoom(matchedUids, roomId),
 		Messaging.getUidsNotificationSetting(matchedUids, roomId),
+		Messaging.parse(message.content, message.fromuid, 0, message.roomId, false),
 		Promise.all(matchedUids.map(
 			uid => !roomData.groups.length || Groups.isMemberOfAny(uid, roomData.groups)
 		)),
@@ -222,9 +225,9 @@ Mentions.notifyMessage = async (hookData) => {
 	const notifObj = await Notifications.create({
 		type: 'mention',
 		bodyShort: `[[notifications:user-mentioned-you-in-room, ${fromUser.displayname}, ${icon}, ${roomName}]]`,
-		bodyLong: message.content,
-		nid: `chat_${roomId}_${message.fromuid}_${message.messageId}`,
-		mid: message.messageId,
+		bodyLong: parsedMessage,
+		nid: `chat_${roomId}_${message.fromuid}_${message.mid}`,
+		mid: message.mid,
 		from: message.fromuid,
 		path: `/chats/${roomId}`,
 		importance: 6,
@@ -314,7 +317,10 @@ async function sendNotificationToUids(postData, uids, nidType, notificationText)
 }
 
 async function createNotification(postData, nidType, notificationText) {
-	const title = await Topics.getTopicField(postData.tid, 'title');
+	// postData.sourceContent or postData.content is not parsed yet
+	// this is triggered from action:post.save or action:post.edit
+	await posts.parsePost(postData);
+
 	return await Notifications.create({
 		type: 'mention',
 		bodyShort: notificationText,
@@ -324,7 +330,6 @@ async function createNotification(postData, nidType, notificationText) {
 		tid: postData.tid,
 		from: postData.uid,
 		path: `/post/${encodeURIComponent(postData.pid)}`,
-		topicTitle: title ? utils.decodeHTMLEntities(title) : title,
 		importance: 6,
 	});
 }

package/package.json

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