nodebb-plugin-mentions 4.3.3 → 4.3.5

package/languages/en_GB/notifications.json

@@ -1,6 +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"
 }

package/library.js

@@ -171,8 +171,9 @@ Mentions.notifyMessage = async (hookData) => {
 	}
 	const io = require.main.require('./src/socket.io');
 
-	const [onlineUidsInRoom, isUserInRoom, notifSettings, checks] = await Promise.all([
+	const [onlineUidsInRoom, fromUser, isUserInRoom, notifSettings, checks] = await Promise.all([
 		io.getUidsInRoom(`chat_room_${roomId}`),
+		User.getUserFields(message.fromuid, ['username']),
 		Messaging.isUsersInRoom(matchedUids, roomId),
 		Messaging.getUidsNotificationSetting(matchedUids, roomId),
 		Promise.all(matchedUids.map(
@@ -190,11 +191,12 @@ Mentions.notifyMessage = async (hookData) => {
 		return;
 	}
 	const roomName = validator.escape(String(roomData.roomName || `Room ${roomId}`));
+	const icon = Messaging.getRoomIcon(roomData);
 	const notifObj = await Notifications.create({
 		type: 'mention',
-		bodyShort: `[[notifications:user_mentioned_you_in, ${message.fromUser.displayname}, ${roomName}]]`,
+		bodyShort: `[[notifications:user_mentioned_you_in_room, ${fromUser.displayname}, ${icon}, ${roomName}]]`,
 		bodyLong: message.content,
-		nid: `chat:room:${roomId}:mid:${message.messageId}:uid:${message.fromuid}`,
+		nid: `chat_${roomId}_${message.fromuid}_${message.messageId}`,
 		mid: message.messageId,
 		from: message.fromuid,
 		path: `/chats/${roomId}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.3.3",
+  "version": "4.3.5",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "scripts": {
@@ -32,8 +32,8 @@
   },
   "devDependencies": {
     "mocha": "10.2.0",
-    "eslint": "8.45.0",
+    "eslint": "8.47.0",
     "eslint-config-nodebb": "0.2.1",
-    "eslint-plugin-import": "2.27.5"
+    "eslint-plugin-import": "2.28.1"
   }
 }