Cleanup

3 files changed, 2 insertions, 28 deletions

diff --git a/src/api/structures/Server.js b/src/api/structures/Server.js
index 0ef91fd..6a4abaa 100644
--- a/src/api/structures/Server.js
+++ b/src/api/structures/Server.js
@@ -7,9 +7,7 @@ const RateLimit = require('express-rate-limit');
 const bodyParser = require('body-parser');
 const jetpack = require('fs-jetpack');
 const path = require('path');
-const morgan = require('morgan');
 const log = require('../utils/Log');
-const ThumbUtil = require('../utils/ThumbUtil');
 
 // eslint-disable-next-line no-unused-vars
 const rateLimiter = new RateLimit({
@@ -35,27 +33,6 @@ class Server {
 		});
 		this.server.use(bodyParser.urlencoded({ extended: true }));
 		this.server.use(bodyParser.json());
-		if (process.env.NODE_ENV !== 'production') {
-			this.server.use(morgan('combined', {
-				skip(req) {
-					let ext = req.path.split('.').pop();
-					if (ext) { ext = `.${ext.toLowerCase()}`; }
-
-					if (
-						ThumbUtil.imageExtensions.indexOf(ext) > -1 ||
-						ThumbUtil.videoExtensions.indexOf(ext) > -1 ||
-						req.path.indexOf('_nuxt') > -1 ||
-						req.path.indexOf('favicon.ico') > -1
-					) {
-						return true;
-					}
-					return false;
-				},
-				stream: {
-					write(str) { log.debug(str); }
-				}
-			}));
-		}
 		// this.server.use(rateLimiter);
 
 		// Serve the uploads
diff --git a/src/api/utils/ThumbUtil.js b/src/api/utils/ThumbUtil.js
index 254090d..8882b8c 100644
--- a/src/api/utils/ThumbUtil.js
+++ b/src/api/utils/ThumbUtil.js
@@ -8,13 +8,10 @@ const log = require('./Log');
 
 class ThumbUtil {
 	static imageExtensions = ['.jpg', '.jpeg', '.gif', '.png', '.webp'];
-
 	static videoExtensions = ['.webm', '.mp4', '.wmv', '.avi', '.mov'];
 
 	static thumbPath = path.join(__dirname, '../../../', process.env.UPLOAD_FOLDER, 'thumbs');
-
 	static squareThumbPath = path.join(__dirname, '../../../', process.env.UPLOAD_FOLDER, 'thumbs', 'square');
-
 	static videoPreviewPath = path.join(__dirname, '../../../', process.env.UPLOAD_FOLDER, 'thumbs', 'preview');
 
 	static generateThumbnails(filename) {
diff --git a/src/api/generateThumbs.js b/src/api/utils/generateThumbs.js
index 41d3025..d2cd91b 100644
--- a/src/api/generateThumbs.js
+++ b/src/api/utils/generateThumbs.js
@@ -3,10 +3,10 @@ require('dotenv').config();
 const fs = require('fs');
 const path = require('path');
 
-const ThumbUtil = require('./utils/ThumbUtil');
+const ThumbUtil = require('./ThumbUtil');
 
 const start = async () => {
-	const files = fs.readdirSync(path.join(__dirname, '../../', process.env.UPLOAD_FOLDER));
+	const files = fs.readdirSync(path.join(__dirname, '../../../', process.env.UPLOAD_FOLDER));
 	for (const fileName of files) {
 		console.log(`Generating thumb for '${fileName}`);
 		// eslint-disable-next-line no-await-in-loop