Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: topic creation to use api lib

Browse Source
This commit is contained in:
Julian Lam
2020-10-16 10:34:37 -04:00
parent b6cce75d97
commit 40598b368e
8 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/controllers/write/topics.js
View File

@@ -1,5 +1,6 @@
'use strict';
const api = require('../../api');
const topics = require('../../topics');
const posts = require('../../posts');
const user = require('../../user');
@@ -13,29 +14,12 @@ const socketHelpers = require('../../socket.io/helpers');
const Topics = module.exports;
Topics.create = async (req, res) => {
const payload = { ...req.body };
payload.tags = payload.tags || [];
payload.uid = req.user.uid;
payload.uid = req.user.uid;
payload.req = req;
payload.timestamp = Date.now();
payload.fromQueue = false;
// Blacklist & Post Queue
await meta.blacklist.test(req.ip);
const shouldQueue = await posts.shouldQueue(req.user.uid, payload);
if (shouldQueue) {
const queueObj = await posts.addToQueue(payload);
return helpers.formatApiResponse(202, res, queueObj);
const payload = await api.topics.create(req, req.body);
if (payload.queued) {
helpers.formatApiResponse(202, res, payload);
} else {
helpers.formatApiResponse(200, res, payload);
}
const result = await topics.post(payload);
helpers.formatApiResponse(200, res, result.topicData);
// TODO
// socket.emit('event:new_post', { posts: [result.postData] });
// socket.emit('event:new_topic', result.topicData);
socketHelpers.notifyNew(req.user.uid, 'newTopic', { posts: [result.postData], topic: result.topicData });
};
Topics.reply = async (req, res) => {
@@ -54,7 +38,8 @@ Topics.reply = async (req, res) => {
await meta.blacklist.test(req.ip);
const shouldQueue = await posts.shouldQueue(req.user.uid, payload);
if (shouldQueue) {
return await posts.addToQueue(payload);
const queueObj = await posts.addToQueue(payload);
return helpers.formatApiResponse(202, res, queueObj);
}
const postData = await topics.reply(payload); // postData seems to be a subset of postObj, refactor?
@@ -163,7 +148,7 @@ async function doTopicAction(action, event, socket, { tids }) {
const title = await topics.getTopicField(tid, 'title');
const data = await topics.tools[action](tid, socket.uid);
const notifyUids = await privileges.categories.filterUids('topics:read', data.cid, uids);
socketHelpers.emitToTopicAndCategory(event, data, notifyUids);
socketHelpers.emitToUids(event, data, notifyUids);
await logTopicAction(action, socket, tid, title);
}));
}