diff --git a/app/routes/adduser.ts b/app/routes/adduser.ts index b63276f..07980ca 100644 --- a/app/routes/adduser.ts +++ b/app/routes/adduser.ts @@ -6,7 +6,6 @@ import {db, createUser} from "../db"; const router: Router = express.Router(); const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction) => { - //@ts-ignore if (!req.user) return res.status(403).send("You are not authorized to perform this action"); else { diff --git a/app/routes/auth.ts b/app/routes/auth.ts index b6bb312..a377d36 100644 --- a/app/routes/auth.ts +++ b/app/routes/auth.ts @@ -34,12 +34,10 @@ passport.use(new LocalStrategy(function verify(username, password, cb) { }); })); -passport.serializeUser(function(user, cb) { +passport.serializeUser(function(user:any, cb) { process.nextTick(function() { cb(null, { - // @ts-ignore id: user.id, - // @ts-ignore username: user.username }); }); @@ -51,7 +49,6 @@ passport.deserializeUser(function(user, cb) { }); }); -// @ts-ignore router.get("/login", function(req, res) { res.render("login"); }); @@ -62,7 +59,6 @@ router.post("/login/password", passport.authenticate("local", { })); router.post("/logout", function(req, res, next) { - // @ts-ignore, logout is already initalized in app.js req.logout(function(err) { if (err) { return next(err); diff --git a/app/routes/index.ts b/app/routes/index.ts index 05cef1e..70968e4 100644 --- a/app/routes/index.ts +++ b/app/routes/index.ts @@ -132,9 +132,8 @@ router.post("/", [checkAuth, upload.array("fileupload"), createEmbedData, handle res.redirect("/") }); -router.post("/sharex", [checkSharexAuth, upload.array("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => { - // @ts-ignore - return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.files[0].filename}`); +router.post("/sharex", [checkSharexAuth, upload.single("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => { + return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.file.filename}`); }); router.post("/:id(\\d+)/delete", [checkAuth], (req: Request, res: Response, next: NextFunction) => { diff --git a/app/routes/middleware.ts b/app/routes/middleware.ts index f94278c..8dd945b 100644 --- a/app/routes/middleware.ts +++ b/app/routes/middleware.ts @@ -46,9 +46,9 @@ export const checkSharexAuth: Middleware = (req, res, next) => { //createEmbedDatas mp4 to gif and vice versa with ffmpeg export const createEmbedData: Middleware = (req, res, next) => { - for (let file in req.files) { - // @ts-ignore - let nameAndExtension = extension(req.files[file].originalname); + const files = req.files as Express.Multer.File[] + for (let file in files) { + let nameAndExtension = extension(files[file].originalname); let oembed = { type: "video", version: "1.0", @@ -69,9 +69,9 @@ export const createEmbedData: Middleware = (req, res, next) => { } export const convert: Middleware = (req, res, next) => { - for (let file in req.files) { - // @ts-ignore - let nameAndExtension = extension(req.files[file].originalname); + const files = req.files as Express.Multer.File[] + for (let file in files) { + let nameAndExtension = extension(files[file].originalname); if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".mkv" || nameAndExtension[1] == ".avi" || nameAndExtension[1] == ".mov") { console.log("Converting " + nameAndExtension[0] + nameAndExtension[1] + " to gif"); console.log(nameAndExtension[0] + nameAndExtension[1]); @@ -113,7 +113,9 @@ export const handleUpload: Middleware = (req, res, next) => { return res.status(400).send("No files were uploaded."); } - for (let file in req.files) { + const files = req.files as Express.Multer.File[] + + for (let file in files) { let currentdate = Date.now(); let expireDate: Date; if (req.body.expire) { @@ -122,14 +124,12 @@ export const handleUpload: Middleware = (req, res, next) => { console.log(expireDate); } else expireDate = null; - // @ts-ignore - db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [req.files[file].filename, expireDate], function (err) { + db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [files[file].filename, expireDate], function (err) { if (err) { console.log(err); return next(err); } - // @ts-ignore - console.log(`Uploaded ${req.files[file].filename} to database`); + console.log(`Uploaded ${files[file].filename} to database`); if (expireDate == null) console.log("It will not expire"); else if (expireDate != null || expireDate != undefined)