Merge branch 'f24' into verify-message

CMU-313 · Sep 25, 2024 · 2a447be · 2a447be
2 parents 653c107 + 64d9e6f
commit 2a447be
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 26 deletions.
diff --git a/dump.rdb b/dump.rdb
diff --git a/public/openapi/components/schemas/PostObject.yaml b/public/openapi/components/schemas/PostObject.yaml
@@ -18,6 +18,8 @@ PostObject:
       type: boolean
     verify:
       type: number
+    answered:
+      type: number
     upvotes:
       type: number
     downvotes:

diff --git a/public/openapi/read/topic/topic_id.yaml b/public/openapi/read/topic/topic_id.yaml
@@ -71,6 +71,8 @@ get:
                           type: number
                         verifyUid:
                           type: number
+                        answered:
+                          type: number
                         upvotes:
                           type: number
                         downvotes:
@@ -79,6 +81,8 @@ get:
                           type: number
                         deleterUid:
                           type: number
+                        answererUid:
+                          type: number
                         edited:
                           type: number
                         timestampISO:

diff --git a/public/openapi/write/posts/pid.yaml b/public/openapi/write/posts/pid.yaml
@@ -44,12 +44,16 @@ get:
                     type: number
                   verifyUid:
                     type: number
+                  answered:
+                    type: number
                   upvotes:
                     type: number
                   downvotes:
                     type: number
                   deleterUid:
                     type: number
+                  answererUid:
+                    type: number
                   edited:
                     type: number
                   replies:

diff --git a/public/openapi/write/posts/pid/replies.yaml b/public/openapi/write/posts/pid/replies.yaml
@@ -47,6 +47,8 @@ get:
                           type: number
                         verify:
                           type: number
