mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-02 20:16:04 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -108,7 +108,7 @@
|
||||
"nodebb-theme-lavender": "7.1.8",
|
||||
"nodebb-theme-peace": "2.2.6",
|
||||
"nodebb-theme-persona": "13.3.25",
|
||||
"nodebb-widget-essentials": "7.0.23",
|
||||
"nodebb-widget-essentials": "7.0.24",
|
||||
"nodemailer": "6.9.15",
|
||||
"nprogress": "0.2.0",
|
||||
"passport": "0.7.0",
|
||||
|
||||
@@ -11,7 +11,11 @@ const uploadsController = require('../uploads');
|
||||
const Topics = module.exports;
|
||||
|
||||
Topics.get = async (req, res) => {
|
||||
helpers.formatApiResponse(200, res, await api.topics.get(req, req.params));
|
||||
const topicData = await api.topics.get(req, req.params);
|
||||
if (!topicData) {
|
||||
return helpers.formatApiResponse(404, res, new Error('[[error:no-topic]]'));
|
||||
}
|
||||
helpers.formatApiResponse(200, res, topicData);
|
||||
};
|
||||
|
||||
Topics.create = async (req, res) => {
|
||||
|
||||
Reference in New Issue
Block a user