organise the helpers some

controllers/forms.js

@@ -5,7 +5,7 @@ const express  = require('express')
 	, Boards = require(__dirname+'/../db/boards.js')
 	, Posts = require(__dirname+'/../db/posts.js')
 	, Mongo = require(__dirname+'/../db/db.js')
-	, remove = require('fs-extra').remove
+	, { remove } = require('fs-extra')
 	, upload = require('express-fileupload')
 	, path = require('path')
 	, postFiles = upload({
@@ -41,14 +41,14 @@ const express  = require('express')
 	, changePassword = require(__dirname+'/../models/forms/changepassword.js')
 	, changeBoardSettings = require(__dirname+'/../models/forms/changeboardsettings.js')
 	, registerAccount = require(__dirname+'/../models/forms/register.js')
-	, checkPermsMiddleware = require(__dirname+'/../helpers/haspermsmiddleware.js')
-	, checkPerms = require(__dirname+'/../helpers/hasperms.js')
+	, checkPermsMiddleware = require(__dirname+'/../helpers/checks/haspermsmiddleware.js')
+	, checkPerms = require(__dirname+'/../helpers/checks/hasperms.js')
 	, paramConverter = require(__dirname+'/../helpers/paramconverter.js')
-	, banCheck = require(__dirname+'/../helpers/bancheck.js')
-	, verifyCaptcha = require(__dirname+'/../helpers/captchaverify.js')
+	, banCheck = require(__dirname+'/../helpers/checks/bancheck.js')
+	, verifyCaptcha = require(__dirname+'/../helpers/captcha/captchaverify.js')
 	, actionHandler = require(__dirname+'/../models/forms/actionhandler.js')
-	, csrf = require(__dirname+'/../helpers/csrfmiddleware.js')
-	, actionChecker = require(__dirname+'/../helpers/actionchecker.js');
+	, csrf = require(__dirname+'/../helpers/checks/csrfmiddleware.js')
+	, actionChecker = require(__dirname+'/../helpers/checks/actionchecker.js');
 
 
 // login to account

controllers/pages.js

@@ -4,10 +4,10 @@ const express  = require('express')
 	, router = express.Router()
 	, Boards = require(__dirname+'/../db/boards.js')
 	, Posts = require(__dirname+'/../db/posts.js')
-	, hasPerms = require(__dirname+'/../helpers/haspermsmiddleware.js')
-	, isLoggedIn = require(__dirname+'/../helpers/isloggedin.js')
+	, hasPerms = require(__dirname+'/../helpers/checks/haspermsmiddleware.js')
+	, isLoggedIn = require(__dirname+'/../helpers/checks/isloggedin.js')
 	, paramConverter = require(__dirname+'/../helpers/paramconverter.js')
-	, csrf = require(__dirname+'/../helpers/csrfmiddleware.js')
+	, csrf = require(__dirname+'/../helpers/checks/csrfmiddleware.js')
 	//page models
 	, home = require(__dirname+'/../models/pages/home.js')
 	, register = require(__dirname+'/../models/pages/register.js')

helpers/build.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Posts = require(__dirname+'/db/posts.js')
-	, Boards = require(__dirname+'/db/boards.js')
-	, uploadDirectory = require(__dirname+'/helpers/uploadDirectory.js')
-	, render = require(__dirname+'/helpers/render.js');
+const Posts = require(__dirname+'/../db/posts.js')
+	, Boards = require(__dirname+'/../db/boards.js')
+	, uploadDirectory = require(__dirname+'/files/uploadDirectory.js')
+	, render = require(__dirname+'/render.js');
 
 function addBacklinks(thread, preview) { //preview means this is not the full thread
 	const postMap = new Map()

helpers/captcha/captchaverify.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Captchas = require(__dirname+'/../db/captchas.js')
-	, Mongo = require(__dirname+'/../db/db.js')
+const Captchas = require(__dirname+'/../../db/captchas.js')
+	, Mongo = require(__dirname+'/../../db/db.js')
 	, remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../helpers/uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/../files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

helpers/checks/bancheck.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Bans = require(__dirname+'/../db/bans.js')
+const Bans = require(__dirname+'/../../db/bans.js')
 	, hasPerms = require(__dirname+'/hasperms.js');
 
 module.exports = async (req, res, next) => {

helpers/files/deletefailed.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = async (filenames, folder) => {
 

helpers/files/deletepostfiles.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js')
 
 module.exports = (fileNames) => {
 

helpers/files/deletetempfiles.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const remove = require('fs-extra').remove;
+const { remove } = require('fs-extra')
 
 module.exports = async (req) => {
 

helpers/files/formatsize.js

@@ -1,6 +1,7 @@
 'use strict';
-const sizes = ['B', 'KB', 'MB'];
-const k = 1024;
+
+const sizes = ['B', 'KB', 'MB']
+	, k = 1024;
 
 module.exports = (bytes) => {
     if (bytes === 0)  {

helpers/files/imageidentify.js

@@ -1,6 +1,6 @@
 const gm = require('@tohru/gm')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, folder, temp) => {
 

helpers/files/imagethumbnail.js

@@ -1,6 +1,6 @@
 const gm = require('@tohru/gm')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename) => {
 

helpers/files/imageupload.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../uploadDirectory.js')
+const uploadDirectory = require(__dirname+'/uploadDirectory.js')
 	, gm = require('@tohru/gm');
 
 module.exports = (file, filename, folder) => {

helpers/files/uploadDirectory.js

@@ -0,0 +1,6 @@
+'use strict';
+
+const path = require('path')
+	, directory = path.join(__dirname+'/../../static/')
+
+module.exports = directory;

helpers/files/videoidentify.js

@@ -1,6 +1,6 @@
 const ffmpeg = require('fluent-ffmpeg')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, folder, temp) => {
 

helpers/files/videothumbnail.js

@@ -1,6 +1,6 @@
 const ffmpeg = require('fluent-ffmpeg')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, geometry) => {
 

helpers/files/videoupload.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+const uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (file, filename, folder) => {
 

helpers/posting/markdown.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Posts = require(__dirname+'/../db/posts.js')
+const Posts = require(__dirname+'/../../db/posts.js')
 	, greentextRegex = /^>([^>].+)/gm
 	, pinktextRegex = /^<([^<].+)/gm
 	, boldRegex = /""(.+)""/gm

helpers/posting/quotes.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Posts = require(__dirname+'/../db/posts.js')
-	, Boards = require(__dirname+'/../db/posts.js')
+const Posts = require(__dirname+'/../../db/posts.js')
+	, Boards = require(__dirname+'/../../db/boards.js')
 	, quoteRegex = />>\d+/g
 	, crossQuoteRegex = />>>\/\w+\/\d*$/gm;
 

helpers/posting/tripcode.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { tripcodeSecret } = require(__dirname+'/../configs/main.json')
+const { tripcodeSecret } = require(__dirname+'/../../configs/main.json')
     , { createHash } = require('crypto')
 
 module.exports = async (password) => {

helpers/render.js

@@ -4,7 +4,7 @@ const { cacheTemplates, openGraph }= require(__dirname+'/../configs/main.json')
 	, { outputFile } = require('fs-extra')
 	, pug = require('pug')
 	, path = require('path')
-	, uploadDirectory = require(__dirname+'/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/files/uploadDirectory.js')
 	, templateDirectory = path.join(__dirname+'/../views/pages/');
 
 module.exports = async (htmlName, templateName, options) => {

helpers/uploadDirectory.js

@@ -1,6 +0,0 @@
-'use strict';
-
-const path = require('path');
-const directory = path.join(__dirname+'/../static/')
-
-module.exports = directory;

models/forms/actionhandler.js

@@ -14,7 +14,7 @@ const Posts = require(__dirname+'/../../db/posts.js')
 	, globalReportPosts = require(__dirname+'/globalreportpost.js')
 	, dismissReports = require(__dirname+'/dismissreport.js')
 	, dismissGlobalReports = require(__dirname+'/dismissglobalreport.js')
-	, { buildCatalog, buildThread, buildBoardMultiple } = require(__dirname+'/../../build.js');
+	, { buildCatalog, buildThread, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js');
 
 module.exports = async (req, res, next) => {
 

models/forms/changeboardsettings.js

@@ -2,9 +2,9 @@
 
 const Boards = require(__dirname+'/../../db/boards.js')
 	, Posts = require(__dirname+'/../../db/posts.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
-	, { buildHomepage, buildCatalog, buildBoardMultiple } = require(__dirname+'/../../build.js')
-	, remove = require('fs-extra').remove
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
+	, { buildHomepage, buildCatalog, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js')
+	, { remove } = require('fs-extra')
 
 module.exports = async (req, res, next) => {
 

models/forms/deletebanners.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, Boards = require(__dirname+'/../../db/boards.js')
-	, { buildBanners } = require(__dirname+'/../../build.js')
+	, { buildBanners } = require(__dirname+'/../../helpers/build.js')
 
 module.exports = async (req, res, next) => {
 

models/forms/deletepost.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
-	, remove = require('fs-extra').remove
+const uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
+	, { remove } = require('fs-extra')
 	, Mongo = require(__dirname+'/../../db/db.js')
 	, Posts = require(__dirname+'/../../db/posts.js');
 

models/forms/deletepostsfiles.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 
 module.exports = async (posts, unlinkOnly) => {
 

models/forms/makepost.js

@@ -5,11 +5,11 @@ const path = require('path')
 	, crypto = require('crypto')
 	, randomBytes = util.promisify(crypto.randomBytes)
 	, { remove, pathExists } = require('fs-extra')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, Posts = require(__dirname+'/../../db/posts.js')
-	, getTripCode = require(__dirname+'/../../helpers/tripcode.js')
-	, linkQuotes = require(__dirname+'/../../helpers/quotes.js')
-	, simpleMarkdown = require(__dirname+'/../../helpers/markdown.js')
+	, getTripCode = require(__dirname+'/../../helpers/posting/tripcode.js')
+	, linkQuotes = require(__dirname+'/../../helpers/posting/quotes.js')
+	, simpleMarkdown = require(__dirname+'/../../helpers/posting/markdown.js')
 	, sanitize = require('sanitize-html')
 	, sanitizeOptions = {
 		allowedTags: [ 'span', 'a', 'em', 'strong', 'small' ],
@@ -19,7 +19,7 @@ const path = require('path')
 		}
 	}
 	, nameRegex = /^(?<name>[^\s#]+)?(?:##(?<tripcode>[^ ]{1}[^\s#]+))?(?:## (?<capcode>[^\s#]+))?$/
-	, permsCheck = require(__dirname+'/../../helpers/hasperms.js')
+	, permsCheck = require(__dirname+'/../../helpers/checks/hasperms.js')
 	, imageUpload = require(__dirname+'/../../helpers/files/imageupload.js')
 	, videoUpload = require(__dirname+'/../../helpers/files/videoupload.js')
 	, fileCheckMimeType = require(__dirname+'/../../helpers/files/mimetypes.js')
@@ -29,7 +29,7 @@ const path = require('path')
 	, videoIdentify = require(__dirname+'/../../helpers/files/videoidentify.js')
 	, formatSize = require(__dirname+'/../../helpers/files/formatsize.js')
 	, deleteTempFiles = require(__dirname+'/../../helpers/files/deletetempfiles.js')
-	, { buildCatalog, buildThread, buildBoard, buildBoardMultiple } = require(__dirname+'/../../build.js');
+	, { buildCatalog, buildThread, buildBoard, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js');
 
 module.exports = async (req, res, next) => {
 

models/forms/uploadbanners.js

@@ -2,13 +2,13 @@
 
 const path = require('path')
 	, { remove, pathExists, ensureDir } = require('fs-extra')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, imageUpload = require(__dirname+'/../../helpers/files/imageupload.js')
 	, fileCheckMimeType = require(__dirname+'/../../helpers/files/mimetypes.js')
 	, imageIdentify = require(__dirname+'/../../helpers/files/imageidentify.js')
 	, deleteTempFiles = require(__dirname+'/../../helpers/files/deletetempfiles.js')
 	, Boards = require(__dirname+'/../../db/boards.js')
-	, { buildBanners } = require(__dirname+'/../../build.js')
+	, { buildBanners } = require(__dirname+'/../../helpers/build.js')
 
 module.exports = async (req, res, next) => {
 

models/pages/banners.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildBanners } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildBanners } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/board.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Posts = require(__dirname+'/../../db/posts.js')
-	, { buildBoard } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+	, { buildBoard } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/captcha.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Captchas = require(__dirname+'/../../db/captchas.js')
-	, generateCaptcha = require(__dirname+'/../../helpers/captchagenerate.js');
+	, generateCaptcha = require(__dirname+'/../../helpers/captcha/captchagenerate.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/captchapage.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildCaptcha } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildCaptcha } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/catalog.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildCatalog } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildCatalog } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/changepassword.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildChangePassword } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildChangePassword } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/home.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildHomepage } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildHomepage } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/login.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildLogin } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildLogin } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/register.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildRegister } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildRegister } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 

models/pages/thread.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildThread } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildThread } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {