@nodebb/nodebb-plugin-reactions 2.2.8 → 2.2.10

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

@@ -336,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),
@@ -375,9 +375,10 @@ 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',
@@ -387,6 +388,7 @@ SocketPlugins.reactions = {
 					`:${data.reaction}:`,
 					topicData.title
 				),
+				bodyLong: parsedPostData.content,
 				nid: `uid:${socket.uid}:pid:${data.pid}:reaction:${data.reaction}`,
 				pid: data.pid,
 				tid: data.tid,
@@ -452,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),
 		]);
@@ -487,9 +489,10 @@ 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);
@@ -503,6 +506,7 @@ SocketPlugins.reactions = {
 					icon,
 					roomName
 				),
+				bodyLong: parsedMessage,
 				roomIcon: icon,
 				nid: `uid:${socket.uid}:mid:${data.mid}:reaction:${data.reaction}`,
 				mid: data.mid,
@@ -556,7 +560,7 @@ SocketPlugins.reactions = {
 		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
-		let set = '';
+		let set;
 		if (data.type === 'post') {
 			if (!await privileges.posts.can('topics:read', data.pid, socket.uid)) {
 				throw new Error('[[error:not-allowed]]');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "nbbpm": {
     "compatibility": "^3.6.0 || ^4.0.0"
   },
@@ -38,8 +38,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "eslint": "9.28.0",
-    "eslint-config-nodebb": "1.1.7"
+    "eslint": "10.0.2",
+    "eslint-config-nodebb": "^2.0.0"
   },
   "scripts": {
     "lint": "eslint ."

package/public/admin.js

@@ -3,7 +3,7 @@
 define('admin/plugins/reactions', [
 	'settings', 'alerts', 'hooks', 'emoji-dialog', 'emoji',
 ], function (Settings, alerts, hooks, emojiDialog, emoji) {
-	var ACP = {};
+	const ACP = {};
 	ACP.init = function () {
 		emoji.init(function () {
 			Settings.load('reactions', $('.reactions-settings'), onSettingsLoaded);

package/public/client.js

@@ -18,7 +18,7 @@ $(document).ready(function () {
 			hooks.on('action:chat.loaded', function (container) {
 				if (ajaxify.data.template.chats && ajaxify.data.roomId) {
 					setupMessageReactions(container);
-				} else if (container.hasClass('chat-modal')) {
+				} else if (container.hasClass('chat-modal') || container.attr('component') === 'chat/widget') {
 					setupMessageReactions(container);
 				}
 			});
@@ -45,11 +45,11 @@ $(document).ready(function () {
 		setupPostReactionSockets();
 
 		$('[component="topic"]').on('click', '[component="post/reaction"]', function () {
-			var reactionElement = $(this);
-			var pid = reactionElement.attr('data-pid');
-			var reaction = reactionElement.attr('data-reaction');
-			var reacted = reactionElement.hasClass('reacted');
-			var event = 'plugins.reactions.' + (reacted ? 'removePostReaction' : 'addPostReaction');
+			const reactionElement = $(this);
+			const pid = reactionElement.attr('data-pid');
+			const reaction = reactionElement.attr('data-reaction');
+			const reacted = reactionElement.hasClass('reacted');
+			const event = 'plugins.reactions.' + (reacted ? 'removePostReaction' : 'addPostReaction');
 			socket.emit(event, {
 				pid: pid,
 				reaction: reaction,
@@ -61,8 +61,8 @@ $(document).ready(function () {
 		});
 
 		$('[component="topic"]').on('click', '[component="post/reaction/add"]', function () {
-			var reactionAddEl = $(this);
-			var pid = reactionAddEl.attr('data-pid');
+			const reactionAddEl = $(this);
+			const pid = reactionAddEl.attr('data-pid');
 			require(['emoji-dialog'], function (emojiDialog) {
 				emojiDialog.toggle(reactionAddEl[0], function (_, name, dialog) {
 					emojiDialog.dialogActions.close(dialog);
@@ -88,11 +88,11 @@ $(document).ready(function () {
 
 		const messageContent = container.find('[component="chat/message/content"]');
 		messageContent.on('click', '[component="message/reaction"]', function () {
-			var reactionElement = $(this);
-			var mid = reactionElement.attr('data-mid');
-			var reaction = reactionElement.attr('data-reaction');
-			var reacted = reactionElement.hasClass('reacted');
-			var event = 'plugins.reactions.' + (reacted ? 'removeMessageReaction' : 'addMessageReaction');
+			const reactionElement = $(this);
+			const mid = reactionElement.attr('data-mid');
+			const reaction = reactionElement.attr('data-reaction');
+			const reacted = reactionElement.hasClass('reacted');
+			const event = 'plugins.reactions.' + (reacted ? 'removeMessageReaction' : 'addMessageReaction');
 			socket.emit(event, {
 				mid: mid,
 				reaction: reaction,
@@ -147,10 +147,10 @@ $(document).ready(function () {
 	}
 
 	function updatePostReactionCount(data, type) {
-		var maxReactionsReached = parseInt(data.totalReactions, 10) > config.maximumReactions;
+		const maxReactionsReached = parseInt(data.totalReactions, 10) > config.maximumReactions;
 		$('[component="post/reaction/add"][data-pid="' + data.pid + '"]').toggleClass('max-reactions', maxReactionsReached);
 
-		var reactionEl = $(`[component="post/reaction"][data-pid="${data.pid}"][data-reaction="${data.reaction}"]`);
+		const reactionEl = $(`[component="post/reaction"][data-pid="${data.pid}"][data-reaction="${data.reaction}"]`);
 
 		if (parseInt(data.reactionCount, 10) === 0) {
 			reactionEl.tooltip('dispose');
@@ -179,10 +179,10 @@ $(document).ready(function () {
 	}
 
 	function updateMessageReactionCount(data, type) {
-		var maxReactionsReached = parseInt(data.totalReactions, 10) > config.maximumReactionsPerMessage;
+		const maxReactionsReached = parseInt(data.totalReactions, 10) > config.maximumReactionsPerMessage;
 		$('[component="message/reaction/add"][data-mid="' + data.mid + '"]').toggleClass('max-reactions', maxReactionsReached);
 
-		var reactionEl = $(`[component="message/reaction"][data-mid="${data.mid}"][data-reaction="${data.reaction}"]`);
+		const reactionEl = $(`[component="message/reaction"][data-mid="${data.mid}"][data-reaction="${data.reaction}"]`);
 
 		if (parseInt(data.reactionCount, 10) === 0) {
 			reactionEl.tooltip('dispose');