Merge branch 'master' into bootstrap5

This commit is contained in:
Barış Soner Uşaklı
2022-11-23 14:17:10 -05:00
2 changed files with 8 additions and 6 deletions

View File

@@ -203,7 +203,7 @@ module.exports = function (Posts) {
await Promise.all(promises);
const parentPids = _.uniq(postsWithParents.map(p => p.toPid));
const counts = db.sortedSetsCard(parentPids.map(pid => `pid:${pid}:replies`));
const counts = await db.sortedSetsCard(parentPids.map(pid => `pid:${pid}:replies`));
await db.setObjectBulk(parentPids.map((pid, index) => [`post:${pid}`, { replies: counts[index] }]));
}

View File

@@ -212,11 +212,13 @@ widgets.reset = async function () {
widgets.resetTemplate = async function (template) {
const area = await db.getObject(`widgets:${template}.tpl`);
const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value));
await db.delete(`widgets:${template}.tpl`);
let draftWidgets = await db.getObjectField('widgets:global', 'drafts');
draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted);
await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets));
if (area) {
const toBeDrafted = _.flatMap(Object.values(area), value => JSON.parse(value));
await db.delete(`widgets:${template}.tpl`);
let draftWidgets = await db.getObjectField('widgets:global', 'drafts');
draftWidgets = JSON.parse(draftWidgets).concat(toBeDrafted);
await db.setObjectField('widgets:global', 'drafts', JSON.stringify(draftWidgets));
}
};
widgets.resetTemplates = async function (templates) {