Merge branch 'master' of https://github.com/NodeBB/NodeBB

NodeBB · Jan 15, 2020 · 842916e · 842916e
2 parents 4eb9652 + 740de03
commit 842916e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/events.js b/src/events.js
@@ -25,6 +25,7 @@ events.types = [
 	'post-delete',
 	'post-restore',
 	'post-purge',
+	'post-change-owner',
 	'topic-delete',
 	'topic-restore',
 	'topic-purge',

diff --git a/src/posts/user.js b/src/posts/user.js
@@ -163,6 +163,7 @@ module.exports = function (Posts) {
 			reduceCounters(postsByUser),
 			updateTopicPosters(postData, toUid),
 		]);
+		return postData;
 	};
 
 	async function reduceCounters(postsByUser) {

diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js
@@ -172,6 +172,17 @@ module.exports = function (SocketPosts) {
 			throw new Error('[[error:no-privileges]]');
 		}
 
-		await posts.changeOwner(data.pids, data.toUid);
+		var postData = await posts.changeOwner(data.pids, data.toUid);
+		var logs = postData.map(({ pid, uid, cid }) => (events.log({
+			type: 'post-change-owner',
+			uid: socket.uid,
+			ip: socket.ip,
+			targetUid: data.toUid,
+			pid: pid,
+			originalUid: uid,
+			cid: cid,
+		})));
+
+		await Promise.all(logs);
 	};
 };