Skip to content

Node.js based forum software built for the modern web

fix: spread fail, @julianlam

Barış Soner Uşaklıc1b719642941
diff --git a/src/user/categories.js b/src/user/categories.js
index fcd155aeb2..09356eac5b 100644
--- a/src/user/categories.js
+++ b/src/user/categories.js
@@ -3,6 +3,7 @@
const _ = require('lodash');
const db = require('../database');
+const meta = require('../meta');
const categories = require('../categories');
const plugins = require('../plugins');
const api = require('../api');
@@ -79,11 +80,11 @@ module.exports = function (User) {
};
User.getCategoriesByStates = async function (uid, states) {
- const remoteCids = await db.getObjectValues('handle:cid');
- const cids = [
- (await categories.getAllCidsFromSet('categories:cid')),
- ...remoteCids,
- ];
+ const [localCids, remoteCids] = await Promise.all([
+ categories.getAllCidsFromSet('categories:cid'),
+ meta.config.activitypubEnabled ? db.getObjectValues('handle:cid') : [],
+ ]);
+ const cids = localCids.concat(remoteCids);
if (!(parseInt(uid, 10) > 0)) {
return cids;
}