Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add post attachments to topic thumbnails

Browse Source
This commit is contained in:
Julian Lam
2024-07-11 17:11:33 -04:00
parent 9219199591
commit 2aeabce566
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/activitypub/topics.js
View File

@@ -67,6 +67,7 @@ controller.list = async function (req, res) {
tag: req.query.tag, tag: req.query.tag,
targetUid: targetUid, targetUid: targetUid,
}); });
data.name = '[[activitypub:world.name]]'; data.name = '[[activitypub:world.name]]';
delete data.children; delete data.children;

23
src/topics/thumbs.js
View File

@@ -13,6 +13,7 @@ const posts = require('../posts');
const meta = require('../meta'); const meta = require('../meta');
const cache = require('../cache'); const cache = require('../cache');
const topics = module.parent.exports;
const Thumbs = module.exports; const Thumbs = module.exports;
Thumbs.exists = async function (id, path) { Thumbs.exists = async function (id, path) {
@@ -23,7 +24,12 @@ Thumbs.exists = async function (id, path) {
}; };
Thumbs.load = async function (topicData) { Thumbs.load = async function (topicData) {
const topicsWithThumbs = topicData.filter(t => t && parseInt(t.numThumbs, 10) > 0); const mainPids = topicData.map(t => t.mainPid);
let hashes = await posts.getPostsFields(mainPids, ['attachments']);
hashes = hashes.map(o => o.attachments);
const topicsWithThumbs = topicData.filter((t, idx) => t &&
(parseInt(t.numThumbs, 10) > 0 ||
(hashes[idx] && hashes[idx].length)));
const tidsWithThumbs = topicsWithThumbs.map(t => t.tid); const tidsWithThumbs = topicsWithThumbs.map(t => t.tid);
const thumbs = await Thumbs.get(tidsWithThumbs); const thumbs = await Thumbs.get(tidsWithThumbs);
const tidToThumbs = _.zipObject(tidsWithThumbs, thumbs); const tidToThumbs = _.zipObject(tidsWithThumbs, thumbs);
@@ -44,8 +50,23 @@ Thumbs.get = async function (tids) {
const hasTimestampPrefix = /^\d+-/; const hasTimestampPrefix = /^\d+-/;
const upload_url = nconf.get('relative_path') + nconf.get('upload_url'); const upload_url = nconf.get('relative_path') + nconf.get('upload_url');
const exists = await topics.exists(tids);
const sets = tids.map(tid => `${validator.isUUID(String(tid)) ? 'draft' : 'topic'}:${tid}:thumbs`); const sets = tids.map(tid => `${validator.isUUID(String(tid)) ? 'draft' : 'topic'}:${tid}:thumbs`);
const thumbs = await Promise.all(sets.map(getThumbs)); const thumbs = await Promise.all(sets.map(getThumbs));
// Add attachments to thumb sets
await Promise.all(tids.map(async (tid, idx) => {
if (exists[idx]) {
const mainPid = await topics.getTopicField(tid, 'mainPid');
let attachments = await posts.attachments.get(mainPid);
attachments = attachments.filter(attachment => attachment.mediaType.startsWith('image/'));
if (attachments.length) {
thumbs[idx].push(...attachments.map(attachment => attachment.url));
}
}
}));
let response = thumbs.map((thumbSet, idx) => thumbSet.map(thumb => ({ let response = thumbs.map((thumbSet, idx) => thumbSet.map(thumb => ({
id: tids[idx], id: tids[idx],
name: (() => { name: (() => {