@nodebb/nodebb-plugin-reactions 1.0.0 → 1.0.1

package/library.js

@@ -3,6 +3,7 @@
 const _ = require.main.require('lodash');
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
+const posts = require.main.require('./src/posts');
 const db = require.main.require('./src/database');
 const routesHelpers = require.main.require('./src/routes/helpers');
 const websockets = require.main.require('./src/socket.io/index');
@@ -139,9 +140,9 @@ ReactionsPlugin.deleteReactions = async function (hookData) {
 	const keys = [];
 	pidsReactions.forEach((reactions, index) => {
 		keys.push(
-			...reactions.map(reaction => `pid:${pid}:reaction:${reaction}`),
+			...reactions.map(reaction => `pid:${pids[index]}:reaction:${reaction}`),
 			`pid:${pids[index]}:reactions`,
-		)
+		);
 	});
 
 	await db.deleteAll(keys);
@@ -176,6 +177,20 @@ async function sendEvent(data, eventName) {
 	}
 }
 
+async function getReactionReputation(reaction) {
+	const settings = await meta.settings.get('reactions');
+	const reactionsReps = settings['reaction-reputations'] || [];
+	const foundReaction = reactionsReps.find(r => r.reaction === reaction);
+	return foundReaction ? parseInt(foundReaction.reputation, 10) || 0 : 0;
+}
+
+async function giveOwnerReactionReputation(reactionReputation, pid) {
+	const ownerUid = await posts.getPostField(pid, 'uid');
+	if (parseInt(ownerUid, 10) > 0) {
+		await user.incrementUserReputationBy(ownerUid, reactionReputation);
+	}
+}
+
 SocketPlugins.reactions = {
 	addPostReaction: async function (socket, data) {
 		if (!socket.uid) {
@@ -191,10 +206,11 @@ SocketPlugins.reactions = {
 		try {
 			const settings = await meta.settings.get('reactions');
 			const maximumReactions = settings.maximumReactions || DEFAULT_MAX_EMOTES;
-
-			const [totalReactions, isMember] = await Promise.all([
+			const [totalReactions, isMember, 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) {
@@ -206,6 +222,10 @@ SocketPlugins.reactions = {
 				db.setAdd(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid),
 			]);
 
+			if (!alreadyReacted && reactionReputation > 0) {
+				await giveOwnerReactionReputation(reactionReputation, data.pid);
+			}
+
 			await sendEvent(data, 'event:reactions.addPostReaction');
 		} catch (e) {
 			console.error(e);
@@ -223,13 +243,21 @@ SocketPlugins.reactions = {
 		data.uid = socket.uid;
 
 		try {
-			await db.setRemove(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid);
+			const [hasReacted, reactionReputation] = await Promise.all([
+				db.isSetMember(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid),
+				getReactionReputation(data.reaction),
+			]);
+			if (hasReacted) {
+				await db.setRemove(`pid:${data.pid}:reaction:${data.reaction}`, socket.uid);
+			}
 
 			const reactionCount = await db.setCount(`pid:${data.pid}:reaction:${data.reaction}`);
 			if (reactionCount === 0) {
 				await db.setRemove(`pid:${data.pid}:reactions`, data.reaction);
 			}
-
+			if (hasReacted && reactionReputation > 0) {
+				await giveOwnerReactionReputation(-reactionReputation, data.pid);
+			}
 			await sendEvent(data, 'event:reactions.removePostReaction');
 		} catch (e) {
 			console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodebb/nodebb-plugin-reactions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "nbbpm": {
     "compatibility": "^1.19.7"
   },
@@ -31,7 +31,7 @@
       "name": "Barış Soner Uşaklı",
       "email": "baris@nodebb.org",
       "url": "https://github.com/barisusakli"
-  }
+    }
   ],
   "dependencies": {},
   "peerDependencies": {

package/public/admin.js

@@ -1,9 +1,42 @@
 'use strict';
 
-define('admin/plugins/reactions', ['settings',  'alerts'], function (Settings, alerts) {
+define('admin/plugins/reactions', [
+	'settings',  'alerts', 'hooks', 'emoji-dialog', 'emoji',
+], function (Settings, alerts, hooks, emojiDialog, emoji) {
 	var ACP = {};
 	ACP.init = function () {
-		Settings.load('reactions', $('.reactions-settings'));
+		emoji.init(function () {
+			Settings.load('reactions', $('.reactions-settings'), onSettingsLoaded);
+		});
+	};
+
+	function onSettingsLoaded() {
+		hooks.on('action:settings.sorted-list.parse', function (data) {
+			const reactionEl = data.itemHtml.find('[data-reaction]');
+			if (reactionEl.length) {
+				const reaction = reactionEl.attr('data-reaction');
+				if (reaction) {
+					const foundEmoji = emoji.table[reaction]
+					if (foundEmoji) {
+						reactionEl.html(emoji.buildEmoji(foundEmoji));
+					}
+				}
+			}
+		});
+
+		hooks.on('action:settings.sorted-list.modal', function (data) {
+			const { modal } = data;
+			modal.removeAttr('tabindex');
+			modal.find('#reaction').off('click').on('click', function () {
+				emojiDialog.toggle(modal.find('#reaction')[0], function (_, name, dialog) {
+					emojiDialog.dialogActions.close(dialog);
+					modal.find('#reaction').val(name);
+				});
+			});
+			modal.off('hide.bs.modal').on('hide.bs.modal', function () {
+				emojiDialog.dialogActions.close($('#emoji-dialog'));
+			});
+		});
 
 		$('#save').on('click', function () {
 			Settings.save('reactions', $('.reactions-settings'), function () {
@@ -15,7 +48,7 @@ define('admin/plugins/reactions', ['settings',  'alerts'], function (Settings, a
 				});
 			});
 		});
-	};
+	}
 
 	return ACP;
 });

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

@@ -0,0 +1,10 @@
+<form>
+    <div class="form-group">
+        <label for="reaction">Reaction</label>
+        <input type="text" id="reaction" name="reaction" class="form-control" placeholder="Reaction" />
+    </div>
+    <div class="form-group">
+        <label for="reputation">Reputation</label>
+        <input type="number" id="reputation" name="reputation" class="form-control" placeholder="reputation" />
+    </div>
+</form>

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

@@ -0,0 +1,12 @@
+<li data-type="item" class="list-group-item">
+    <div class="row">
+        <div class="col-xs-9">
+            <span data-reaction="{reaction}"></span><strong> {reaction}</strong><br />
+            <small>Reputation: {reputation}</small>
+        </div>
+        <div class="col-xs-3 text-right">
+            <button type="button" data-type="edit" class="btn btn-info">Edit</button>
+            <button type="button" data-type="remove" class="btn btn-danger">Delete</button>
+        </div>
+    </div>
+</li>

package/templates/admin/plugins/reactions.tpl

@@ -1,14 +1,30 @@
-<div class="row">
-	<div class="col-sm-2 col-xs-12 settings-header">Reactions plugin settings</div>
-	<div class="col-sm-10 col-xs-12">	
-		<form role="form" class="reactions-settings">
+<form role="form" class="reactions-settings">
+	<div class="row">
+		<div class="col-sm-2 col-xs-12 settings-header">Reactions plugin settings</div>
+		<div class="col-sm-10 col-xs-12">
 			<div class="form-group">
 				<label>Maximum unique reactions per post</label>
 				<input type="text" class="form-control" id="maximumReactions" name="maximumReactions">
 			</div>
-		</form>
+		</div>
 	</div>
-</div>
+	<div class="row">
+		<div class="col-sm-2 col-xs-12 settings-header">Reaction Reputations (Optional)</div>
+		<div class="col-sm-10 col-xs-12">
+			<p class="help-text">
+				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.
+			</p>
+			<div class="form-group" data-type="sorted-list" data-sorted-list="reaction-reputations" data-item-template="admin/plugins/reactions/partials/sorted-list/emoji-item" data-form-template="admin/plugins/reactions/partials/sorted-list/emoji-form">
+				<ul data-type="list" class="list-group"></ul>
+				<button type="button" data-type="add" class="btn btn-info">Add Item</button>
+			</div>
+		</div>
+	</div>
+</form>
+
+
+
+
 
 <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
     <i class="material-icons">save</i>