From ef3d5b381735c4ac9420673aca09bf74dad6bcaa Mon Sep 17 00:00:00 2001
From: Mystikfluu <Mystikfluu@gmail.com>
Date: Mon, 5 Sep 2022 15:53:07 +0200
Subject: [PATCH] fix and improve various things

---
 images/empty_file.png | Bin 212 -> 517 bytes
 js/posts.js           |   6 +++++
 server.js             |  59 +++++++++++++++++++++++++++---------------
 views/index.html      |  15 +++++++----
 views/posts.html      |   6 +++--
 5 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/images/empty_file.png b/images/empty_file.png
index e5e75eb81646672c72fbea19bf62c9d74630b656..d38a33a08ccf1fa58e7023e0daafa00d894b99eb 100644
GIT binary patch
literal 517
zcmeAS@N?(olHy`uVBq!ia0vp^kw9F*!3HE}{*JQ&QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKn=4zT^vIy;@;kH%xek|aR_{SjMKYtsoDO6
zS0dJSRJcF)xi{NjXUqH#{q6hDoqlqCuixssb~W>sWkyOqtBl+BcH#bMmK=W$yeyGQ
z{w!YCsq;bjeT&>g*0{{<7q1^TiEe8Vt85N;?%s1zd!cLH;aeA!_GkKLOf3JPv*m>K
zPkkU!B@*>y?p<!(PwaQv<jlS6R?pwDtMm3FjZf^l`p;kN;OLMMuv92=c+zl!aU!!4
zy9?it7O>F!Y~y=*)28;ydB=aetnReo*gN_4fy1Rw9AB8<Ws}QO=6{~L>FnNRHP;?~
a;C;N+{i+(@h1tNUWAJqKb6Mw<&;$TDi^Ep{

literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^DL_1pi5W<SUORdfNbv;tgt!9f`uchxxp3ja-B%3X
z0$GeDL4Lsu4$p3+0Xb!!E{-7{$KPJx$lGAR<8o0WmTh6;e3vObk5q3k8csd#A=>OJ
zDbKv%_gn4tyS`kkI=i>%%1Sl9ootKrR42XL<YKg7hC`r+?5Tz%Cf9`}8q8gsBD_oO
zoag8zO1C;K4A2na0#bi`xF*=9Dm*%Gx~g&eYjf^$W@Vj|tu8Hh%7HFm@O1TaS?83{
F1OWPgN&5f*

diff --git a/js/posts.js b/js/posts.js
index 541f580..fd0c7bf 100644
--- a/js/posts.js
+++ b/js/posts.js
@@ -369,6 +369,12 @@ function addFile(file) {
     return;
   }
   files[files.length]=file
+  const fileimg = createElement("img")
+  console.log(file.name,file.name.lastIndexOf("\."),file.name.substring(file.name.lastIndexOf("\.")+1));
+  fileimg.src = "/api/getFileIcon/"+file.name.substring(file.name.lastIndexOf("\.")+1)
+
+  getById("filesDiv").appendChild(fileimg)
+  //filesDiv
   console.log("File added: ", file.name, file.type, file.size);
 }
 
diff --git a/server.js b/server.js
index db43d30..a7c3d7e 100644
--- a/server.js
+++ b/server.js
@@ -11,7 +11,7 @@ import sharp from "sharp"
 import SHA from "./extra_modules/SHA.js";
 import getIP from "./extra_modules/getip.js";
 import unsign from "./extra_modules/unsign.js";
-import { readFileSync, mkdir, existsSync, appendFile, unlinkSync, writeFileSync } from "fs";
+import { readFileSync, mkdir, existsSync, appendFile, unlinkSync, writeFileSync, readFile } from "fs";
 import { format } from "util";
 import { setup as optionssetup } from "./routes/api/options.js";
 import { setup as allsetup } from "./routes/api/all.js";
@@ -28,8 +28,12 @@ const __dirname = dirname(__filename)
 
 async function addTextOnImage(text,buf) {
     try {
-        const width = text.length*30; // 10 pixels per character
-        const height = 30;
+        let img = await sharp(buf)
+
+        const metadata = await img.metadata()
+
+        const width = metadata.width;
+        const height = metadata.height;
 
         const svgImage = `
         <svg width="${width}" height="${height}">
@@ -40,13 +44,11 @@ async function addTextOnImage(text,buf) {
         </svg>
         `;
 
-        let img = await sharp(buf)
-
         return await img
             .composite([
             {
                 input: Buffer.from(svgImage),
-                top: 70,
+                top: 0,
                 left: 0,
             },
             ]).toBuffer()
@@ -436,11 +438,6 @@ app.use("/*", function (req, res, next) {
     }
     next();
 });
-router.get("/", function (req, res) {
-    if (!increaseUSERCall(req, res))
-        return;
-    res.sendFile(dir + "views/index.html");
-});
 console.log(5, "finished loading user routes, starting with api routes");
 /*
 
@@ -909,30 +906,34 @@ let global_page_variables = {
     loadfile: load_var,
     getChannels: get_channels,
     getPID: get_pid,
-    getDMPID: get_dmpid
+    getDMPID: get_dmpid,
+    cookiebanner: `<script id="cookieyes" type="text/javascript" src="https://cdn-cookieyes.com/client_data/3cf33f6b631f3587bf83813b/script.js"></script>`
 }
 
-router.get("/*", async function(request, response) {
+async function handleUserFiles(request, response, overrideurl) {
     if (!increaseUSERCall(request, response))return;
-    
-    let originalUrl = request.originalUrl.split("?").shift();
+    if(typeof overrideurl != "string")overrideurl = undefined;
+
+    let originalUrl = overrideurl || request.originalUrl.split("?").shift();
 
     let path = ""
-
-    if (existsSync(dir + "views/" + originalUrl + ".html")) {
-        path = dir + "views/" + originalUrl + ".html"
-        //return response.sendFile(dir + "views/" + originalUrl + ".html");
-    }
     if (existsSync(dir + "views" + originalUrl)) {
         path = dir + "views" + originalUrl
         //return response.sendFile(dir + "views" + originalUrl);
     }
+    if (existsSync(dir + "views/" + originalUrl + "index.html")) {
+        path = dir + "views/" + originalUrl + "index.html"
+    }
+    if (existsSync(dir + "views/" + originalUrl + ".html")) {
+        path = dir + "views/" + originalUrl + ".html"
+        //return response.sendFile(dir + "views/" + originalUrl + ".html");
+    }
     if (existsSync(dir + "views" + originalUrl + ".html")) {
         path = dir + "views" + originalUrl + ".html"
         //return response.sendFile(dir + "views" + originalUrl + ".html");
     }
 
-    if(path != "" && originalUrl != "/favicon.ico") {
+    if(path != "" && originalUrl != "/favicon.ico" && originalUrl != "/api/documentation/") {
         global_page_variables.user = { "username": response.locals.username, "bio": response.locals.bio, "avatar": response.locals.avatar }
         ejs.renderFile(path,global_page_variables,{async: true},async function(err,str){
             str = await str
@@ -975,14 +976,30 @@ router.get("/*", async function(request, response) {
         return
     }
 
+    if(originalUrl == "/api/documentation/") {
+        readFile(path,function(err,res){
+            response.send(res.toString())
+        })
+        return
+    }
+
     console.log(5,"no file found",originalUrl);
     try {
         response.status(404).send("No file with that name found");
     } catch(err) {
         console.error(err)
     }
+}
+
+router.get("/", function (req, res) {
+    // if (!increaseUSERCall(req, res))
+    //     return;
+    handleUserFiles(req,res,"/index")
+    //res.sendFile(dir + "views/index.html");
 });
 
+router.get("/*", handleUserFiles);
+
 router.post("/register", async function (req, res) {
     for (let i = 0; i < 10; i++) { //don't want people spam registering
         if (!increaseAPICall(req, res))
diff --git a/views/index.html b/views/index.html
index bc8e87b..9fca869 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,14 +1,19 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
-  <link rel="stylesheet" href="/css/logon.css">
-  <link rel="stylesheet" href="/css/global.css">
-  <script src="/js/index.js" charset="utf-8"></script>
-  <script src="/js/addnavbar.js" charset="utf-8"></script>
-  <script src="/js/warn_message.js" charset="utf-8"></script>
+  <style>
+    <%- globalcss %>
+    <%- loadfile("./css/logon.css") %>
+  </style>
+  <script async><%- loadfile("./js/index.js") %></script>
+  <script async>
+    <%- warnmessagejs %>
+  </script>
+  <%- cookiebanner %>
 </head>
 
 <body>
+  <%- navbar %>
     <header>
         <h1 class="noselect">IPost</h1>
     </header>
diff --git a/views/posts.html b/views/posts.html
index b1054c4..cde1fc6 100644
--- a/views/posts.html
+++ b/views/posts.html
@@ -7,13 +7,14 @@
       <%- globalcss %>
       <%- loadfile("./css/posts.css") %>
     </style>
-    <script type="text/javascript">
+    <script type="text/javascript" async>
       <%- httppostjs %>
       <%- htmlescapejs %>
       <%- markdownjs %>
       <%- warnmessagejs %>
       let channels = <%- JSON.stringify(await getChannels()) %>,user = <%- JSON.stringify(user) %>,posting_id = "<%- getPID() %>"
     </script>
+    <%- cookiebanner %>
   </head>
   <body>
     <%- navbar %>
@@ -35,10 +36,11 @@
         <textarea name="name" id="post-text" rows="8" cols="80"></textarea>
         <br>
         <button type="button" name="button" id="post-btn" onclick="postMessage()">Post</button>
+        <div class="files" id="filesDiv"></div>
       </div>
       <div class="channelTab" id="channelTab"></div>
       <div class="posts" id="posts"></div>
     </div>
-    <script><%- loadfile("./js/posts.js") %></script>
+    <script async><%- loadfile("./js/posts.js") %></script>
   </body>
 </html>