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

fix: tests

Browse Source
This commit is contained in:
Julian Lam
2020-12-09 16:46:19 -05:00
parent e83baa97a0
commit bd5c4a5cff
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/write/topics.js
View File

@@ -7,7 +7,7 @@ const topics = require('../../topics');
const privileges = require('../../privileges'); const privileges = require('../../privileges');
const helpers = require('../helpers'); const helpers = require('../helpers');
const middleware = require('../../middleware/assert'); const middleware = require('../../middleware');
const uploadsController = require('../uploads'); const uploadsController = require('../uploads');
const Topics = module.exports; const Topics = module.exports;
@@ -130,7 +130,7 @@ Topics.migrateThumbs = async (req, res) => {
Topics.deleteThumb = async (req, res) => { Topics.deleteThumb = async (req, res) => {
if (!req.body.path.startsWith('http')) { if (!req.body.path.startsWith('http')) {
await middleware.assert.path(req, res); await middleware.assert.path(req, res, function () {});
if (res.headersSent) { if (res.headersSent) {
return; return;
} }

3
src/topics/index.js
View File

@@ -2,6 +2,7 @@
var _ = require('lodash'); var _ = require('lodash');
const validator = require('validator'); const validator = require('validator');
const path = require('path');
var db = require('../database'); var db = require('../database');
var posts = require('../posts'); var posts = require('../posts');
@@ -172,6 +173,8 @@ Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, rev
// Note: Backwards compatibility with old thumb logic, remove in v1.16.0 // Note: Backwards compatibility with old thumb logic, remove in v1.16.0
if (topicData.thumb && !topicData.thumbs.length) { if (topicData.thumb && !topicData.thumbs.length) {
topicData.thumbs = [{ topicData.thumbs = [{
id: topicData.tid,
name: path.basename(topicData.thumb),
url: topicData.thumb, url: topicData.thumb,
}]; }];
} else if (topicData.thumbs.length) { } else if (topicData.thumbs.length) {