@nodebb/nodebb-plugin-reactions 2.1.11 → 2.1.13

package/languages/en-GB/reactions.json

@@ -19,5 +19,7 @@
   "settings.reaction-reputations.reaction": "Reaction",
   "settings.reaction-reputations.reputation": "Reputation",
   "settings.reaction-reputations.remove": "Delete",
-  "settings.reaction-reputations.edit": "Edit"
+  "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>"
 }

package/library.js

@@ -3,21 +3,36 @@
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const posts = require.main.require('./src/posts');
+const topics = require.main.require('./src/topics');
 const messaging = require.main.require('./src/messaging');
 const privileges = require.main.require('./src/privileges');
 const db = require.main.require('./src/database');
+const translator = require.main.require('./src/translator');
+const notifications = require.main.require('./src/notifications');
 const routesHelpers = require.main.require('./src/routes/helpers');
 const websockets = require.main.require('./src/socket.io/index');
 const SocketPlugins = require.main.require('./src/socket.io/plugins');
 
 const emojiParser = require.main.require('nodebb-plugin-emoji/build/lib/parse.js');
-const emojiTable = require.main.require('nodebb-plugin-emoji/build/emoji/table.json');
-const emojiAliases = require.main.require('nodebb-plugin-emoji/build/emoji/aliases.json');
+
+let emojiTable = null;
+let emojiAliases = null;
 
 const DEFAULT_MAX_EMOTES = 4;
 
+function nameToEmoji(name) {
+	if (!emojiTable) {
+		emojiTable = require.main.require('nodebb-plugin-emoji/build/emoji/table.json');
+	}
+	return emojiTable[name];
+}
+
 function parse(name) {
-	return emojiParser.buildEmoji(emojiTable[name] || emojiTable[emojiAliases[name]], '');
+	if (!emojiAliases) {
+		emojiAliases = require.main.require('nodebb-plugin-emoji/build/emoji/aliases.json');
+	}
+
+	return emojiParser.buildEmoji(nameToEmoji(name) || emojiTable[emojiAliases[name]], '');
 }
 
 const ReactionsPlugin = module.exports;
@@ -295,7 +310,7 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:not-logged-in]]');
 		}
 
-		if (!emojiTable[data.reaction]) {
+		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
 
@@ -304,13 +319,14 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:post-reactions-disabled]]');
 		}
 		const maximumReactions = settings.maximumReactions || DEFAULT_MAX_EMOTES;
-		const [tid, totalReactions, emojiIsAlreadyExist, alreadyReacted, reactionReputation] = await Promise.all([
-			posts.getPostField(data.pid, 'tid'),
+		const [postData, totalReactions, emojiIsAlreadyExist, alreadyReacted, reactionReputation] = await Promise.all([
+			posts.getPostFields(data.pid, ['tid', 'uid']),
 			db.setCount(`pid:${data.pid}:reactions`),
 			db.isSetMember(`pid:${data.pid}:reactions`, data.reaction),
 			db.isSetMember(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid),
 			getReactionReputation(data.reaction),
 		]);
+		const { tid } = postData;
 		if (!tid) {
 			throw new Error('[[error:no-post]]');
 		}
@@ -342,6 +358,28 @@ SocketPlugins.reactions = {
 			await giveOwnerReactionReputation(reactionReputation, data.pid);
 		}
 
+		if (postData.uid && postData.uid !== socket.uid) {
+			const [userData, topicData] = await Promise.all([
+				user.getUserFields(socket.uid, ['username', 'fullname']),
+				topics.getTopicFields(data.tid, ['title']),
+			]);
+			const notifObj = await notifications.create({
+				bodyShort: translator.compile(
+					'reactions:notification.user-has-reacted-with-to-your-post-in-topic',
+					userData.displayname,
+					`:${data.reaction}:`,
+					topicData.title
+				),
+				nid: `uid:${socket.uid}:pid:${data.pid}:reaction:${data.reaction}`,
+				pid: data.pid,
+				tid: data.tid,
+				from: socket.uid,
+				path: `/post/${data.pid}`,
+			});
+
+			await notifications.push(notifObj, [postData.uid]);
+		}
+
 		await sendPostEvent(data, 'event:reactions.addPostReaction');
 	},
 	removePostReaction: async function (socket, data) {
@@ -349,7 +387,7 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:not-logged-in]]');
 		}
 
-		if (!emojiTable[data.reaction]) {
+		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
 
@@ -387,7 +425,7 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:not-logged-in]]');
 		}
 
-		if (!emojiTable[data.reaction]) {
+		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
 
@@ -396,12 +434,12 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:post-reactions-disabled]]');
 		}
 		const maximumReactionsPerMessage = settings.maximumReactionsPerMessage || DEFAULT_MAX_EMOTES;
-		const [roomId, totalReactions, emojiIsAlreadyExist] = await Promise.all([
-			messaging.getMessageField(data.mid, 'roomId'),
+		const [msgData, totalReactions, emojiIsAlreadyExist] = await Promise.all([
+			messaging.getMessageFields(data.mid, ['roomId', 'fromuid']),
 			db.setCount(`mid:${data.mid}:reactions`),
 			db.isSetMember(`mid:${data.mid}:reactions`, data.reaction),
 		]);
-
+		const { roomId } = msgData;
 		if (!roomId) {
 			throw new Error('[[error:no-message]]');
 		}
@@ -431,6 +469,33 @@ SocketPlugins.reactions = {
 			db.setAdd(`mid:${data.mid}:reaction:${data.reaction}`, socket.uid),
 		]);
 
+		if (msgData.fromuid && msgData.fromuid !== socket.uid) {
+			const [userData, roomData] = await Promise.all([
+				user.getUserFields(socket.uid, ['username', 'userslug', 'fullname']),
+				messaging.getRoomData(roomId),
+			]);
+			const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`;
+			const icon = messaging.getRoomIcon(roomData);
+
+			const notifObj = await notifications.create({
+				bodyShort: translator.compile(
+					'reactions:notification.user-has-reacted-with-to-your-message-in-room',
+					userData.displayname,
+					`:${data.reaction}:`,
+					icon,
+					roomName
+				),
+				roomIcon: icon,
+				nid: `uid:${socket.uid}:mid:${data.mid}:reaction:${data.reaction}`,
+				mid: data.mid,
+				roomId: roomId,
+				from: socket.uid,
+				path: `/chats/${roomId}`,
+			});
+
+			await notifications.push(notifObj, [msgData.fromuid]);
+		}
+
 		await sendMessageEvent(data, 'event:reactions.addMessageReaction');
 	},
 	removeMessageReaction: async function (socket, data) {
@@ -438,7 +503,7 @@ SocketPlugins.reactions = {
 			throw new Error('[[error:not-logged-in]]');
 		}
 
-		if (!emojiTable[data.reaction]) {
+		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
 
@@ -470,7 +535,7 @@ SocketPlugins.reactions = {
 		if (!socket.uid) {
 			throw new Error('[[error:not-logged-in]]');
 		}
-		if (!emojiTable[data.reaction]) {
+		if (!nameToEmoji(data.reaction)) {
 			throw new Error('[[reactions:error.invalid-reaction]]');
 		}
 		let set = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.1.11",
+  "version": "2.1.13",
   "nbbpm": {
     "compatibility": "^3.3.0"
   },

package/lib/.eslintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "nodebb/public"
-}