fix spaces

This commit is contained in:
waveringana 2022-12-10 19:09:27 +00:00
parent f83c5aa423
commit 135c772723
7 changed files with 331 additions and 339 deletions

View file

@ -20,79 +20,78 @@ import {checkAuth, checkSharexAuth, createEmbedData, handleUpload} from "./middl
let upload = multer({ storage: fileStorage /**, fileFilter: fileFilter**/ }); //maybe make this a env variable?
const fetchMedia: Middleware = (req, res, next) => {
let admin: boolean = req.user.username == "admin" ? true : false
let query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`;
let admin: boolean = req.user.username == "admin" ? true : false
let query: string = admin == true ? "SELECT * FROM media" : `SELECT * FROM media WHERE username = '${req.user.username}'`;
db.all(query, (err:Error, rows: []) => {
if (err) return next(err);
let files = rows.map((row: MediaRow)=> {
return {
id: row.id,
path: row.path,
expire: row.expire,
username: row.username,
url: "/" + row.id
};
});
res.locals.files = files.reverse(); //reverse so newest files appear first
res.locals.Count = files.length;
next();
});
db.all(query, (err:Error, rows: []) => {
if (err) return next(err);
let files = rows.map((row: MediaRow)=> {
return {
id: row.id,
path: row.path,
expire: row.expire,
username: row.username,
url: "/" + row.id
};
});
res.locals.files = files.reverse(); //reverse so newest files appear first
res.locals.Count = files.length;
next();
});
}
let router = express.Router();
router.get("/", (req: Request, res: Response, next: NextFunction) => {
if (!req.user)
return res.render("home")
next();
if (!req.user)
return res.render("home")
next();
}, fetchMedia, (req: Request, res: Response) => {
res.locals.filter = null;
res.render("index", { user: req.user });
res.locals.filter = null;
res.render("index", { user: req.user });
});
router.get("/gifv/:file", async (req: Request, res: Response, next: NextFunction) => {
let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
let width; let height;
let url = `${req.protocol}://${req.get("host")}/uploads/${req.params.file}`;
let width; let height;
let nameAndExtension = extension(`uploads/${req.params.file}`);
if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".gif") {
ffmpeg()
.input(`uploads/${req.params.file}`)
.inputFormat(nameAndExtension[1].substring(1))
.ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err);
width = data.streams[0].width;
height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
});
} else {
let imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`));
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: imageData.width, height: imageData.height });
}
let nameAndExtension = extension(`uploads/${req.params.file}`);
if (nameAndExtension[1] == ".mp4" || nameAndExtension[1] == ".mov" || nameAndExtension[1] == ".webm" || nameAndExtension[1] == ".gif") {
ffmpeg()
.input(`uploads/${req.params.file}`)
.inputFormat(nameAndExtension[1].substring(1))
.ffprobe((err: Error, data: ffmpeg.FfprobeData) => {
if (err) return next(err);
width = data.streams[0].width;
height = data.streams[0].height;
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: width, height: height });
});
} else {
let imageData = await imageProbe(fs.createReadStream(`uploads/${req.params.file}`));
return res.render("gifv", { url: url, host: `${req.protocol}://${req.get("host")}`, width: imageData.width, height: imageData.height });
}
});
router.post("/", [checkAuth, upload.array("fileupload"), createEmbedData, handleUpload], (req: Request, res: Response) => {
res.redirect("/")
res.redirect("/")
});
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}`);
return res.send(`${req.protocol}://${req.get("host")}/uploads/${req.file.filename}`);
});
router.post("/:id(\\d+)/delete", [checkAuth], async (req: Request, res: Response, next: NextFunction) => {
const path: any = await getPath(req.params.id)
fs.unlink(`uploads/${path.path}`, async (err) => {
if (err && err.errno == -4058) {
await deleteId("media", req.params.id).then(()=> {
return res.redirect("/");
})
} else {
await deleteId("media", req.params.id).then(()=> {
return res.redirect("/");
})
}
})
const path: any = await getPath(req.params.id)
fs.unlink(`uploads/${path.path}`, async (err) => {
if (err && err.errno == -4058) {
await deleteId("media", req.params.id).then(()=> {
return res.redirect("/");
})
}
await deleteId("media", req.params.id).then(()=> {
return res.redirect("/");
})
})
});
export default router;