+                        answered:
+                          type: number
                         upvotes:
                           type: number
                         downvotes:

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
@@ -42,6 +42,9 @@ define('forum/topic/events', [
 
 		'posts.verify': toggleVerifyMessage,
 		'posts.unverify': toggleVerifyMessage,
+
+		'posts.answer': toggleAnswered,
+		'posts.unanswer': toggleAnswered,
 
 		'posts.upvote': togglePostVote,
 		'posts.downvote': togglePostVote,
@@ -229,6 +232,10 @@ define('forum/topic/events', [
 		el.find('[component="post/bookmark/off"]').toggleClass('hidden', data.isBookmarked);
 	}
 
+	function toggleAnswered() {
+		console.log('Toggling answered field.');
+	}
+
 	function togglePostVote(data) {
 		const post = $('[data-pid="' + data.post.pid + '"]');
 		post.find('[component="post/upvote"]').filter(function (index, el) {

diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
@@ -26,18 +26,19 @@ define('chat', [
 			}
 			if (module.modalExists(roomId)) {
 				loadAndCenter(module.getModal(roomId));
-			} else {
-				api.get(`/chats/${roomId}`, {
-					uid: uid || app.user.uid,
-				}).then((roomData) => {
-					roomData.users = roomData.users.filter(function (user) {
-						return user && parseInt(user.uid, 10) !== parseInt(app.user.uid, 10);
-					});
-					roomData.uid = uid || app.user.uid;
-					roomData.isSelf = true;
-					module.createModal(roomData, loadAndCenter);
-				}).catch(alerts.error);
+				return;
 			}
+
+			api.get(`/chats/${roomId}`, {
+				uid: uid || app.user.uid,
+			}).then((roomData) => {
+				roomData.users = roomData.users.filter(function (user) {
+					return user && parseInt(user.uid, 10) !== parseInt(app.user.uid, 10);
+				});
+				roomData.uid = uid || app.user.uid;
+				roomData.isSelf = true;
+				module.createModal(roomData, loadAndCenter);
+			}).catch(alerts.error);
 		});
 	};
 

diff --git a/src/api/posts.js b/src/api/posts.js
@@ -156,6 +156,14 @@ postsAPI.edit = async function (caller, data) {
 	return returnData;
 };
 
+postsAPI.answer = async function (caller, data) {
+	return await apiHelpers.postCommand(caller, 'answer', 'answered', '', data);
+};
+
+postsAPI.unanswer = async function (caller, data) {
+	return await apiHelpers.postCommand(caller, 'unanswer', 'answered', '', data);
+};
+
 postsAPI.delete = async function (caller, data) {
 	await deleteOrRestore(caller, data, {
 		command: 'delete',

diff --git a/src/controllers/write/posts.js b/src/controllers/write/posts.js
@@ -162,6 +162,17 @@ Posts.verify = async (req, res) => {
 Posts.unverify = async (req, res) => {
 	const data = await mock(req);
 	await api.posts.unverify(req, data);
+
+Posts.answer = async (req, res) => {
+	const data = await mock(req);
+	await api.posts.answer(req, data);
+	helpers.formatApiResponse(200, res);
+};
+
+Posts.unanswer = async (req, res) => {
+	const data = await mock(req);
+	await api.posts.unanswer(req, data);
+
 	helpers.formatApiResponse(200, res);
 };
 

diff --git a/src/posts/answer.js b/src/posts/answer.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const plugins = require('../plugins');
+
+module.exports = function (Posts) {
+	Posts.answer = async function (pid, uid) {
+		return await toggleAnswered('answer', pid, uid);
+	};
+
+	Posts.unanswer = async function (pid, uid) {
+		return await toggleAnswered('unanswer', pid, uid);
+	};
+
+	async function toggleAnswered(type, pid, uid) {
+		const isAnswering = type === 'answer';
+		await plugins.hooks.fire(`filter:post.${type}`, { pid: pid, uid: uid });
+
+		await Posts.setPostFields(pid, {
+			answered: isAnswering ? 1 : 0,
+			answererUid: isAnswering ? uid : 0,
+		});
+
+		const postData = await Posts.getPostFields(pid, ['pid', 'tid', 'uid', 'content', 'timestamp']);
+
+		return postData;
+	}
+};
diff --git a/src/posts/data.js b/src/posts/data.js
@@ -8,6 +8,7 @@ const intFields = [
 	'uid', 'pid', 'tid', 'deleted', 'timestamp',
 	'upvotes', 'downvotes', 'deleterUid', 'edited',
 	'replies', 'bookmarks', 'verify', 'verifyUid',
+  'answered', 'answererUid',
 ];
 
 module.exports = function (Posts) {

diff --git a/src/posts/index.js b/src/posts/index.js
@@ -23,6 +23,7 @@ require('./recent')(Posts);
 require('./tools')(Posts);
 require('./votes')(Posts);
 require('./bookmarks')(Posts);
+require('./answer')(Posts);
 require('./queue')(Posts);
 require('./verify')(Posts);
 require('./diffs')(Posts);

diff --git a/src/posts/summary.js b/src/posts/summary.js
@@ -20,7 +20,8 @@ module.exports = function (Posts) {
 		options.parse = options.hasOwnProperty('parse') ? options.parse : true;
 		options.extraFields = options.hasOwnProperty('extraFields') ? options.extraFields : [];
 
-		const fields = ['pid', 'tid', 'content', 'uid', 'timestamp', 'deleted', 'upvotes', 'downvotes', 'replies', 'handle', 'verify'].concat(options.extraFields);
+
+		const fields = ['pid', 'tid', 'content', 'uid', 'timestamp', 'deleted', 'upvotes', 'downvotes', 'replies', 'handle', 'answered', 'verify'].concat(options.extraFields);
 
 		let posts = await Posts.getPostsFields(pids, fields);
 		posts = posts.filter(Boolean);

diff --git a/src/socket.io/index.js b/src/socket.io/index.js
@@ -155,6 +155,17 @@ function deserializePayload(payload) {
 	return { params, callback };
 }
 
+async function callMethod(methodToCall, socket, params, callback) {
+	if (methodToCall.constructor && methodToCall.constructor.name === 'AsyncFunction') {
+		const result = await methodToCall(socket, params);
+		callback(null, result);
+	} else {
+		methodToCall(socket, params, (err, result) => {
+			callback(err ? { message: err.message } : null, result);
+		});
+	}
+}
+
 async function onMessage(socket, payload) {
 	const { event, params, callback } = payload;
 	try {
@@ -202,15 +213,7 @@ async function onMessage(socket, payload) {
 		if (Namespaces[namespace].before) {
 			await Namespaces[namespace].before(socket, event, params);
 		}
-
-		if (methodToCall.constructor && methodToCall.constructor.name === 'AsyncFunction') {
-			const result = await methodToCall(socket, params);
-			callback(null, result);
-		} else {
-			methodToCall(socket, params, (err, result) => {
-				callback(err ? { message: err.message } : null, result);
-			});
-		}
+		await callMethod(methodToCall, socket, params, callback);
 	} catch (err) {
 		winston.debug(`${event}\n${err.stack ? err.stack : err.message}`);
 		callback({ message: err.message });

diff --git a/src/user/uploads.js b/src/user/uploads.js
@@ -70,9 +70,10 @@ module.exports = function (User) {
 
 			// Dissociate the upload from pids, if any
 			const pids = await db.getSortedSetsMembers(uploadNames.map(relativePath => `upload:${md5(relativePath)}:pids`));
-			await Promise.all(pids.map(async (pids, idx) => Promise.all(
+			const dissociatePids = (pids, idx) => Promise.all(
 				pids.map(async pid => posts.uploads.dissociate(pid, uploadNames[idx]))
-			)));
+			);
+			await Promise.all(pids.map(async (pids, idx) => dissociatePids(pids, idx)));
 		}, { batch: 50 });
 	};
 

diff --git a/test/posts.js b/test/posts.js
@@ -280,11 +280,20 @@ describe('Post\'s', () => {
 			assert.equal(hasBookmarked[0], false);
 		});
 	});
-
-	describe('answering', async () => {
+  
+  describe('verifying', async () => {
 		it('should mark post verified', async () => {
 			await apiPosts.verify({ uid: voterUid }, { pid: postData.pid, room_id: `topic_${postData.tid}` });
-			const isAnswered = await posts.getPostField(postData.pid, 'verify');
+			const isVerified = await posts.getPostField(postData.pid, 'verify');
+      assert.strictEqual(isVerified, 1);
+      });
+	});
+
+	describe('answering', async () => {
+		it('should mark post answered', async () => {
+			const data = await apiPosts.answer({ uid: voterUid }, { pid: postData.pid, room_id: `topic_${postData.tid}` });
+			const isAnswered = await posts.getPostField(postData.pid, 'answered');
+
 			assert.strictEqual(isAnswered, 1);
 		});
 	});