@nodebb/nodebb-plugin-reactions 2.0.0 → 2.0.1

package/README.md

@@ -1,2 +1,12 @@
 # nodebb-plugin-reactions
 Reactions plugin for NodeBB
+
+# Screenshots
+
+## Reactions:
+![CleanShot 2023-05-11 at 08 53 48@2x](https://github.com/ShlomoCode/nodebb-plugin-reactions/assets/78599753/613cb49e-994a-4869-a721-c1eeb00959ff)
+
+
+## ACP:
+![CleanShot 2023-05-11 at 04 09 11@2x](https://github.com/ShlomoCode/nodebb-plugin-reactions/assets/78599753/f4a4e5cb-f060-4415-a337-222a157a6e59)
+

package/languages/en-GB/reactions.json

@@ -3,8 +3,11 @@
   "add-reaction": "Add reaction",
   "error.invalid-reaction": "Invalid reaction",
   "error.maximum-reached": "Maximum reactions reached",
+  "error.maximum-per-user-per-post-reached": "Maximum reactions per user per post reached",
   "settings.title": "Reactions plugin settings",
-  "settings.max-reactions-per-post": "Maximum unique reactions per post",
+  "settings.max-reactions-per-post": "Maximum unique reactions per post (0 for unlimited, default: 4)",
+  "settings.max-reactions-per-user-per-post": "Maximum reactions per user per post (0 for unlimited)",
+  "settings.max-reactions-per-user-per-post-help": "The limit is enforced only when adding a new reaction and not when joining an existing reaction.",
   "settings.reaction-reputations": "Reaction Reputations (Optional)",
   "settings.reaction-reputations-help": "You can assign a reputation to individual reactions. When a reaction is applied to a post, the owner of that post will get this reputation.",
   "settings.reaction-reputations.add": "Add Rule",

package/languages/he/reactions.json

@@ -3,8 +3,11 @@
   "add-reaction": "הוסף תגובה",
   "error.invalid-reaction": "תגובה לא חוקית",
   "error.maximum-reached": "הגעת למספר התגובות המקסימלי לפוסט",
+  "error.maximum-per-user-per-post-reached": "הגעת למספר התגובות המקסימלי למשתמש לפוסט",
   "settings.title": "הגדרות תגובות",
-  "settings.max-reactions-per-post": "מספר התגובות המקסימלי לפוסט",
+  "settings.max-reactions-per-post": "מספר התגובות המקסימלי לפוסט (0 = ללא הגבלה, ברירת מחדל: 4)",
+  "settings.max-reactions-per-user-per-post": "מספר התגובות המקסימלי למשתמש לפוסט (0 = ללא הגבלה)",
+  "settings.max-reactions-per-user-per-post-help": ".ההגבלה נאכפת רק בהוספת תגובה חדשה ולא בהצטרפות לתגובה קיימת",
   "settings.reaction-reputations": "מוניטין תגובה (אופציונלי)",
   "settings.reaction-reputations-help": "אתה יכול להקצות מוניטין לתגובות מסוימות. כאשר התגובה נוספת לפוסט, בעל הפוסט יקבל את המוניטין שנקבע.",
   "settings.reaction-reputations.add": "הוסף כלל",

package/library.js

@@ -13,7 +13,7 @@ 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');
 
-const DEFAULT_MAX_EMOTES = 5;
+const DEFAULT_MAX_EMOTES = 4;
 
 function parse(name) {
 	return emojiParser.buildEmoji(emojiTable[name] || emojiTable[emojiAliases[name]], '');
@@ -71,7 +71,7 @@ ReactionsPlugin.getReactions = async function (data) {
 
 				if (reactionsList && reactionsList.length > 0) {
 					pidToReactionsMap.set(pid, reactionsList);
-					pidToIsMaxReactionsReachedMap.set(pid, reactionsCount >= maximumReactions);
+					pidToIsMaxReactionsReachedMap.set(pid, reactionsCount > maximumReactions);
 					reactionSets = reactionSets.concat(reactionsList.map(reaction => `pid:${pid}:reaction:${reaction}`));
 				}
 			} catch (e) {
@@ -205,16 +205,29 @@ SocketPlugins.reactions = {
 
 		const settings = await meta.settings.get('reactions');
 		const maximumReactions = settings.maximumReactions || DEFAULT_MAX_EMOTES;
-		const [totalReactions, isMember, alreadyReacted, reactionReputation] = await Promise.all([
+		const [totalReactions, emojiIsAlreadyExist, alreadyReacted, reactionReputation] = await Promise.all([
 			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),
 		]);
 
-		if (!isMember && totalReactions >= maximumReactions) {
-			throw new Error('[[reactions:error.maximum-reached]]');
+		if (!emojiIsAlreadyExist) {
+			if (totalReactions > maximumReactions) {
+				throw new Error(`[[reactions:error.maximum-reached]] (${maximumReactions})`);
+			}
+			
+			const maximumReactionsPerUserPerPost = settings.maximumReactionsPerUserPerPost ? parseInt(settings.maximumReactionsPerUserPerPost, 10) : 0;
+			if (maximumReactionsPerUserPerPost > 0) {
+				const emojiesInPost = await db.getSetMembers(`pid:${data.pid}:reactions`);
+				const userPostReactions = await db.isMemberOfSets(emojiesInPost.map(emojiName => `pid:${data.pid}:reaction:${emojiName}`), socket.uid);
+				const userPostReactionCount = userPostReactions.filter(Boolean).length;
+				if (userPostReactionCount > maximumReactionsPerUserPerPost) {
+					throw new Error(`[[reactions:error.maximum-per-user-per-post-reached]] (${maximumReactionsPerUserPerPost})`);
+				}
+			}
 		}
+		
 
 		await Promise.all([
 			db.setAdd(`pid:${data.pid}:reactions`, data.reaction),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "nbbpm": {
     "compatibility": "^3.0.0"
   },

package/public/client.js

@@ -74,10 +74,10 @@ $(document).ready(function () {
 	}
 
 	function updateReactionCount(data) {
-		var maxReactionsReached = parseInt(data.totalReactions, 10) >= config.maximumReactions;
+		var 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 + '"]');
+		var reactionEl = $(`[component="post/reaction"][data-pid="${data.pid}"][data-reaction="${data.reaction}"]`);
 
 		if (parseInt(data.reactionCount, 10) === 0) {
 			reactionEl.tooltip('dispose');
@@ -94,21 +94,23 @@ $(document).ready(function () {
 				reactionImage: data.reactionImage,
 			}, function (html) {
 				$('[component="post/reactions"][data-pid="' + data.pid + '"]').append(html);
-				createReactionTooltips();
 			});
 		} else {
 			reactionEl.find('.reaction-emoji-count').attr('data-count', data.reactionCount);
-			reactionEl.attr('data-original-title', data.usernames);
+			reactionEl.attr('data-bs-original-title', data.usernames);
+			reactionEl.attr('aria-label', data.usernames);
 			reactionEl.toggleClass('reacted', !(parseInt(data.uid, 10) === app.user.uid));
 		}
+		createReactionTooltips();
 	}
 
 	function createReactionTooltips() {
 		$('.reaction, .reaction-add').each(function () {
 			if (!utils.isTouchDevice()) {
+				$(this).tooltip('dispose');
 				$(this).tooltip({
 					placement: 'top',
-					title: $(this).attr('title'),
+					title: $(this).attr('title') || $(this).attr('data-bs-original-title'),
 				});
 			}
 		});

package/templates/admin/plugins/reactions.tpl

@@ -4,13 +4,20 @@
 		<div class="col-sm-10 col-xs-12">
 			<div class="form-group">
 				<label>[[reactions:settings.max-reactions-per-post]]</label>
-				<input type="text" class="form-control" id="maximumReactions" name="maximumReactions">
+				<input type="number" min="0" class="form-control" id="maximumReactions" name="maximumReactions">
+
+				<label>[[reactions:settings.max-reactions-per-user-per-post]]</label>
+				<input type="number" min="0" class="form-control" id="maximumReactionsPerUserPerPost" name="maximumReactionsPerUserPerPost">
+				<p class="help-text">
+					[[reactions:settings.max-reactions-per-user-per-post-help]]
+				</p>
 			</div>
 		</div>
 	</div>
-	<div class="row">
+
+	<div class="row mt-3">
 		<div class="col-sm-2 col-xs-12 settings-header">[[reactions:settings.reaction-reputations]]</div>
-		<div class="col-sm-10 col-xs-12 mt-2">
+		<div class="col-sm-10 col-xs-12">
 			<p class="help-text">
 				[[reactions:settings.reaction-reputations-help]]
 			</p>