Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-04 09:59:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-10-12 10:26:06 -04:00
parent e35ff0a1b5 19cfd89fe3
commit aa69e2ed76
102 changed files with 395 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/errors.js
View File

@@ -48,6 +48,12 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esl
res.status(403).type('text/plain').send(err.message);
},
};
const notFoundHandler = () => {
const controllers = require('.');
controllers['404'].handle404(req, res);
};
const defaultHandler = async function () {
if (res.headersSent) {
return;
@@ -87,6 +93,8 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esl
try {
if (data.cases.hasOwnProperty(err.code)) {
data.cases[err.code](err, req, res, defaultHandler);
} else if (err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') {
notFoundHandler();
} else {
await defaultHandler();
}

7
src/controllers/write/flags.js
View File

@@ -13,7 +13,7 @@ Flags.create = async (req, res) => {
};
Flags.get = async (req, res) => {
helpers.formatApiResponse(200, res, await api.flags.get(req, req.params.flagId));
helpers.formatApiResponse(200, res, await api.flags.get(req, req.params));
};
Flags.update = async (req, res) => {
@@ -32,6 +32,11 @@ Flags.delete = async (req, res) => {
helpers.formatApiResponse(200, res);
};
Flags.rescind = async (req, res) => {
await api.flags.rescind(req, { flagId: req.params.flagId });
helpers.formatApiResponse(200, res);
};
Flags.appendNote = async (req, res) => {
const { note, datetime } = req.body;
const payload = await api.flags.appendNote(req, {