@nodebb/nodebb-plugin-reactions 2.2.9 → 3.0.0

package/README.md

@@ -8,6 +8,11 @@ Install via one-click activation in the Admin Control Panel or run the following
 
     npm i @nodebb/nodebb-plugin-reactions
 
+# Emojis in Topic Titles and Notifications
+
+In the admin settings of nodebb-plugin-emoji, turn on "Parse emojis in topic titles" to see emojis as images in topic titles and notifications.
+![](https://private-user-images.githubusercontent.com/2583394/586759879-5b4e6cc9-3568-48fa-a556-83bdb24bd8f2.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Nzc3NDAwNzAsIm5iZiI6MTc3NzczOTc3MCwicGF0aCI6Ii8yNTgzMzk0LzU4Njc1OTg3OS01YjRlNmNjOS0zNTY4LTQ4ZmEtYTU1Ni04M2JkYjI0YmQ4ZjIucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI2MDUwMiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNjA1MDJUMTYzNjEwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmJkY2ZhZDE0N2ZiMzRjODMyOGM2ODg1NTlkNWU1NDg5ZmEyNGI1MzlkYjg4ODZlNDFjZWUzNmU0Zjk0ZDUwMCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmcmVzcG9uc2UtY29udGVudC10eXBlPWltYWdlJTJGcG5nIn0.PoBRMpH7ByDbA-uXoyHAoHFr3eiiN4IYy-Wvqy3p2pM)
+
 # Screenshots
 
 ## Reactions:

package/library.js

@@ -375,18 +375,18 @@ SocketPlugins.reactions = {
 		}
 
 		if (postData.uid && postData.uid !== socket.uid) {
-			const [userData, topicData, parsedPostData] = await Promise.all([
-				user.getUserFields(socket.uid, ['username', 'fullname']),
-				topics.getTopicFields(data.tid, ['title']),
+			const [displayname, topicTitle, parsedPostData] = await Promise.all([
+				user.getNotificationDisplayname(socket.uid),
+				topics.getNotificationTitle(data.tid),
 				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,
+					displayname,
 					`:${data.reaction}:`,
-					topicData.title
+					topicTitle
 				),
 				bodyLong: parsedPostData.content,
 				nid: `uid:${socket.uid}:pid:${data.pid}:reaction:${data.reaction}`,
@@ -560,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,8 +1,8 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.2.9",
+  "version": "3.0.0",
   "nbbpm": {
-    "compatibility": "^3.6.0 || ^4.0.0"
+    "compatibility": "^4.14.0"
   },
   "description": "Reactions plugin for NodeBB",
   "main": "library.js",
@@ -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');

package/templates/admin/plugins/reactions/partials/sorted-list/emoji-form.tpl

@@ -1,10 +1,10 @@
 <form>
-    <div class="form-group">
-        <label for="reaction">[[reactions:settings.reaction-reputations.reaction]]</label>
+    <div class="mb-3">
+        <label class="form-label" for="reaction">[[reactions:settings.reaction-reputations.reaction]]</label>
         <input type="text" id="reaction" name="reaction" class="form-control" placeholder="[[reactions:settings.reaction-reputations.reaction]]" />
     </div>
-    <div class="form-group">
-        <label for="reputation">[[reactions:settings.reaction-reputations.reputation]]</label>
+    <div class="mb-3">
+        <label class="form-label" for="reputation">[[reactions:settings.reaction-reputations.reputation]]</label>
         <input type="number" id="reputation" name="reputation" class="form-control" placeholder="[[reactions:settings.reaction-reputations.reputation]]" />
     </div>
 </form>

package/templates/admin/plugins/reactions/partials/sorted-list/emoji-item.tpl

@@ -1,12 +1,12 @@
 <li data-type="item" class="list-group-item">
-    <div class="row">
-        <div class="col-xs-9">
+    <div class="row align-items-center">
+        <div class="col-9">
             <span data-reaction="{reaction}"></span><strong> {reaction}</strong><br />
-            <small>[[reactions:settings.reaction-reputations.reaction]]: {reputation}</small>
+            <small>[[reactions:settings.reaction-reputations.reputation]]: {reputation}</small>
         </div>
-        <div class="col-xs-3 text-right">
-            <button type="button" data-type="edit" class="btn btn-info">[[reactions:settings.reaction-reputations.edit]]</button>
-            <button type="button" data-type="remove" class="btn btn-danger">[[reactions:settings.reaction-reputations.remove]]</button>
+        <div class="col-3 d-flex gap-2">
+            <button type="button" data-type="edit" class="btn btn-sm btn-info">[[reactions:settings.reaction-reputations.edit]]</button>
+            <button type="button" data-type="remove" class="btn btn-sm btn-danger">[[reactions:settings.reaction-reputations.remove]]</button>
         </div>
     </div>
 </li>

package/templates/partials/chats/reaction.tpl

@@ -1,4 +1,4 @@
 <span class="reaction mb-2 {{{ if ./reacted }}}reacted{{{ end }}}" component="message/reaction" data-mid="{./mid}" data-reaction="{./reaction}">
-	{./reactionImage}
+	{{./reactionImage}}
 	<small class="reaction-emoji-count" data-count="{./reactionCount}"></small>
 </span>

package/templates/partials/topic/reaction.tpl

@@ -1,4 +1,4 @@
 <span class="reaction {{{ if ./reacted }}}reacted{{{ end }}}" component="post/reaction" data-pid="{./pid}" data-reaction="{./reaction}">
-	{./reactionImage}
+	{{./reactionImage}}
 	<small class="reaction-emoji-count" data-count="{./reactionCount}"></small>
 </span>