From f464a81ee507f0bae7da4ad11e20156866de9bfc Mon Sep 17 00:00:00 2001
From: Thomas Lynch <tom@69420.me>
Date: Sun, 30 May 2021 01:24:17 +0000
Subject: [PATCH] bugfix for banner upload

---
 CHANGELOG.md                  |  3 +++
 models/forms/addflags.js      |  2 +-
 models/forms/uploadbanners.js | 45 ++++++++++++++++-------------------
 package.json                  |  2 +-
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7112a1..442dad41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,3 +24,6 @@
   - Add new themes
   - Improved README
   - Many bugfixes
+
+##### 0.1.4
+  - Banner uploading bugfix
diff --git a/models/forms/addflags.js b/models/forms/addflags.js
index d73da6bf..b9d2fba3 100644
--- a/models/forms/addflags.js
+++ b/models/forms/addflags.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path')
-	, { remove, pathExists } = require('fs-extra')
+	, { remove } = require('fs-extra')
 	, config = require(__dirname+'/../../config.js')
 	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, moveUpload = require(__dirname+'/../../helpers/files/moveupload.js')
diff --git a/models/forms/uploadbanners.js b/models/forms/uploadbanners.js
index 2b013fd3..84efa5b7 100644
--- a/models/forms/uploadbanners.js
+++ b/models/forms/uploadbanners.js
@@ -17,7 +17,6 @@ module.exports = async (req, res, next) => {
 	const { globalLimits, checkRealMimeTypes } = config.get;
 	const redirect = `/${req.params.board}/manage/assets.html`;
 
-	// check all mime types before we try saving anything
 	for (let i = 0; i < res.locals.numFiles; i++) {
 		if (!mimeTypes.allowed(req.files.file[i].mimetype, {
 				//banners can be static image or animated (gif, apng, etc)
@@ -34,11 +33,9 @@ module.exports = async (req, res, next) => {
 				'redirect': redirect
 			});
 		}
-	}
 
-	// check for any mismatching supposed mimetypes from the actual file mimetype
-	if (checkRealMimeTypes) {
-		for (let i = 0; i < res.locals.numFiles; i++) {
+		// check for any mismatching supposed mimetypes from the actual file mimetype
+		if (checkRealMimeTypes) {
 			if (!(await mimeTypes.realMimeCheck(req.files.file[i]))) {
 				deleteTempFiles(req).catch(e => console.error);
 				return dynamicResponse(req, res, 400, 'message', {
@@ -48,6 +45,24 @@ module.exports = async (req, res, next) => {
 				});
 			}
 		}
+
+		//300x100 check
+		const imageData = await imageIdentify(req.files.file[i].tempFilePath, null, true);
+		let geometry = imageData.size;
+		if (Array.isArray(geometry)) {
+			geometry = geometry[0];
+		}
+		if (geometry.width > globalLimits.bannerFiles.width
+			|| geometry.height > globalLimits.bannerFiles.height
+			|| (globalLimits.bannerFiles.forceAspectRatio === true
+				&& (geometry.width/geometry.height !== 3))) {
+			await deleteTempFiles(req).catch(e => console.error);
+			return dynamicResponse(req, res, 400, 'message', {
+				'title': 'Bad request',
+				'message': `Invalid file ${req.files.file[i].name}. Max banner dimensions are ${globalLimits.bannerFiles.width}x${globalLimits.bannerFiles.height}${globalLimits.bannerFiles.forceAspectRatio === true ? ' and must be a 3:1 aspect ratio' : '' }.`,
+				'redirect': redirect
+			});
+		}
 	}
 
 	const filenames = [];
@@ -67,26 +82,6 @@ module.exports = async (req, res, next) => {
 		//add to list after checking it doesnt already exist
 		filenames.push(filename);
 
-		//get metadata from tempfile
-		const imageData = await imageIdentify(req.files.file[i].tempFilePath, null, true);
-		let geometry = imageData.size;
-		if (Array.isArray(geometry)) {
-			geometry = geometry[0];
-		}
-
-		//make sure its 300x100 banner
-		if (geometry.width > globalLimits.bannerFiles.width
-			|| geometry.height > globalLimits.bannerFiles.height
-			|| (globalLimits.bannerFiles.forceAspectRatio === true
-				&& (geometry.width/geometry.height !== 3))) {
-			await deleteTempFiles(req).catch(e => console.error);
-			return dynamicResponse(req, res, 400, 'message', {
-				'title': 'Bad request',
-				'message': `Invalid file ${file.name}. Max banner dimensions are ${globalLimits.bannerFiles.width}x${globalLimits.bannerFiles.height}${globalLimits.bannerFiles.forceAspectRatio === true ? ' and must be a 3:1 aspect ratio' : '' }.`,
-				'redirect': redirect
-			});
-		}
-
 		//then upload it
 		await moveUpload(file, filename, `banner/${req.params.board}`);
 
diff --git a/package.json b/package.json
index ae4601f9..1a80577b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jschan",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "migrateVersion": "0.1.3",
   "description": "",
   "main": "server.js",