waveringana/embedder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

clean

Browse source
This commit is contained in:
waveringana 2022-12-06 13:34:43 +00:00
parent bbc655b3f9
commit d130b12418
4 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/routes/adduser.ts
View file

@ -6,7 +6,6 @@ import {db, createUser} from "../db";
const router: Router = express.Router(); const router: Router = express.Router();
const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction) => { const adminCheck: Middleware = (req: Request, res: Response, next: NextFunction) => {
//@ts-ignore
if (!req.user) if (!req.user)
return res.status(403).send("You are not authorized to perform this action"); return res.status(403).send("You are not authorized to perform this action");
else { else {

6
app/routes/auth.ts
View file

@ -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() { process.nextTick(function() {
cb(null, { cb(null, {
// @ts-ignore
id: user.id, id: user.id,
// @ts-ignore
username: user.username username: user.username
}); });
}); });
@ -51,7 +49,6 @@ passport.deserializeUser(function(user, cb) {
}); });
}); });
// @ts-ignore
router.get("/login", function(req, res) { router.get("/login", function(req, res) {
res.render("login"); res.render("login");
}); });
@ -62,7 +59,6 @@ router.post("/login/password", passport.authenticate("local", {
})); }));
router.post("/logout", function(req, res, next) { router.post("/logout", function(req, res, next) {
// @ts-ignore, logout is already initalized in app.js
req.logout(function(err) { req.logout(function(err) {
if (err) { if (err) {
return next(err); return next(err);

5
app/routes/index.ts
View file

@ -132,9 +132,8 @@ router.post("/", [checkAuth, upload.array("fileupload"), createEmbedData, handle
res.redirect("/") res.redirect("/")
}); });
router.post("/sharex", [checkSharexAuth, upload.array("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => { router.post("/sharex", [checkSharexAuth, upload.single("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => {
// @ts-ignore return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.file.filename}`);
return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.files[0].filename}`);
}); });
router.post("/:id(\\d+)/delete", [checkAuth], (req: Request, res: Response, next: NextFunction) => { router.post("/:id(\\d+)/delete", [checkAuth], (req: Request, res: Response, next: NextFunction) => {

22
app/routes/middleware.ts
View file

@ -46,9 +46,9 @@ export const checkSharexAuth: Middleware = (req, res, next) => {
//createEmbedDatas mp4 to gif and vice versa with ffmpeg //createEmbedDatas mp4 to gif and vice versa with ffmpeg
export const createEmbedData: Middleware = (req, res, next) => { export const createEmbedData: Middleware = (req, res, next) => {
for (let file in req.files) { const files = req.files as Express.Multer.File[]
// @ts-ignore for (let file in files) {
let nameAndExtension = extension(req.files[file].originalname); let nameAndExtension = extension(files[file].originalname);
let oembed = { let oembed = {
type: "video", type: "video",
version: "1.0", version: "1.0",
@ -69,9 +69,9 @@ export const createEmbedData: Middleware = (req, res, next) => {
} }
export const convert: Middleware = (req, res, next) => { export const convert: Middleware = (req, res, next) => {
for (let file in req.files) { const files = req.files as Express.Multer.File[]
// @ts-ignore for (let file in files) {
let nameAndExtension = extension(req.files[file].originalname); let nameAndExtension = extension(files[file].originalname);
if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".mkv" || nameAndExtension[1] == ".avi" || nameAndExtension[1] == ".mov") { 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("Converting " + nameAndExtension[0] + nameAndExtension[1] + " to gif");
console.log(nameAndExtension[0] + nameAndExtension[1]); 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."); 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 currentdate = Date.now();
let expireDate: Date; let expireDate: Date;
if (req.body.expire) { if (req.body.expire) {
@ -122,14 +124,12 @@ export const handleUpload: Middleware = (req, res, next) => {
console.log(expireDate); console.log(expireDate);
} else } else
expireDate = null; expireDate = null;
// @ts-ignore db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [files[file].filename, expireDate], function (err) {
db.run("INSERT INTO media (path, expire) VALUES (?, ?)", [req.files[file].filename, expireDate], function (err) {
if (err) { if (err) {
console.log(err); console.log(err);
return next(err); return next(err);
} }
// @ts-ignore console.log(`Uploaded ${files[file].filename} to database`);
console.log(`Uploaded ${req.files[file].filename} to database`);
if (expireDate == null) if (expireDate == null)
console.log("It will not expire"); console.log("It will not expire");
else if (expireDate != null || expireDate != undefined) else if (expireDate != null || expireDate != undefined)