add upload preview

change to webp format

js/posts.js

@@ -162,7 +162,9 @@ async function reply_link_clicked(reply_channel,reply_id) {
 const image_types = {
   "png":true,
   "jpg":true,
-  "jpeg":true
+  "jpeg":true,
+  "webp":true,
+  "jfif":true
 }
 
 function iconLink(name) {
@@ -173,7 +175,7 @@ function iconLink(name) {
   console.log(name,name.lastIndexOf("\."),name.substring(name.lastIndexOf("\.")+1));
   let extension = name.substring(name.lastIndexOf("\.")+1)
   if(extension in image_types) {
-    return "/user_uploads/"+name;
+    return "/user_uploads/previews/"+name;
   }
   return "/api/getFileIcon/"+extension
 }

routes/api/post.js

@@ -1,3 +1,14 @@
+import sharp from "sharp";
+import {writeFile} from "fs";
+
+const image_types = {
+    "png":true,
+    "jpg":true,
+    "jpeg":true,
+    "webp":true,
+    "jfif":true
+}
+
 export const setup = function (router, con, server) {
     const PIDS = {}; //[pid]: true/"already_used"
 
@@ -86,103 +97,48 @@ export const setup = function (router, con, server) {
         console.log(req.body);
         let __dirname = server.dirname
 
-        let file0_name="",file1_name="",file2_name="",file3_name="",file4_name = ""
+        const file_names = ["","","","",""]
         if(isNotNull(req.files)) {
-            if(isNotNull(req.files.file_0)) {
+            for(let file_index=0;file_index<5;file_index++) {
-                let file = req.files["file_0"]
+                if(isNotNull(req.files[`file_${file_index}`])) {
-                const file0_id = server.genstring(20)
+                    let file = req.files[`file_${file_index}`]
-                console.log(file.name);
+                    const file_id = server.genstring(20)
-                file0_name = file0_id+"/"+(file.name.substring(0,25))
+                    const file_name = `${file_id}/${(file.name.substring(0,25)).replace(/\.[^/.]+$/, "")}`
-                server.ensureExists(__dirname + "/user_uploads/"+file0_id,undefined,(err)=>{
+                    let extension = file.name.substring(file.name.lastIndexOf("\.")+1)
+                    file_names[file_index]=`${file_name}${(extension in image_types && ".webp") || extension}`
+                    server.ensureExists(`${__dirname}/user_uploads/${file_id}`,undefined,async (err)=>{
                         if(err) {
                             console.error(err)
                             return;
                         }
-                    file.mv(__dirname + "/user_uploads/"+file0_name,(err2) => {
+                        if(extension in image_types) {
-                        if(err2) {
+                            writeFile(`${__dirname}/user_uploads/${file_name}.webp`,await sharp(file.data).webp({mixed:true,effort:6}).toBuffer(),(err2)=>{
-                            console.error(err2)
+                                if(err2)console.error(err2)
+                            })
+                            server.ensureExists(`${__dirname}/user_uploads/previews/${file_id}`,undefined,async (error) => {
+                                if(error) {
+                                    console.error(error)
                                     return;
                                 }
+                                writeFile(`${__dirname}/user_uploads/previews/${file_name}.webp`,await sharp(file.data).resize(50,28,{fit: "inside"}).webp({mixed:true,effort:6}).toBuffer(),(error2)=>{
+                                    if(error2)console.error(error2)
                                 })
                             })
-            }
+                        } else {
-            if(isNotNull(req.files.file_1)) {
+                            file.mv(`${__dirname}/user_uploads/${file_name}.${extension}`,(err2)=>{
-                let file = req.files["file_1"]
+                                if(err2)console.error(err2)
-                const file1_id = server.genstring(20)
-                console.log(file.name);
-                file1_name = file1_id+"/"+(file.name.substring(0,25))
-                server.ensureExists(__dirname + "/user_uploads/"+file1_id,undefined,(err)=>{
-                    if(err) {
-                        console.error(err)
-                        return;
-                    }
-                    file.mv(__dirname + "/user_uploads/"+file1_name,(err2) => {
-                        if(err2) {
-                            console.error(err2)
-                            return;
-                        }
-                    })
                             })
                         }
-            if(isNotNull(req.files.file_2)) {
-                let file = req.files["file_2"]
-                const file2_id = server.genstring(20)
-                console.log(file.name);
-                file2_name = file2_id+"/"+(file.name.substring(0,25))
-                server.ensureExists(__dirname + "/user_uploads/"+file2_id,undefined,(err)=>{
-                    if(err) {
-                        console.error(err)
-                        return;
-                    }
-                    file.mv(__dirname + "/user_uploads/"+file2_name,(err2) => {
-                        if(err2) {
-                            console.error(err2)
-                            return;
-                        }
-                    })
                     })
+                } else {
+                    break
                 }
-            if(isNotNull(req.files.file_3)) {
-                let file = req.files["file_3"]
-                const file3_id = server.genstring(20)
-                console.log(file.name);
-                file3_name = file3_id+"/"+(file.name.substring(0,25))
-                server.ensureExists(__dirname + "/user_uploads/"+file3_id,undefined,(err)=>{
-                    if(err) {
-                        console.error(err)
-                        return;
-                    }
-                    file.mv(__dirname + "/user_uploads/"+file3_name,(err2) => {
-                        if(err2) {
-                            console.error(err2)
-                            return;
-                        }
-                    })
-                })
-            }
-            if(isNotNull(req.files.file_4)) {
-                let file = req.files["file_4"]
-                const file4_id = server.genstring(20)
-                console.log(file.name);
-                file4_name = file4_id+"/"+(file.name.substring(0,25))
-                server.ensureExists(__dirname + "/user_uploads/"+file4_id,undefined,(err)=>{
-                    if(err) {
-                        console.error(err)
-                        return;
-                    }
-                    file.mv(__dirname + "/user_uploads/"+file4_name,(err2) => {
-                        if(err2) {
-                            console.error(err2)
-                            return;
-                        }
-                    })
-                })
             }
         }
         
 
         let sql = `insert into ipost.posts (post_user_name,post_text,post_time,post_receiver_name,post_from_bot,post_reply_id,file_0,file_1,file_2,file_3,file_4) values (?,?,?,?,?,?,?,?,?,?,?);`;
-        let values = [encodeURIComponent(res.locals.username), req.body.message, Date.now(), req.body.receiver, res.locals.isbot, reply_id,file0_name,file1_name,file2_name,file3_name,file4_name];
+        let values = [encodeURIComponent(res.locals.username), req.body.message, Date.now(), req.body.receiver, res.locals.isbot, reply_id,...file_names];
         con.query(sql, values, function (err, result) {
             if (err){
                 res.status(500)
@@ -199,13 +155,7 @@ export const setup = function (router, con, server) {
                 post_from_bot: res.locals.isbot,
                 post_reply_id: reply_id,
                 user_avatar: res.locals.avatar,
-                files: [
+                files: file_names
-                    file0_name,
-                    file1_name,
-                    file2_name,
-                    file3_name,
-                    file4_name
-                ]
             };
             let message = {
                 message: "new_post",

server.js

@@ -56,7 +56,7 @@ async function addTextOnImage(text,buf) {
                 top: 0,
                 left: 0,
             },
-            ]).toBuffer()
+            ]).webp({effort:6}).toBuffer()
     } catch (error) {
         console.log(error);
     }