Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9972

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-11-03 22:47:15 -04:00
parent b1d6c9ba29
commit 67cb249122
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/posts/uploads.js
View File

@@ -41,7 +41,8 @@ module.exports = function (Posts) {
if (isMainPost) { if (isMainPost) {
const tid = await Posts.getPostField(pid, 'tid'); const tid = await Posts.getPostField(pid, 'tid');
let thumbs = await topics.thumbs.get(tid); let thumbs = await topics.thumbs.get(tid);
thumbs = thumbs.map(thumb => thumb.url.replace(path.join(nconf.get('relative_path'), nconf.get('upload_url'), 'files/'), '')).filter(path => !validator.isURL(path, { const replacePath = path.posix.join(nconf.get('relative_path'), nconf.get('upload_url'), 'files/');
thumbs = thumbs.map(thumb => thumb.url.replace(replacePath, '')).filter(path => !validator.isURL(path, {
require_protocol: true, require_protocol: true,
})); }));
uploads.push(...thumbs); uploads.push(...thumbs);

28
test/topics/thumbs.js
View File

@@ -92,7 +92,7 @@ describe('Topic thumbs', () => {
require('../../src/cache').del(`topic:${topicObj.topicData.tid}:thumbs`); require('../../src/cache').del(`topic:${topicObj.topicData.tid}:thumbs`);
const thumbs = await topics.thumbs.get(topicObj.topicData.tid); const thumbs = await topics.thumbs.get(topicObj.topicData.tid);
assert.deepStrictEqual(thumbs, [{ assert.deepStrictEqual(thumbs, [{
id: 2, id: topicObj.topicData.tid,
name: 'test.png', name: 'test.png',
url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`,
}]); }]);
@@ -102,7 +102,7 @@ describe('Topic thumbs', () => {
const thumbs = await topics.thumbs.get([topicObj.topicData.tid, topicObj.topicData.tid + 1]); const thumbs = await topics.thumbs.get([topicObj.topicData.tid, topicObj.topicData.tid + 1]);
assert.deepStrictEqual(thumbs, [ assert.deepStrictEqual(thumbs, [
[{ [{
id: 2, id: topicObj.topicData.tid,
name: 'test.png', name: 'test.png',
url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`,
}], }],
@@ -132,7 +132,7 @@ describe('Topic thumbs', () => {
path: relativeThumbPaths[0], path: relativeThumbPaths[0],
}); });
const exists = await db.isSortedSetMember(`topic:3:thumbs`, relativeThumbPaths[0]); const exists = await db.isSortedSetMember(`topic:${tid}:thumbs`, relativeThumbPaths[0]);
assert(exists); assert(exists);
}); });
@@ -153,17 +153,17 @@ describe('Topic thumbs', () => {
path: relativeThumbPaths[2], path: relativeThumbPaths[2],
}); });
const exists = await db.isSortedSetMember(`topic:3:thumbs`, relativeThumbPaths[2]); const exists = await db.isSortedSetMember(`topic:${tid}:thumbs`, relativeThumbPaths[2]);
assert(exists); assert(exists);
}); });
it('should have a score equal to the number of thumbs prior to addition', async () => { it('should have a score equal to the number of thumbs prior to addition', async () => {
const scores = await db.sortedSetScores('topic:3:thumbs', [relativeThumbPaths[0], relativeThumbPaths[2]]); const scores = await db.sortedSetScores(`topic:${tid}:thumbs`, [relativeThumbPaths[0], relativeThumbPaths[2]]);
assert.deepStrictEqual(scores, [0, 1]); assert.deepStrictEqual(scores, [0, 1]);
}); });
it('should update the relevant topic hash with the number of thumbnails', async () => { it('should update the relevant topic hash with the number of thumbnails', async () => {
const numThumbs = await topics.getTopicField(3, 'numThumbs'); const numThumbs = await topics.getTopicField(tid, 'numThumbs');
assert.strictEqual(parseInt(numThumbs, 10), 2); assert.strictEqual(parseInt(numThumbs, 10), 2);
}); });
@@ -173,7 +173,7 @@ describe('Topic thumbs', () => {
path: relativeThumbPaths[0], path: relativeThumbPaths[0],
}); });
const score = await db.sortedSetScore(`topic:3:thumbs`, relativeThumbPaths[0]); const score = await db.sortedSetScore(`topic:${tid}:thumbs`, relativeThumbPaths[0]);
assert(isFinite(score)); // exists in set assert(isFinite(score)); // exists in set
assert.strictEqual(score, 2); assert.strictEqual(score, 2);
@@ -186,7 +186,7 @@ describe('Topic thumbs', () => {
score: 0, score: 0,
}); });
const score = await db.sortedSetScore(`topic:3:thumbs`, relativeThumbPaths[0]); const score = await db.sortedSetScore(`topic:${tid}:thumbs`, relativeThumbPaths[0]);
assert(isFinite(score)); // exists in set assert(isFinite(score)); // exists in set
assert.strictEqual(score, 0); assert.strictEqual(score, 0);
@@ -202,27 +202,25 @@ describe('Topic thumbs', () => {
const uploads = await posts.uploads.list(mainPid); const uploads = await posts.uploads.list(mainPid);
assert(uploads.includes(path.basename(relativeThumbPaths[0]))); assert(uploads.includes(path.basename(relativeThumbPaths[0])));
}); });
});
describe('.migrate()', () => {
it('should combine the thumbs uploaded to a UUID zset and combine it with a topic\'s thumb zset', async () => { it('should combine the thumbs uploaded to a UUID zset and combine it with a topic\'s thumb zset', async () => {
await topics.thumbs.migrate(uuid, 3); await topics.thumbs.migrate(uuid, tid);
const thumbs = await topics.thumbs.get(3); const thumbs = await topics.thumbs.get(tid);
assert.strictEqual(thumbs.length, 3); assert.strictEqual(thumbs.length, 3);
assert.deepStrictEqual(thumbs, [ assert.deepStrictEqual(thumbs, [
{ {
id: 3, id: tid,
name: 'test.png', name: 'test.png',
url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`, url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[0]}`,
}, },
{ {
id: 3, id: tid,
name: 'example.org', name: 'example.org',
url: 'https://example.org', url: 'https://example.org',
}, },
{ {
id: 3, id: tid,
name: 'test2.png', name: 'test2.png',
url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[1]}`, url: `${nconf.get('relative_path')}${nconf.get('upload_url')}${relativeThumbPaths[1]}`,
}, },