Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 16:41:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: topic thumb logic so that isDraft is based on topic existence, and not whether it is a UUID, as remote topics are also UUIDs.

Browse Source
This commit is contained in:
Julian Lam
2024-12-12 11:37:19 -05:00
parent b551abce59
commit 3439fdb600
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/topics/thumbs.js
View File

@@ -4,7 +4,6 @@
const _ = require('lodash'); const _ = require('lodash');
const nconf = require('nconf'); const nconf = require('nconf');
const path = require('path'); const path = require('path');
const validator = require('validator');
const db = require('../database'); const db = require('../database');
const file = require('../file'); const file = require('../file');
@@ -17,7 +16,7 @@ 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) {
const isDraft = validator.isUUID(String(id)); const isDraft = !await topics.exists(id);
const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`; const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`;
return db.isSortedSetMember(set, path); return db.isSortedSetMember(set, path);
@@ -44,13 +43,15 @@ Thumbs.get = async function (tids) {
singular = true; singular = true;
} }
const isDraft = !await topics.exists(tids);
if (!meta.config.allowTopicsThumbnail || !tids.length) { if (!meta.config.allowTopicsThumbnail || !tids.length) {
return singular ? [] : tids.map(() => []); return singular ? [] : tids.map(() => []);
} }
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 sets = tids.map(tid => `${validator.isUUID(String(tid)) ? 'draft' : 'topic'}:${tid}:thumbs`); const sets = tids.map((tid, idx) => `${isDraft[idx] ? '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 // Add attachments to thumb sets
@@ -93,7 +94,7 @@ async function getThumbs(set) {
Thumbs.associate = async function ({ id, path, score }) { Thumbs.associate = async function ({ id, path, score }) {
// Associates a newly uploaded file as a thumb to the passed-in draft or topic // Associates a newly uploaded file as a thumb to the passed-in draft or topic
const isDraft = validator.isUUID(String(id)); const isDraft = !await topics.exists(id);
const isLocal = !path.startsWith('http'); const isLocal = !path.startsWith('http');
const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`; const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`;
const numThumbs = await db.sortedSetCard(set); const numThumbs = await db.sortedSetCard(set);
@@ -102,7 +103,6 @@ Thumbs.associate = async function ({ id, path, score }) {
if (isLocal) { if (isLocal) {
path = path.replace(nconf.get('upload_path'), ''); path = path.replace(nconf.get('upload_path'), '');
} }
const topics = require('.');
await db.sortedSetAdd(set, isFinite(score) ? score : numThumbs, path); await db.sortedSetAdd(set, isFinite(score) ? score : numThumbs, path);
if (!isDraft) { if (!isDraft) {
const numThumbs = await db.sortedSetCard(set); const numThumbs = await db.sortedSetCard(set);
@@ -131,7 +131,7 @@ Thumbs.migrate = async function (uuid, id) {
}; };
Thumbs.delete = async function (id, relativePaths) { Thumbs.delete = async function (id, relativePaths) {
const isDraft = validator.isUUID(String(id)); const isDraft = !await topics.exists(id);
const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`; const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`;
if (typeof relativePaths === 'string') { if (typeof relativePaths === 'string') {
@@ -179,7 +179,7 @@ Thumbs.delete = async function (id, relativePaths) {
}; };
Thumbs.deleteAll = async (id) => { Thumbs.deleteAll = async (id) => {
const isDraft = validator.isUUID(String(id)); const isDraft = !await topics.exists(id);
const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`; const set = `${isDraft ? 'draft' : 'topic'}:${id}:thumbs`;
const thumbs = await db.getSortedSetRange(set, 0, -1); const thumbs = await db.getSortedSetRange(set, 0, -1);