@nodebb/nodebb-plugin-reactions 2.2.7 → 2.2.9

package/README.md

@@ -1,6 +1,8 @@
 # nodebb-plugin-reactions
 Reactions plugin for NodeBB
 
+This plugin requires nodebb-plugin-emoji to be active.
+
 # Installation
 Install via one-click activation in the Admin Control Panel or run the following command:
 
@@ -12,4 +14,4 @@ Install via one-click activation in the Admin Control Panel or run the following
 ![demo](./assets/demo.png)
 
 ## ACP:
-![acp](./assets/acp.png)
+![acp](./assets/acp.png)

package/languages/en-GB/notifications.json

@@ -0,0 +1,3 @@
+{
+	"notificationType-reaction": "When someone reacts to your posts & chats"
+}

package/languages/en-GB/reactions.json

@@ -21,5 +21,5 @@
   "settings.reaction-reputations.remove": "Delete",
   "settings.reaction-reputations.edit": "Edit",
   "notification.user-has-reacted-with-to-your-post-in-topic": "<strong>%1</strong> has reacted with %2 to your post in <strong>%3</strong>",
-  "notification.user-has-reacted-with-to-your-message-in-room": "<strong>%1</strong> has reacted with %2 to your message in <strong class=\"text-nowrap\"><i class=\"fa %3\"></i>%4</strong>"
+  "notification.user-has-reacted-with-to-your-message-in-room": "<strong>%1</strong> has reacted with %2 to your message in <strong class=\"text-nowrap\"><i class=\"fa %3\"></i> %4</strong>"
 }

package/library.js

@@ -81,6 +81,16 @@ ReactionsPlugin.filterSettingsGet = async function (hookData) {
 	return hookData;
 };
 
+ReactionsPlugin.addNotificationFilters = async (data) => {
+	data.regularFilters.push({ name: '[[reactions:reactions]]', filter: 'reaction' });
+	return data;
+};
+
+ReactionsPlugin.notificationTypes = async (data) => {
+	data.types.push('notificationType_reaction');
+	return data;
+};
+
 ReactionsPlugin.getPostReactions = async function (data) {
 	if (data.uid === 0) {
 		return data;
@@ -326,7 +336,7 @@ SocketPlugins.reactions = {
 		}
 		const maximumReactions = settings.maximumReactions || DEFAULT_MAX_EMOTES;
 		const [postData, totalReactions, emojiIsAlreadyExist, alreadyReacted, reactionReputation] = await Promise.all([
-			posts.getPostFields(data.pid, ['tid', 'uid']),
+			posts.getPostFields(data.pid, ['pid', 'tid', 'uid', 'content', 'sourceContent']),
 			db.setCount(`pid:${data.pid}:reactions`),
 			db.isSetMember(`pid:${data.pid}:reactions`, data.reaction),
 			db.isSetMember(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid),
@@ -365,17 +375,20 @@ SocketPlugins.reactions = {
 		}
 
 		if (postData.uid && postData.uid !== socket.uid) {
-			const [userData, topicData] = await Promise.all([
+			const [userData, topicData, parsedPostData] = await Promise.all([
 				user.getUserFields(socket.uid, ['username', 'fullname']),
 				topics.getTopicFields(data.tid, ['title']),
+				posts.parsePost(postData),
 			]);
 			const notifObj = await notifications.create({
+				type: 'reaction',
 				bodyShort: translator.compile(
 					'reactions:notification.user-has-reacted-with-to-your-post-in-topic',
 					userData.displayname,
 					`:${data.reaction}:`,
 					topicData.title
 				),
+				bodyLong: parsedPostData.content,
 				nid: `uid:${socket.uid}:pid:${data.pid}:reaction:${data.reaction}`,
 				pid: data.pid,
 				tid: data.tid,
@@ -441,7 +454,7 @@ SocketPlugins.reactions = {
 		}
 		const maximumReactionsPerMessage = settings.maximumReactionsPerMessage || DEFAULT_MAX_EMOTES;
 		const [msgData, totalReactions, emojiIsAlreadyExist] = await Promise.all([
-			messaging.getMessageFields(data.mid, ['roomId', 'fromuid']),
+			messaging.getMessageFields(data.mid, ['roomId', 'fromuid', 'content']),
 			db.setCount(`mid:${data.mid}:reactions`),
 			db.isSetMember(`mid:${data.mid}:reactions`, data.reaction),
 		]);
@@ -476,14 +489,16 @@ SocketPlugins.reactions = {
 		]);
 
 		if (msgData.fromuid && msgData.fromuid !== socket.uid) {
-			const [userData, roomData] = await Promise.all([
+			const [userData, roomData, parsedMessage] = await Promise.all([
 				user.getUserFields(socket.uid, ['username', 'userslug', 'fullname']),
 				messaging.getRoomData(roomId),
+				messaging.parse(msgData.content, socket.uid, msgData.fromuid, roomId, false),
 			]);
 			const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`;
 			const icon = messaging.getRoomIcon(roomData);
 
 			const notifObj = await notifications.create({
+				type: 'reaction',
 				bodyShort: translator.compile(
 					'reactions:notification.user-has-reacted-with-to-your-message-in-room',
 					userData.displayname,
@@ -491,6 +506,7 @@ SocketPlugins.reactions = {
 					icon,
 					roomName
 				),
+				bodyLong: parsedMessage,
 				roomIcon: icon,
 				nid: `uid:${socket.uid}:mid:${data.mid}:reaction:${data.reaction}`,
 				mid: data.mid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "nbbpm": {
     "compatibility": "^3.6.0 || ^4.0.0"
   },

package/plugin.json

@@ -16,29 +16,15 @@
         "../admin/plugins/reactions.js": "./public/admin.js"
     },
     "hooks": [
-        {
-            "hook": "static:app.load", "method": "init"
-        },
-        {
-            "hook": "filter:admin.header.build", "method": "addAdminNavigation"
-        },
-        {
-            "hook": "filter:config.get", "method": "getPluginConfig"
-        },
-        {
-            "hook": "filter:settings.get", "method": "filterSettingsGet"
-        },
-        {
-            "hook": "filter:post.getPosts", "method": "getPostReactions"
-        },
-        {
-            "hook": "filter:messaging.getMessages", "method": "getMessageReactions"
-        },
-        {
-            "hook": "filter:post.get", "method": "onReply"
-        },
-        {
-            "hook": "action:posts.purge", "method": "deleteReactions"
-        }
+        { "hook": "static:app.load", "method": "init" },
+        { "hook": "filter:admin.header.build", "method": "addAdminNavigation"},
+        { "hook": "filter:config.get", "method": "getPluginConfig" },
+        { "hook": "filter:settings.get", "method": "filterSettingsGet" },
+        { "hook": "filter:post.getPosts", "method": "getPostReactions" },
+        { "hook": "filter:messaging.getMessages", "method": "getMessageReactions" },
+        { "hook": "filter:post.get", "method": "onReply" },
+        { "hook": "action:posts.purge", "method": "deleteReactions" },
+        { "hook": "filter:notifications.addFilters", "method": "addNotificationFilters" },
+        { "hook": "filter:user.notificationTypes", "method": "notificationTypes" }
     ]
 }