mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-03 11:01:20 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -107,7 +107,7 @@
|
||||
"nodebb-plugin-spam-be-gone": "2.3.2",
|
||||
"nodebb-plugin-web-push": "0.7.6",
|
||||
"nodebb-rewards-essentials": "1.0.2",
|
||||
"nodebb-theme-harmony": "2.2.42",
|
||||
"nodebb-theme-harmony": "2.2.43",
|
||||
"nodebb-theme-lavender": "7.1.21",
|
||||
"nodebb-theme-peace": "2.2.55",
|
||||
"nodebb-theme-persona": "14.2.21",
|
||||
|
||||
@@ -17,9 +17,11 @@ module.exports = function (Topics) {
|
||||
}
|
||||
let uid = options;
|
||||
let { teaserPost } = meta.config;
|
||||
let teaserParseType = 'plaintext';
|
||||
if (typeof options === 'object') {
|
||||
uid = options.uid;
|
||||
teaserPost = options.teaserPost || meta.config.teaserPost;
|
||||
teaserParseType = options.teaserParseType || 'plaintext';
|
||||
}
|
||||
|
||||
const counts = [];
|
||||
@@ -68,7 +70,7 @@ module.exports = function (Topics) {
|
||||
post.timestampISO = utils.toISOString(post.timestamp);
|
||||
tidToPost[post.tid] = post;
|
||||
});
|
||||
await Promise.all(postData.map(p => posts.parsePost(p, 'plaintext')));
|
||||
await Promise.all(postData.map(p => posts.parsePost(p, teaserParseType)));
|
||||
|
||||
const teasers = topics.map((topic, index) => {
|
||||
if (!topic) {
|
||||
|
||||
Reference in New Issue
Block a user