From c1b719642941bccbf0db01aeceff9faa3a55d39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 24 Mar 2025 15:48:01 -0400 Subject: [PATCH] fix: spread fail, @julianlam add ap check --- src/user/categories.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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; }