merge-requests/208/head
fatchan 5 years ago
parent c9ae3a97c0
commit 5784b4925f
  1. 2
      controllers/forms.js
  2. 1
      db/posts.js
  3. 1
      gulp/res/js/progress.js
  4. 2
      gulp/res/js/themelist.js
  5. 4
      helpers/checks/spamcheck.js

@ -43,7 +43,7 @@ const express = require('express')
safeFileNames: /[^\w\s-]+/g, safeFileNames: /[^\w\s-]+/g,
preserveExtension: 3, preserveExtension: 3,
limits: { limits: {
totalSize: globalLimits.postFilesSize.max, totalSize: globalLimits.bannerFilesSize.max,
fileSize: globalLimits.bannerFilesSize.max, fileSize: globalLimits.bannerFilesSize.max,
files: globalLimits.bannerFiles.max files: globalLimits.bannerFiles.max
}, },

@ -400,7 +400,6 @@ module.exports = {
'projection': { 'projection': {
'salt': 0, 'salt': 0,
'password': 0, 'password': 0,
'ip': 0,
'reports': 0, 'reports': 0,
} }
}).toArray(); }).toArray();

@ -168,7 +168,6 @@ window.addEventListener('DOMContentLoaded', () => {
if (xhr.status === 413) { if (xhr.status === 413) {
clearFiles(); clearFiles();
} }
xhr.abort();
//not 200 status, so some error/failed post, wrong captcha, etc //not 200 status, so some error/failed post, wrong captcha, etc
if (json) { if (json) {
doModal(json); doModal(json);

@ -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'] 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']

@ -13,7 +13,7 @@ module.exports = async (req, res) => {
const now = Date.now(); const now = Date.now();
const last120id = Mongo.ObjectId.createFromTime(Math.floor((now - (timeUtils.MINUTE*2))/1000)); 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 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 ors = [];
const contentOr = []; const contentOr = [];
if (res.locals.numFiles > 0) { if (res.locals.numFiles > 0) {
@ -50,7 +50,7 @@ module.exports = async (req, res) => {
//any posts from same IP in past 15 seconds //any posts from same IP in past 15 seconds
ors.push({ ors.push({
'_id': { '_id': {
'$gt': last15id '$gt': last5id
}, },
'ip': res.locals.ip.hash 'ip': res.locals.ip.hash
}) })

Loading…
Cancel
Save