Node.js based forum software built for the modern web
fix: update rules logic so cid is no longer required, assumes -1
Julian Lam79b4a7973565
diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.jsindex 2e71364977..cfd135a554 100644--- a/src/controllers/write/admin.js+++ b/src/controllers/write/admin.js@@ -6,6 +6,7 @@ const helpers = require('../helpers');const messaging = require('../../messaging');const events = require('../../events');const activitypub = require('../../activitypub');+const utils = require('../../utils');const Admin = module.exports;@@ -88,8 +89,17 @@ Admin.listGroups = async (req, res) => {Admin.activitypub = {};Admin.activitypub.addRule = async (req, res) => {- const { type, value, cid, filter } = req.body;- const exists = await categories.exists(cid);+ let { type, value, cid, filter } = req.body;++ let exists = true;+ const parsedCid = parseInt(cid, 10);+ if (utils.isNumber(parsedCid) && parsedCid > 0) {+ exists = await categories.exists(parsedCid);+ cid = parsedCid;+ } else {+ cid = -1;+ }+if (!value || !exists) {return helpers.formatApiResponse(400, res);}diff --git a/src/routes/write/admin.js b/src/routes/write/admin.jsindex 13172884ec..5857372b43 100644--- a/src/routes/write/admin.js+++ b/src/routes/write/admin.js@@ -25,7 +25,7 @@ module.exports = function () {setupApiRoute(router, 'get', '/groups', [...middlewares], controllers.write.admin.listGroups);- setupApiRoute(router, 'post', '/activitypub/rules', [...middlewares, middleware.checkRequired.bind(null, ['cid', 'value', 'type'])], controllers.write.admin.activitypub.addRule);+ setupApiRoute(router, 'post', '/activitypub/rules', [...middlewares, middleware.checkRequired.bind(null, ['value', 'type'])], controllers.write.admin.activitypub.addRule);setupApiRoute(router, 'delete', '/activitypub/rules/:rid', [...middlewares], controllers.write.admin.activitypub.deleteRule);setupApiRoute(router, 'put', '/activitypub/rules/order', [...middlewares, middleware.checkRequired.bind(null, ['rids'])], controllers.write.admin.activitypub.reorderRules);setupApiRoute(router, 'post', '/activitypub/relays', [...middlewares, middleware.checkRequired.bind(null, ['url'])], controllers.write.admin.activitypub.addRelay);