diff --git a/src/categories/topics.js b/src/categories/topics.js index 64248890c0..86b41141f7 100644 --- a/src/categories/topics.js +++ b/src/categories/topics.js @@ -15,6 +15,7 @@ module.exports = function (Categories) { let results = await plugins.hooks.fire('filter:category.topics.prepare', data); const tids = await Categories.getTopicIds(results); let topicsData = await topics.getTopicsByTids(tids, data.uid); + console.log(topicsData); topicsData = await user.blocks.filter(data.uid, topicsData); if (!topicsData.length) { diff --git a/src/topics/index.js b/src/topics/index.js index 1c9d8fcbc4..ae3b345768 100644 --- a/src/topics/index.js +++ b/src/topics/index.js @@ -10,6 +10,7 @@ const plugins = require('../plugins'); const meta = require('../meta'); const user = require('../user'); const categories = require('../categories'); +const activitypub = require('../activitypub'); const privileges = require('../privileges'); const social = require('../social'); @@ -71,10 +72,10 @@ Topics.getTopicsByTids = async function (tids, options) { const topics = await Topics.getTopicsData(tids); const uids = _.uniq(topics .map(t => t && t.uid && t.uid.toString()) - .filter(v => utils.isNumber(v) || validator.isUUID(String(v)))); + .filter(v => utils.isNumber(v) || activitypub.helpers.isUri(v))); const cids = _.uniq(topics .map(t => t && t.cid && t.cid.toString()) - .filter(v => utils.isNumber(v) || validator.isUUID(String(v)))); + .filter(v => utils.isNumber(v))); const guestTopics = topics.filter(t => t && t.uid === 0); async function loadGuestHandles() {