From c54c9e78924b1046303053fce21b332593277a8f Mon Sep 17 00:00:00 2001 From: fatchan Date: Sun, 26 May 2019 10:33:12 +0000 Subject: [PATCH] multi board rebuilds and rebuilds work for global actions untested --- build.js | 6 +- controllers/forms.js | 197 +++++++++++++++------------------- db/boards.js | 2 +- helpers/actionchecker.js | 30 +++--- helpers/haspermsmiddleware.js | 3 +- models/forms/actionhandler.js | 154 ++++++++++---------------- server.js | 1 + 7 files changed, 162 insertions(+), 231 deletions(-) diff --git a/build.js b/build.js index 303dc3c5..2157aa2d 100644 --- a/build.js +++ b/build.js @@ -8,6 +8,10 @@ const Posts = require(__dirname+'/db/posts.js') module.exports = { buildCatalog: async (board) => { +//console.log('building catalog', `${board._id}/catalog.html`); + if (!board._id) { + board = await Boards.findOne(board); + } const threads = await Posts.getCatalog(board._id); return render(`${board._id}/catalog.html`, 'catalog.pug', { board, @@ -22,7 +26,7 @@ module.exports = { } const thread = await Posts.getThread(board._id, threadId) if (!thread) { - return; //this thread may have been an OP that was deleted during a rebuild + return; //this thread may have been an OP that was deleted } return render(`${board._id}/thread/${threadId}.html`, 'thread.pug', { board, diff --git a/controllers/forms.js b/controllers/forms.js index cf31baa2..a57ec023 100644 --- a/controllers/forms.js +++ b/controllers/forms.js @@ -4,15 +4,8 @@ const express = require('express') , router = express.Router() , Boards = require(__dirname+'/../db/boards.js') , Posts = require(__dirname+'/../db/posts.js') - , Captchas = require(__dirname+'/../db/captchas.js') - , Trips = require(__dirname+'/../db/trips.js') - , Bans = require(__dirname+'/../db/bans.js') , Mongo = require(__dirname+'/../db/db.js') , remove = require('fs-extra').remove - , deletePosts = require(__dirname+'/../models/forms/delete-post.js') - , spoilerPosts = require(__dirname+'/../models/forms/spoiler-post.js') - , dismissGlobalReports = require(__dirname+'/../models/forms/dismissglobalreport.js') - , banPoster = require(__dirname+'/../models/forms/ban-poster.js') , removeBans = require(__dirname+'/../models/forms/removebans.js') , makePost = require(__dirname+'/../models/forms/make-post.js') , uploadBanners = require(__dirname+'/../models/forms/uploadbanners.js') @@ -21,6 +14,7 @@ const express = require('express') , changePassword = require(__dirname+'/../models/forms/changepassword.js') , registerAccount = require(__dirname+'/../models/forms/register.js') , checkPermsMiddleware = require(__dirname+'/../helpers/haspermsmiddleware.js') + , checkPerms = require(__dirname+'/../helpers/hasperms.js') , paramConverter = require(__dirname+'/../helpers/paramconverter.js') , banCheck = require(__dirname+'/../helpers/bancheck.js') , deletePostFiles = require(__dirname+'/../helpers/files/deletepostfiles.js') @@ -346,44 +340,73 @@ router.post('/board/:board/deletebanners', csrf, Boards.exists, checkPermsMiddle }); -//report/delete/spoiler/ban -router.post('/board/:board/actions', Boards.exists, banCheck, paramConverter, verifyCaptcha, actionHandler); //Captcha on regular actions -router.post('/board/:board/modactions', csrf, Boards.exists, checkPermsMiddleware, paramConverter, actionHandler); //CSRF for mod actions +//actions for a specific board +router.post('/board/:board/actions', Boards.exists, banCheck, paramConverter, verifyCaptcha, boardActionController); //Captcha on regular actions +router.post('/board/:board/modactions', csrf, Boards.exists, checkPermsMiddleware, paramConverter, boardActionController); //CSRF for mod actions +async function boardActionController(req, res, next) { -//unban -router.post('/board/:board/unban', csrf, Boards.exists, checkPermsMiddleware, paramConverter, async (req, res, next) => { - - //keep this for later in case i add other options to unbans const errors = []; - if (!req.body.checkedbans || req.body.checkedbans.length === 0 || req.body.checkedbans.length > 10) { - errors.push('Must select 1-10 bans') + //make sure they checked 1-10 posts + if (!req.body.checkedposts || req.body.checkedposts.length === 0 || req.body.checkedposts.length > 10) { + errors.push('Must select 1-10 posts'); + } + + res.locals.actions = actionChecker(req); + + //make sure they selected at least 1 action + if (!res.locals.actions.anyValid) { + errors.push('No actions selected'); + } + //check if they have permission to perform the actions + res.locals.hasPerms = checkPerms(req, res); + if(!res.locals.hasPerms && res.locals.actions.anyAuthed) { + errors.push('No permission'); + } + + //check that actions are valid + if (req.body.password && req.body.password.length > 50) { + errors.push('Password must be 50 characters or less'); + } + if (req.body.report_reason && req.body.report_reason.length > 50) { + errors.push('Report must be 50 characters or less'); + } + if (req.body.ban_reason && req.body.ban_reason.length > 50) { + errors.push('Ban reason must be 50 characters or less'); + } + if ((req.body.report || req.body.global_report) && (!req.body.report_reason || req.body.report_reason.length === 0)) { + errors.push('Reports must have a reason'); } if (errors.length > 0) { return res.status(400).render('message', { 'title': 'Bad request', 'errors': errors, - 'redirect': `/${req.params.board}/manage.html` - }); + 'redirect': `/${req.params.board}/` + }) + } + + res.locals.posts = await Posts.getPosts(req.params.board, req.body.checkedposts, true); + if (!res.locals.posts || res.locals.posts.length === 0) { + return res.status(404).render('message', { + 'title': 'Not found', + 'error': 'Selected posts not found', + 'redirect': `/${req.params.board}/` + }) } - const messages = []; try { - messages.push((await removeBans(req, res, next))); + await actionHandler(req, res, next); } catch (err) { + console.error(err); return next(err); } - return res.render('message', { - 'title': 'Success', - 'messages': messages, - 'redirect': `/${req.params.board}/manage.html` - }); - -}); +} -router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async(req, res, next) => { +//global actions (global manage page) +router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, globalActionController); +async function globalActionController(req, res, next) { const errors = []; @@ -392,10 +415,10 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async errors.push('Must select 1-10 posts') } - const { anyGlobal } = actionChecker(req); + res.locals.actions = actionChecker(req); - //make sure they selected at least 1 global action - if (!anyGlobal) { + //make sure they have any global actions, and that they only selected global actions + if (!res.locals.actions.anyGlobal || res.locals.actions.anyValid > res.locals.actions.anyGlobal) { errors.push('Invalid actions selected'); } @@ -403,15 +426,9 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async if (req.body.password && req.body.password.length > 50) { errors.push('Password must be 50 characters or less'); } - if (req.body.report_reason && req.body.report_reason.length > 50) { - errors.push('Report must be 50 characters or less'); - } if (req.body.ban_reason && req.body.ban_reason.length > 50) { errors.push('Ban reason must be 50 characters or less'); } - if (req.body.report && (!req.body.report_reason || req.body.report_reason.length === 0)) { - errors.push('Reports must have a reason') - } //return the errors if (errors.length > 0) { @@ -423,8 +440,8 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async } //get posts with global ids only - const posts = await Posts.globalGetPosts(req.body.globalcheckedposts, true); - if (!posts || posts.length === 0) { + res.locals.posts = await Posts.globalGetPosts(req.body.globalcheckedposts, true); + if (!res.locals.posts || res.locals.posts.length === 0) { return res.status(404).render('message', { 'title': 'Not found', 'errors': 'Selected posts not found', @@ -432,80 +449,36 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async }) } - //get the ids - const postMongoIds = posts.map(post => Mongo.ObjectId(post._id)); + try { + await actionHandler(req, res, next); + } catch (err) { + console.error(err); + return next(err); + } + +} + +//unban +router.post('/board/:board/unban', csrf, Boards.exists, checkPermsMiddleware, paramConverter, async (req, res, next) => { + + //keep this for later in case i add other options to unbans + const errors = []; + + if (!req.body.checkedbans || req.body.checkedbans.length === 0 || req.body.checkedbans.length > 10) { + errors.push('Must select 1-10 bans') + } + + if (errors.length > 0) { + return res.status(400).render('message', { + 'title': 'Bad request', + 'errors': errors, + 'redirect': `/${req.params.board}/manage.html` + }); + } + const messages = []; - const combinedQuery = {}; - let aggregateNeeded = false; try { - if (req.body.global_ban) { - const { message, action, query } = await banPoster(req, res, next, null, posts); - if (action) { - combinedQuery[action] = { ...combinedQuery[action], ...query} - } - messages.push(message); - } - if (req.body.delete_ip_global) { - const deletePostIps = posts.map(x => x.ip); - const deleteIpPosts = await Posts.db.find({ - 'ip': { - '$in': deletePostIps - } - }).toArray(); - if (deleteIpPosts && deleteIpPosts.length > 0) { - const { message } = await deletePosts(req, res, next, deleteIpPosts, null); - messages.push(message); - aggregateNeeded = true; - } - } else if (req.body.delete) { - const { message } = await deletePosts(req, res, next, posts); - messages.push(message); - aggregateNeeded = true; - } else { - // if it was getting deleted, we cant do any of these - if (req.body.delete_file) { - const { message, action, query } = await deletePostsFiles(posts); - if (action) { - aggregateNeeded = true; - combinedQuery[action] = { ...combinedQuery[action], ...query} - } - messages.push(message); - } else if (req.body.spoiler) { - const { message, action, query } = spoilerPosts(posts); - if (action) { - combinedQuery[action] = { ...combinedQuery[action], ...query} - } - messages.push(message); - } - if (req.body.global_dismiss) { - const { message, action, query } = dismissGlobalReports(posts); - if (action) { - combinedQuery[action] = { ...combinedQuery[action], ...query} - } - messages.push(message); - } - } - if (Object.keys(combinedQuery).length > 0) { - await Posts.db.updateMany({ - '_id': { - '$in': postMongoIds - } - }, combinedQuery); - } - if (aggregateNeeded) { - const threadsToUpdate = [...new Set(posts.filter(post => post.thread !== null))]; - //recalculate and set correct aggregation numbers again - await Promise.all(threadsToUpdate.map(async (post) => { - const replyCounts = await Posts.getReplyCounts(post.board, post.thread); - let replyposts = 0; - let replyfiles = 0; - if (replyCounts[0]) { - replyposts = replyCounts[0].replyposts; - replyfiles = replyCounts[0].replyfiles; - } - Posts.setReplyCounts(post.board, post.thread, replyposts, replyfiles); - })); - } + messages.push((await removeBans(req, res, next))); } catch (err) { return next(err); } @@ -513,7 +486,7 @@ router.post('/global/actions', csrf, checkPermsMiddleware, paramConverter, async return res.render('message', { 'title': 'Success', 'messages': messages, - 'redirect': '/globalmanage.html' + 'redirect': `/${req.params.board}/manage.html` }); }); diff --git a/db/boards.js b/db/boards.js index 0e225f46..e0ec5baf 100644 --- a/db/boards.js +++ b/db/boards.js @@ -5,7 +5,7 @@ const Mongo = require(__dirname+'/db.js') module.exports = { - db, + db: db.collection('boards'), findOne: (name) => { return db.collection('boards').findOne({ '_id': name }); diff --git a/helpers/actionchecker.js b/helpers/actionchecker.js index 10ab2486..be9231ac 100644 --- a/helpers/actionchecker.js +++ b/helpers/actionchecker.js @@ -1,16 +1,16 @@ 'use strict'; const actions = [ + {name:'delete_file', global:true, auth:false, passwords:true}, + {name:'spoiler', global:true, auth:false, passwords:true}, + {name:'delete', global:true, auth:false, passwords:true}, {name:'lock', global:false, auth:true, passwords:false}, {name:'sticky', global:false, auth:true, passwords:false}, {name:'sage', global:false, auth:true, passwords:false}, {name:'report', global:false, auth:false, passwords:false}, {name:'global_report', global:false, auth:false, passwords:false}, - {name:'spoiler', global:true, auth:false, passwords:true}, - {name:'delete', global:true, auth:false, passwords:true}, {name:'delete_ip_board', global:false, auth:true, passwords:false}, {name:'delete_ip_global', global:true, auth:true, passwords:false}, - {name:'delete_file', global:true, auth:false, passwords:true}, {name:'dismiss', global:false, auth:true, passwords:false}, {name:'global_dismiss', global:true, auth:true, passwords:false}, {name:'ban', global:false, auth:true, passwords:false}, @@ -19,26 +19,24 @@ const actions = [ module.exports = (req, res) => { - let anyGlobal = false - , anyAuthed = false - , anyPasswords = false - , anyValid = false; + let anyGlobal = 0 + , anyAuthed = 0 + , anyPasswords = 0 + , anyValid = 0; for (let i = 0; i < actions.length; i++) { const action = actions[i]; const bodyHasAction = req.body[action.name]; if (bodyHasAction) { - if (!anyGlobal && action.global) { - anyGlobal = true; - } - if (!anyAuthed && action.auth) { - anyAuthed = true; + anyValid++; + if (action.global) { + anyGlobal++; } - if (!anyPasswords && action.passwords) { - anyPasswords = true; + if (action.auth) { + anyAuthed++; } - if (!anyValid) { - anyValid = true; + if (action.passwords) { + anyPasswords++; } } if (anyGlobal && anyAuthed && anyValid) { diff --git a/helpers/haspermsmiddleware.js b/helpers/haspermsmiddleware.js index e928c663..8f15cbff 100644 --- a/helpers/haspermsmiddleware.js +++ b/helpers/haspermsmiddleware.js @@ -4,7 +4,8 @@ const hasPerms = require(__dirname+'/hasperms.js'); module.exports = async (req, res, next) => { - if (!hasPerms(req, res)) { + res.locals.hasPerms = hasPerms(req, res); + if (!res.locals.hasPerms) { return res.status(403).render('message', { 'title': 'Forbidden', 'message': 'You do not have permission to access this page', diff --git a/models/forms/actionhandler.js b/models/forms/actionhandler.js index d876ed0d..3a6b8a54 100644 --- a/models/forms/actionhandler.js +++ b/models/forms/actionhandler.js @@ -1,6 +1,7 @@ 'use strict'; const Posts = require(__dirname+'/../../db/posts.js') + , Boards = require(__dirname+'/../../db/boards.js') , Mongo = require(__dirname+'/../../db/db.js') , banPoster = require(__dirname+'/ban-poster.js') , deletePosts = require(__dirname+'/delete-post.js') @@ -13,73 +14,17 @@ const Posts = require(__dirname+'/../../db/posts.js') , globalReportPosts = require(__dirname+'/globalreportpost.js') , dismissReports = require(__dirname+'/dismiss-report.js') , dismissGlobalReports = require(__dirname+'/dismissglobalreport.js') - , actionChecker = require(__dirname+'/../../helpers/actionchecker.js') - , checkPerms = require(__dirname+'/../../helpers/hasperms.js') - , remove = require('fs-extra').remove - , uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js') , { buildCatalog, buildThread, buildBoardMultiple } = require(__dirname+'/../../build.js'); module.exports = async (req, res, next) => { - - const errors = []; - - //make sure they checked 1-10 posts - if (!req.body.checkedposts || req.body.checkedposts.length === 0 || req.body.checkedposts.length > 10) { - errors.push('Must select 1-10 posts'); - } - - //get what type of actions - const { anyPasswords, anyAuthed, anyValid } = actionChecker(req); - - //make sure they selected at least 1 action - if (!anyValid) { - errors.push('No actions selected'); - } - //check if they have permission to perform the actions - const hasPerms = checkPerms(req, res); - if(!hasPerms && anyAuthed) { - errors.push('No permission'); - } - - //check that actions are valid - if (req.body.password && req.body.password.length > 50) { - errors.push('Password must be 50 characters or less'); - } - if (req.body.report_reason && req.body.report_reason.length > 50) { - errors.push('Report must be 50 characters or less'); - } - if (req.body.ban_reason && req.body.ban_reason.length > 50) { - errors.push('Ban reason must be 50 characters or less'); - } - if ((req.body.report || req.body.global_report) && (!req.body.report_reason || req.body.report_reason.length === 0)) { - errors.push('Reports must have a reason'); - } - - if (errors.length > 0) { - return res.status(400).render('message', { - 'title': 'Bad request', - 'errors': errors, - 'redirect': `/${req.params.board}/` - }) - } - - let posts = await Posts.getPosts(req.params.board, req.body.checkedposts, true); - if (!posts || posts.length === 0) { - return res.status(404).render('message', { - 'title': 'Not found', - 'error': 'Selected posts not found', - 'redirect': `/${req.params.board}/` - }) - } - //get the ids - const postMongoIds = posts.map(post => Mongo.ObjectId(post._id)); + const postMongoIds = res.locals.posts.map(post => Mongo.ObjectId(post._id)); let passwordPostMongoIds = []; let passwordPosts = []; - if (!hasPerms && anyPasswords) { + if (!res.locals.hasPerms && res.locals.actions.anyPasswords) { //just to avoid multiple filters and mapping, do it all here - passwordPosts = posts.filter(post => { + passwordPosts = res.locals.posts.filter(post => { if (post.password != null && post.password.length > 0 && post.password == req.body.password) { @@ -91,11 +36,11 @@ module.exports = async (req, res, next) => { return res.status(403).render('message', { 'title': 'Forbidden', 'error': 'Password did not match any selected posts', - 'redirect': `/${req.params.board}/` + 'redirect': `/${req.params.board ? req.params.board+'/' : 'globalmanage.html'}` }); } } else { - passwordPosts = posts; + passwordPosts = res.locals.posts; passwordPostMongoIds = postMongoIds; } @@ -104,24 +49,24 @@ module.exports = async (req, res, next) => { const passwordCombinedQuery = {}; let aggregateNeeded = false; try { - if (hasPerms) { + if (res.locals.hasPerms) { // if getting global banned, board ban doesnt matter if (req.body.global_ban) { - const { message, action, query } = await banPoster(req, res, next, null, posts); + const { message, action, query } = await banPoster(req, res, next, null, res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); } else if (req.body.ban) { - const { message, action, query } = await banPoster(req, res, next, req.params.board, posts); + const { message, action, query } = await banPoster(req, res, next, req.params.board, res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); } } - if (hasPerms && (req.body.delete_ip_board || req.body.delete_ip_global)) { - const deletePostIps = posts.map(x => x.ip); + if (res.locals.hasPerms && (req.body.delete_ip_board || req.body.delete_ip_global)) { + const deletePostIps = res.locals.posts.map(x => x.ip); let query = { 'ip': { '$in': deletePostIps @@ -131,7 +76,7 @@ module.exports = async (req, res, next) => { query['board'] = req.params.board; } const deleteIpPosts = await Posts.db.find(query).toArray(); - posts = posts.concat(deleteIpPosts); + res.locals.posts = res.locals.posts.concat(deleteIpPosts); if (deleteIpPosts && deleteIpPosts.length > 0) { const { message } = await deletePosts(req, res, next, deleteIpPosts, req.params.board); messages.push(message); @@ -157,24 +102,24 @@ module.exports = async (req, res, next) => { } messages.push(message); } - if (hasPerms) { + if (res.locals.hasPerms) { //lock, sticky, sage if (req.body.sage) { - const { message, action, query } = sagePosts(posts); + const { message, action, query } = sagePosts(res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); } if (req.body.lock) { - const { message, action, query } = lockPosts(posts); + const { message, action, query } = lockPosts(res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); } if (req.body.sticky) { - const { message, action, query } = stickyPosts(posts); + const { message, action, query } = stickyPosts(res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } @@ -183,13 +128,13 @@ module.exports = async (req, res, next) => { } // cannot report and dismiss at same time if (req.body.report) { - const { message, action, query } = reportPosts(req, posts); + const { message, action, query } = reportPosts(req, res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); - } else if (hasPerms && req.body.dismiss) { - const { message, action, query } = dismissReports(posts); + } else if (res.locals.hasPerms && req.body.dismiss) { + const { message, action, query } = dismissReports(res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } @@ -197,13 +142,13 @@ module.exports = async (req, res, next) => { } // cannot report and dismiss at same time if (req.body.global_report) { - const { message, action, query } = globalReportPosts(req, posts); + const { message, action, query } = globalReportPosts(req, res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } messages.push(message); - } else if (hasPerms && req.body.global_dismiss) { - const { message, action, query } = dismissGlobalReports(posts); + } else if (res.locals.hasPerms && req.body.global_dismiss) { + const { message, action, query } = dismissGlobalReports(res.locals.posts); if (action) { combinedQuery[action] = { ...combinedQuery[action], ...query} } @@ -239,8 +184,8 @@ module.exports = async (req, res, next) => { //get a map of boards to threads affected const boardThreadMap = {}; const queryOrs = []; - for (let i = 0; i < posts.length; i++) { - const post = posts[i]; + for (let i = 0; i < res.locals.posts.length; i++) { + const post = res.locals.posts[i]; if (!boardThreadMap[post.board]) { boardThreadMap[post.board] = []; } @@ -263,7 +208,7 @@ module.exports = async (req, res, next) => { } //get only posts (so we can use them for thread ids - const postThreadsToUpdate = posts.filter(post => post.thread !== null); + const postThreadsToUpdate = res.locals.posts.filter(post => post.thread !== null); if (aggregateNeeded) { //recalculate replies and image counts await Promise.all(postThreadsToUpdate.map(async (post) => { @@ -296,7 +241,7 @@ module.exports = async (req, res, next) => { '$or': queryOrs }).toArray(); //combine it with what we already had - threadsEachBoard = threadsEachBoard.concat(posts.filter(post => post.thread === null)) + threadsEachBoard = threadsEachBoard.concat(res.locals.posts.filter(post => post.thread === null)) //get the oldest and newest thread for each board to determine how to delete const threadBounds = threadsEachBoard.reduce((acc, curr) => { @@ -315,36 +260,45 @@ module.exports = async (req, res, next) => { //now we need to delete outdated html //TODO: not do this for reports, handle global actions & move to separate handler + optimize and test const parallelPromises = [] - const boardsWithChanges = Object.keys(threadBounds); - for (let i = 0; i < boardsWithChanges.length; i++) { - const changeBoard = boardsWithChanges[i]; - const bounds = threadBounds[changeBoard]; + const boardNames = Object.keys(threadBounds); + const buildBoards = {}; + const multiBoards = await Boards.db.find({ + '_id': { + '$in': boardNames + } + }).toArray(); + multiBoards.forEach(board => { + buildBoards[board._id] = board; + }) + for (let i = 0; i < boardNames.length; i++) { + const boardName = boardNames[i]; + const bounds = threadBounds[boardName]; //always need to refresh catalog - parallelPromises.push(buildCatalog(res.locals.board)); + parallelPromises.push(buildCatalog(buildBoards[boardName])); //rebuild impacted threads - for (let j = 0; j < boardThreadMap[changeBoard].length; j++) { - parallelPromises.push(buildThread(boardThreadMap[changeBoard][j], changeBoard)); + for (let j = 0; j < boardThreadMap[boardName].length; j++) { + parallelPromises.push(buildThread(boardThreadMap[boardName][j], buildBoards[boardName])); } //refersh any pages affected - const afterPages = Math.ceil((await Posts.getPages(changeBoard)) / 10); - if (beforePages[changeBoard] && beforePages[changeBoard] !== afterPages) { + const afterPages = Math.ceil((await Posts.getPages(boardName)) / 10); + if (beforePages[boardName] && beforePages[boardName] !== afterPages) { //amount of pages changed, rebuild all pages - parallelPromises.push(buildBoardMultiple(res.locals.board, 1, afterPages)); + parallelPromises.push(buildBoardMultiple(buildBoards[boardName], 1, afterPages)); } else { - const threadPageOldest = await Posts.getThreadPage(req.params.board, bounds.oldest); - const threadPageNewest = await Posts.getThreadPage(req.params.board, bounds.newest); + const threadPageOldest = await Posts.getThreadPage(boardName, bounds.oldest); + const threadPageNewest = await Posts.getThreadPage(boardName, bounds.newest); if (req.body.delete || req.body.delete_ip_board || req.body.delete_ip_global) { //rebuild current and older pages for deletes - parallelPromises.push(buildBoardMultiple(res.locals.board, threadPageNewest, afterPages)); + parallelPromises.push(buildBoardMultiple(buildBoards[boardName], threadPageNewest, afterPages)); } else if (req.body.sticky) { //else if -- if deleting, other actions are not executed/irrelevant //rebuild current and newer pages for stickies - parallelPromises.push(buildBoardMultiple(res.locals.board, 1, threadPageOldest)); - } else if ((hasPerms && (req.body.lock || req.body.sage)) || req.body.spoiler) { + parallelPromises.push(buildBoardMultiple(buildBoards[boardName], 1, threadPageOldest)); + } else if ((res.locals.hasPerms && (req.body.lock || req.body.sage)) || req.body.spoiler) { //rebuild inbewteen pages for things that dont cause page/thread movement //should rebuild only affected pages, but finding the page of all affected - //threads could end up being slower/more resource intensive. this is simpler - //but still avoids rebuilding _some_ pages unnecessarily - parallelPromises.push(buildBoardMultiple(res.locals.board, threadPageNewest, threadPageOldest)); + //threads could end up being slower/more resource intensive. this is simpler. + //it avoids rebuilding _some_ but not all pages unnecessarily + parallelPromises.push(buildBoardMultiple(buildBoards[boardName], threadPageNewest, threadPageOldest)); } } } @@ -357,7 +311,7 @@ module.exports = async (req, res, next) => { return res.render('message', { 'title': 'Success', 'messages': messages, - 'redirect': `/${req.params.board}/` + 'redirect': `/${req.params.board ? req.params.board+'/' : 'globalmanage.html'}` }); } diff --git a/server.js b/server.js index eb8f1412..602dbe2d 100644 --- a/server.js +++ b/server.js @@ -115,6 +115,7 @@ const express = require('express') server.close((err) => { // if error, log and exit with error (1 code) + console.info('closing http server') if (err) { console.error(err); process.exit(1);