nodebb-plugin-mentions 4.2.0 → 4.3.1

package/library.js

@@ -16,6 +16,7 @@ const Topics = require.main.require('./src/topics');
 const posts = require.main.require('./src/posts');
 const User = require.main.require('./src/user');
 const Groups = require.main.require('./src/groups');
+const Messaging = require.main.require('./src/messaging');
 const Notifications = require.main.require('./src/notifications');
 const Privileges = require.main.require('./src/privileges');
 const plugins = require.main.require('./src/plugins');
@@ -152,6 +153,43 @@ Mentions.notify = async function (data) {
 	}
 };
 
+Mentions.notifyMessage = async (hookData) => {
+	const cleanedContent = Mentions.clean(hookData.data.content, false, true, true);
+	let matches = cleanedContent.match(regex);
+	if (!Array.isArray(matches) || !matches.length) {
+		return;
+	}
+	const { message } = hookData;
+	const { roomId } = message;
+	matches = _.uniq(matches.map(slugify));
+	const [matchedUids, roomData] = await Promise.all([
+		getUidsToNotify(matches),
+		Messaging.getRoomData(roomId),
+	]);
+	if (!roomData || !matchedUids.length) {
+		return;
+	}
+	const checks = await Promise.all(
+		matchedUids.map(uid => !roomData.groups.length || Groups.isMemberOfAny(uid, roomData.groups))
+	);
+	const uidsToNotify = matchedUids.filter((uid, idx) => checks[idx]);
+	if (!uidsToNotify.length) {
+		return;
+	}
+	const roomName = validator.escape(String(roomData.roomName || `Room ${roomId}`));
+	const notifObj = await Notifications.create({
+		type: 'mention',
+		bodyShort: `[[notifications:user_mentioned_you_in, ${message.fromUser.displayname}, ${roomName}]]`,
+		bodyLong: message.content,
+		nid: `chat:room:${roomId}:mid:${message.messageId}:uid:${message.fromuid}`,
+		mid: message.messageId,
+		from: message.fromuid,
+		path: `/chats/${roomId}`,
+		importance: 6,
+	});
+	await Notifications.push(notifObj, uidsToNotify);
+};
+
 async function getUidsToNotify(matches) {
 	const uids = await db.sortedSetScores('userslug:uid', matches);
 	return _.uniq(uids.filter(Boolean).map(String));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.2.0",
+  "version": "4.3.1",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "url": "https://github.com/julianlam/nodebb-plugin-mentions/issues"
   },
   "nbbpm": {
-    "compatibility": "^3.0.0"
+    "compatibility": "^3.3.0"
   },
   "dependencies": {
     "html-entities": "^2.3.2",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "mocha": "10.2.0",
-    "eslint": "8.42.0",
+    "eslint": "8.45.0",
     "eslint-config-nodebb": "0.2.1",
     "eslint-plugin-import": "2.27.5"
   }

package/plugin.json

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

package/templates/admin/plugins/mentions.tpl

@@ -4,7 +4,7 @@
 	<div class="row m-0">
 		<div id="spy-container" class="col-12 col-md-8 px-0 mb-4" tabindex="0">
 			<form role="form" class="mentions-settings">
-				<div class="mb-4">
+				<div id="general" class="mb-4">
 					<h5 class="fw-bold tracking-tight settings-header">General</h5>
 
 					<div class="mb-3 form-check">
@@ -38,7 +38,7 @@
 
 				</div>
 
-				<div class="mb-4">
+				<div id="restrictions" class="mb-4">
 					<h5 class="fw-bold tracking-tight settings-header">Restrictions</h5>
 
 					<div class="mb-3">