Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: restore avatars in topic list

Browse Source
This commit is contained in:
Julian Lam
2024-01-23 11:49:57 -05:00
parent da0211b1a0
commit 3bdaa8a836
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/categories/topics.js
View File

@@ -15,6 +15,7 @@ module.exports = function (Categories) {
let results = await plugins.hooks.fire('filter:category.topics.prepare', data); let results = await plugins.hooks.fire('filter:category.topics.prepare', data);
const tids = await Categories.getTopicIds(results); const tids = await Categories.getTopicIds(results);
let topicsData = await topics.getTopicsByTids(tids, data.uid); let topicsData = await topics.getTopicsByTids(tids, data.uid);
console.log(topicsData);
topicsData = await user.blocks.filter(data.uid, topicsData); topicsData = await user.blocks.filter(data.uid, topicsData);
if (!topicsData.length) { if (!topicsData.length) {

5
src/topics/index.js
View File

@@ -10,6 +10,7 @@ const plugins = require('../plugins');
const meta = require('../meta'); const meta = require('../meta');
const user = require('../user'); const user = require('../user');
const categories = require('../categories'); const categories = require('../categories');
const activitypub = require('../activitypub');
const privileges = require('../privileges'); const privileges = require('../privileges');
const social = require('../social'); const social = require('../social');
@@ -71,10 +72,10 @@ Topics.getTopicsByTids = async function (tids, options) {
const topics = await Topics.getTopicsData(tids); const topics = await Topics.getTopicsData(tids);
const uids = _.uniq(topics const uids = _.uniq(topics
.map(t => t && t.uid && t.uid.toString()) .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 const cids = _.uniq(topics
.map(t => t && t.cid && t.cid.toString()) .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); const guestTopics = topics.filter(t => t && t.uid === 0);
async function loadGuestHandles() { async function loadGuestHandles() {