diff --git a/controllers/forms.js b/controllers/forms.js index 5cf5d2b5..aa14f753 100644 --- a/controllers/forms.js +++ b/controllers/forms.js @@ -43,7 +43,7 @@ const express = require('express') safeFileNames: /[^\w\s-]+/g, preserveExtension: 3, limits: { - totalSize: globalLimits.postFilesSize.max, + totalSize: globalLimits.bannerFilesSize.max, fileSize: globalLimits.bannerFilesSize.max, files: globalLimits.bannerFiles.max }, diff --git a/db/posts.js b/db/posts.js index 9f0a262f..a77b0f7e 100644 --- a/db/posts.js +++ b/db/posts.js @@ -400,7 +400,6 @@ module.exports = { 'projection': { 'salt': 0, 'password': 0, - 'ip': 0, 'reports': 0, } }).toArray(); diff --git a/gulp/res/js/progress.js b/gulp/res/js/progress.js index a49af2ae..93c6cb74 100644 --- a/gulp/res/js/progress.js +++ b/gulp/res/js/progress.js @@ -168,7 +168,6 @@ window.addEventListener('DOMContentLoaded', () => { if (xhr.status === 413) { clearFiles(); } - xhr.abort(); //not 200 status, so some error/failed post, wrong captcha, etc if (json) { doModal(json); diff --git a/gulp/res/js/themelist.js b/gulp/res/js/themelist.js index ef15872b..5c6e4f68 100644 --- a/gulp/res/js/themelist.js +++ b/gulp/res/js/themelist.js @@ -1 +1 @@ -const themes = ['chaos', 'choc', 'gurochan', 'lain', 'makaba', 'navy', 'rei-zero', 'sushi', 'tomorrow', 'tomorrow2', 'yotsuba b', 'yotsuba'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn'] \ No newline at end of file +const themes = ['chaos', 'choc', 'gurochan', 'lain', 'makaba', 'navy', 'rei-zero', 'sushi', 'tomorrow', 'tomorrow2', 'yotsuba b', 'yotsuba'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'gradient-dark', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn'] \ No newline at end of file diff --git a/helpers/checks/spamcheck.js b/helpers/checks/spamcheck.js index fc0b4159..ebc42aeb 100644 --- a/helpers/checks/spamcheck.js +++ b/helpers/checks/spamcheck.js @@ -13,7 +13,7 @@ module.exports = async (req, res) => { const now = Date.now(); const last120id = Mongo.ObjectId.createFromTime(Math.floor((now - (timeUtils.MINUTE*2))/1000)); const last30id = Mongo.ObjectId.createFromTime(Math.floor((now - (timeUtils.MINUTE*0.5))/1000)); - const last15id = Mongo.ObjectId.createFromTime(Math.floor((now - 3000)/1000)); + const last5id = Mongo.ObjectId.createFromTime(Math.floor((now - 5000)/1000)); const ors = []; const contentOr = []; if (res.locals.numFiles > 0) { @@ -50,7 +50,7 @@ module.exports = async (req, res) => { //any posts from same IP in past 15 seconds ors.push({ '_id': { - '$gt': last15id + '$gt': last5id }, 'ip': res.locals.ip.hash })