From 90fa066261b7fbcedf18c23cb4c6d43f4e76eb8b Mon Sep 17 00:00:00 2001 From: fatchan Date: Mon, 19 Aug 2019 20:34:15 +0000 Subject: [PATCH] modlog bugfix --- db/modlogs.js | 4 ++-- helpers/build.js | 2 +- helpers/datearray.js | 4 ++-- models/forms/create.js | 4 ++-- models/pages/modlog.js | 5 ++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/db/modlogs.js b/db/modlogs.js index f7df22a5..0c49b495 100644 --- a/db/modlogs.js +++ b/db/modlogs.js @@ -8,13 +8,13 @@ module.exports = { getFirst: (board) => { return db.find({ 'board': board._id - }).sort({_id:-1}).limit(1).toArray(); + }).sort({_id:1}).limit(1).toArray(); }, getLast: (board) => { return db.find({ 'board': board._id - }).sort({_id:1}).limit(1).toArray(); + }).sort({_id:-1}).limit(1).toArray(); }, findBetweenDate: (board, start, end) => { diff --git a/helpers/build.js b/helpers/build.js index bdede68d..4247602f 100644 --- a/helpers/build.js +++ b/helpers/build.js @@ -145,7 +145,7 @@ module.exports = { const firstLogDate = firstLog[0].date; firstLogDate.setHours(1,0,0,0); const lastLogDate = lastLog[0].date; - dates = dateArray(firstLogDate, lastLogDate); + dates = dateArray(firstLogDate, lastLogDate).reverse(); } await render(label, 'modloglist.pug', { board, diff --git a/helpers/datearray.js b/helpers/datearray.js index 4ecb56d8..eea09017 100644 --- a/helpers/datearray.js +++ b/helpers/datearray.js @@ -2,8 +2,8 @@ //https://stackoverflow.com/a/4413721 module.exports = (startDate, stopDate) => { - var dateArray = new Array(); - var currentDate = startDate; + const dateArray = new Array(); + let currentDate = startDate; while (currentDate <= stopDate) { dateArray.push(new Date (currentDate.valueOf())); currentDate.setDate(currentDate.getDate() + 1); diff --git a/models/forms/create.js b/models/forms/create.js index a1351387..601bde24 100644 --- a/models/forms/create.js +++ b/models/forms/create.js @@ -32,8 +32,8 @@ module.exports = async (req, res, next) => { 'moderators': [], 'locked': false, 'captchaMode': 0, - 'tphTrigger': 0, - 'tphTriggerAction': 0, + 'tphTrigger': 10, + 'tphTriggerAction': 1, 'forceAnon': false, 'early404': true, 'ids': false, diff --git a/models/pages/modlog.js b/models/pages/modlog.js index 936e08f0..dcfa6d64 100644 --- a/models/pages/modlog.js +++ b/models/pages/modlog.js @@ -10,11 +10,10 @@ module.exports = async (req, res, next) => { return next(); } - const startDate = res.locals.date; - const endDate = new Date(startDate.getTime()); + const startDate = new Date(res.locals.date); + const endDate = new Date(startDate.valueOf()); startDate.setHours(0,0,0,0); endDate.setHours(23,59,59,999); - try { const logs = await Modlogs.findBetweenDate(res.locals.board, startDate, endDate); if (!logs || logs.length === 0) {