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

chore: appease codeclimate

Browse Source
This commit is contained in:
Julian Lam
2020-12-09 18:45:37 -05:00
parent 24e754d120
commit 9f62df15bd
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/topics/index.js
View File

@@ -115,17 +115,7 @@ Topics.getTopicsByTids = async function (tids, options) {
result.topics.forEach(function (topic, i) { result.topics.forEach(function (topic, i) {
if (topic) { if (topic) {
topic.thumbs = result.thumbs[i]; topic.thumbs = result.thumbs[i];
// Note: Backwards compatibility with old thumb logic, remove in v1.16.0 restoreThumbValue(topic);
if (topic.thumb && !topic.thumbs.length) {
topic.thumbs = [{
id: topic.tid,
name: path.basename(topic.thumb),
url: topic.thumb,
}];
} else if (topic.thumbs.length) {
topic.thumb = topic.thumbs[0].url;
}
// end
topic.category = result.categoriesMap[topic.cid]; topic.category = result.categoriesMap[topic.cid];
topic.user = topic.uid ? result.usersMap[topic.uid] : { ...result.usersMap[topic.uid] }; topic.user = topic.uid ? result.usersMap[topic.uid] : { ...result.usersMap[topic.uid] };
if (result.tidToGuestHandle[topic.tid]) { if (result.tidToGuestHandle[topic.tid]) {
@@ -153,6 +143,20 @@ Topics.getTopicsByTids = async function (tids, options) {
return hookResult.topics; return hookResult.topics;
}; };
// Note: Backwards compatibility with old thumb logic, remove in v1.16.0
function restoreThumbValue(topic) {
if (topic.thumb && !topic.thumbs.length) {
topic.thumbs = [{
id: topic.tid,
name: path.basename(topic.thumb),
url: topic.thumb,
}];
} else if (topic.thumbs.length) {
topic.thumb = topic.thumbs[0].url;
}
}
// end
Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, reverse) { Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, reverse) {
const [ const [
posts, posts,
@@ -181,18 +185,7 @@ Topics.getTopicWithPosts = async function (topicData, set, uid, start, stop, rev
]); ]);
topicData.thumbs = thumbs; topicData.thumbs = thumbs;
// Note: Backwards compatibility with old thumb logic, remove in v1.16.0 restoreThumbValue(topicData);
if (topicData.thumb && !topicData.thumbs.length) {
topicData.thumbs = [{
id: topicData.tid,
name: path.basename(topicData.thumb),
url: topicData.thumb,
}];
} else if (topicData.thumbs.length) {
topicData.thumb = topicData.thumbs[0].url;
}
// end
topicData.posts = posts; topicData.posts = posts;
topicData.category = category; topicData.category = category;
topicData.tagWhitelist = tagWhitelist[0]; topicData.tagWhitelist = tagWhitelist[0];