tiny refactorizing
This commit is contained in:
parent
e799724b3b
commit
eec6df3301
5 changed files with 116 additions and 17 deletions
|
@ -46,12 +46,9 @@ passport.use(
|
|||
}),
|
||||
);
|
||||
|
||||
passport.serializeUser(function (user: User, cb) {
|
||||
process.nextTick(function () {
|
||||
cb(null, {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
});
|
||||
passport.serializeUser((user: User, cb: (err: Error | null, id?: User) => void) => {
|
||||
process.nextTick(() => {
|
||||
cb(null, user); // No need to reconstruct the user object
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ router.get("/oembed/:file",
|
|||
|
||||
try {
|
||||
const oembedData: oembedObj = {
|
||||
type: (videoExtensions.includes(fileExtension) ? "photo" : "video"),
|
||||
type: (videoExtensions.includes(fileExtension) ? "video" : "photo"),
|
||||
version: "1.0",
|
||||
provider_name: "embedder",
|
||||
provider_url: "https://github.com/WaveringAna/embedder",
|
||||
|
@ -134,16 +134,20 @@ router.get("/oembed/:file",
|
|||
url: `${req.protocol}://${req.get("host")}/uploads/${filename}`
|
||||
};
|
||||
|
||||
if (videoExtensions.includes(fileExtension) || fileExtension === '.gif') {
|
||||
if (videoExtensions.includes(fileExtension) || fileExtension === ".gif") {
|
||||
const ffprobeData = await ffProbe(`uploads/${filename}`, filename, fileExtension);
|
||||
oembedData.width = ffprobeData.streams[0].width;
|
||||
oembedData.height = ffprobeData.streams[0].height;
|
||||
|
||||
// Consider generating a thumbnail_url if it's a video
|
||||
|
||||
oembedData.html = `<video width="${oembedData.width}" height="${oembedData.height}" controls><source src="${oembedData.url}" type="video/${fileExtension.substring(1)}">Your browser does not support the video tag.</video>`;
|
||||
} else {
|
||||
const imageData = await imageProbe(fs.createReadStream(`uploads/${filename}`));
|
||||
oembedData.width = imageData.width;
|
||||
oembedData.height = imageData.height;
|
||||
|
||||
oembedData.html = `
|
||||
<img src="${oembedData.url}" width="${oembedData.width}" height="${oembedData.height}" alt="${filename}">
|
||||
`;
|
||||
}
|
||||
|
||||
res.json(oembedData);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue