fix multer types part 2

src/v2/controller/addonChange.controller.ts

@@ -13,9 +13,9 @@ import {
 	SuccessResponse,
 	Tags,
 } from "tsoa";
-import { Express, Request as ExRequest } from "express";
+import { Request as ExRequest } from "express";
 import { WriteConfirmation } from "firestorm-db";
-import { File } from "../interfaces/files";
+import { File, MulterFile } from "../interfaces/files";
 import {
 	AddonReview,
 	Addon,
@@ -123,7 +123,7 @@ export class AddonChangeController extends Controller {
 	 * @param id_or_slug Add-on to add header image to
 	 * @param file File to post
 	 */
-	public postHeader(id_or_slug: string, file: Express.Multer.File): Promise<File | void> {
+	public postHeader(id_or_slug: string, file: MulterFile): Promise<File | void> {
 		return this.service.postHeader(id_or_slug, file.originalname, file);
 	}
 
@@ -132,7 +132,7 @@ export class AddonChangeController extends Controller {
 	 * @param id_or_slug Add-on to add screenshot to
 	 * @param file File to post
 	 */
-	public addonAddScreenshot(id_or_slug: string, file: Express.Multer.File): Promise<File | void> {
+	public addonAddScreenshot(id_or_slug: string, file: MulterFile): Promise<File | void> {
 		return this.service.postScreenshot(id_or_slug, file.originalname, file);
 	}
 

src/v2/interfaces/files.ts

@@ -1,4 +1,9 @@
 import { WriteConfirmation } from "firestorm-db";
+import { Express } from "express";
+
+// multer monkey patches express's types and eslint really doesn't like that
+// so we need to export this separately to prevent issues
+export interface MulterFile extends Express.Multer.File {}
 
 export interface FileParent {
 	type: string; // collection name (addon, post...)

src/v2/service/addon.service.ts

@@ -2,7 +2,7 @@ import { URL } from "url";
 import { APIEmbedField } from "discord-api-types/v10";
 import { WriteConfirmation } from "firestorm-db";
 import { User, UserProfile } from "../interfaces/users";
-import { Addons, Addon, AddonStatus, AddonAll, Files, File, FileParent } from "../interfaces";
+import { Addons, Addon, AddonStatus, AddonAll, Files, File, FileParent, MulterFile } from "../interfaces";
 import { BadRequestError, NotFoundError } from "../tools/errors";
 import UserService from "./user.service";
 import FileService from "./file.service";
@@ -16,7 +16,6 @@ import {
 } from "../interfaces/addons";
 import AddonFirestormRepository from "../repository/addon.repository";
 import { discordEmbed } from "../tools/discordEmbed";
-import { Express } from "express";
 
 // filter & keep only values that are in a-Z & 0-9 & _ or -
 const toSlug = (value: string) =>
@@ -336,7 +335,7 @@ export default class AddonService {
 	public async postHeader(
 		idOrSlug: string,
 		filename: string,
-		multerFile: Express.Multer.File,
+		multerFile: MulterFile,
 	): Promise<void | File> {
 		this.validateImageType(multerFile.mimetype);
 		const { buffer } = multerFile;
@@ -384,7 +383,7 @@ export default class AddonService {
 	public async postScreenshot(
 		idOrSlug: string,
 		filename: string,
-		multerFile: Express.Multer.File,
+		multerFile: MulterFile,
 	): Promise<void | File> {
 		this.validateImageType(multerFile.mimetype);
 		const { buffer } = multerFile;