From 516a054c311ce266f2930d04aa36d2501db1b1ff Mon Sep 17 00:00:00 2001
From: Xodrium <118943715+malloc62@users.noreply.github.com>
Date: Sun, 12 Feb 2023 16:18:59 -0500
Subject: [PATCH] Added external embeds

---
 src/lib/components/FileUpload.svelte |  3 +++
 src/lib/components/PostBody.svelte   | 16 ++++++++++---
 src/lib/db/db.js                     |  5 ++--
 src/lib/util.js                      | 35 +++++++++++++++++++++++++---
 src/routes/api/[route]/+server.js    | 16 +++++++------
 src/routes/embed/+server.js          | 11 +++++++++
 6 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 src/routes/embed/+server.js

diff --git a/src/lib/components/FileUpload.svelte b/src/lib/components/FileUpload.svelte
index 8b28ac6..ed7b988 100644
--- a/src/lib/components/FileUpload.svelte
+++ b/src/lib/components/FileUpload.svelte
@@ -74,6 +74,9 @@
     <p>
         Progress: {progress * 100}%
     </p>
+    {#if form.success}
+        <p>{form.success}</p>
+    {/if}
     <p> 
         <Button class="upload-btn" clickFunc={ () => fileInput.click() }>Upload</Button>
     </p>
diff --git a/src/lib/components/PostBody.svelte b/src/lib/components/PostBody.svelte
index 75d1493..cdc0396 100644
--- a/src/lib/components/PostBody.svelte
+++ b/src/lib/components/PostBody.svelte
@@ -1,10 +1,10 @@
 <style>
-    img {
+    img, video {
         max-width: 100px;
         margin: 5px;
     }
 
-    img.only-img {
+    .only-img {
         max-width: 450px;
     }
 
@@ -34,9 +34,19 @@
                     {:else}
                         <img src={elem.url} alt='Image preview'>
                     {/if}
+                {:else if elem.type == 'video'}
+                    {#if line.filter(x => x.type == 'video').length < 2}
+                        <video class='only-img' alt='Video preview' controls>
+                            <source src={elem.url}>
+                        </video>
+                    {:else}
+                        <video alt='Video preview' controls>
+                            <source src={elem.url}>
+                        </video>
+                    {/if}
                 {:else if elem.type == 'link'}
                     <a href={elem.url}>{elem.display + ' '}</a>
-                {:else}
+                {:else if !elem.type}
                     {elem + ' '}
                 {/if}
             {/each}
diff --git a/src/lib/db/db.js b/src/lib/db/db.js
index a6e04d1..b8165e5 100644
--- a/src/lib/db/db.js
+++ b/src/lib/db/db.js
@@ -14,7 +14,7 @@ const LEGAL_SORTS = [
 
 const FILE_SIZE_LIMIT = 1024*1024*16;
 
-const VALID_EXTENSIONS = ['png','jpg','jpeg','gif','svg']
+const VALID_EXTENSIONS = ['png','jpg','jpeg','gif','svg', 'mp4'];
 
 var ridArray = {};
 
@@ -325,13 +325,12 @@ backend.fileCreate = async({img, extension,id, last }) => {
     const extensionSafe = safePath(extension);
 
     if (VALID_EXTENSIONS.indexOf(extensionSafe) == -1)
-        return { success: 'Illegal file extension.' };
+        return { success: 'Illegal file extension. Permitted file extensions are: ' + VALID_EXTENSIONS.join(', ') };
 
     writeFile(`${process.cwd()}/db/post-${imgHash}.${extensionSafe}`,imgData,{encoding: 'base64'});
 
     return { success: 'Successfully uploaded file.', 'href': `/img/${imgHash}.${extensionSafe}`};
 }
-
 export {
     backendProxy,
     backend
diff --git a/src/lib/util.js b/src/lib/util.js
index b9c2dd9..929dadd 100644
--- a/src/lib/util.js
+++ b/src/lib/util.js
@@ -1,3 +1,12 @@
+const EXTENSION_MAP = {
+    'png': 'img',
+    'jpg': 'img',
+    'jpeg': 'img',
+    'gif': 'img',
+    'svg': 'img', 
+    'mp4': 'video'
+}
+
 let checkLength = function(string, field, lowerBound, upperBound) {
     if (string.length < lowerBound) {
         if (string.length == 0) {
@@ -74,8 +83,12 @@ let formatPost = function(post) {
     
                 if (cap1 == 'img') {
                     var matchCleaned = safePath(splitPost[1]);
-                    splitPost = {'type': 'img', 'url': `/img/${matchCleaned}`};
-    
+                    var extension = matchCleaned.split('.').pop().toLowerCase();
+
+                    extension = safeName(extension);
+
+                    splitPost = {'type': EXTENSION_MAP[extension] || 'none', 'url': `/img/${matchCleaned}`};
+
                     return splitPost;
                 }
             } else if (subPost[0] == '@' || subPost[0] == '#') {
@@ -85,12 +98,28 @@ let formatPost = function(post) {
 
                 splitPost = {'type': 'link', 'display': subPost, 'subtype': type, 'url': `/${type}/${subPostIn}`};
 
+                return splitPost;
+            } else if (subPost.startsWith('https://')) {
+                var url;
+                var extension = subPost.split('.').pop().toLowerCase();
+
+                if (EXTENSION_MAP[extension]) {
+                    url = `/embed?url=${encodeURIComponent(subPost)}`;
+                    splitPost = [
+                        {'type': 'link', 'display': subPost, 'url': url},
+                        {'type': EXTENSION_MAP[extension] || 'link', 'display': subPost, 'url': url}
+                    ];
+                } else {
+                    url = subPost;
+                    splitPost = {'type': EXTENSION_MAP[extension] || 'link', 'display': subPost, 'url': url};
+                }
+
                 return splitPost;
             }
 
             return subPost;
         })
-        return line;
+        return line.flat();
     });
 
     return post;
diff --git a/src/routes/api/[route]/+server.js b/src/routes/api/[route]/+server.js
index c77e641..256b472 100644
--- a/src/routes/api/[route]/+server.js
+++ b/src/routes/api/[route]/+server.js
@@ -2,29 +2,31 @@ import { backend, backendProxy } from '../../../lib/db/db.js';
 
 
 /** @type {import('./$types').RequestHandler} */
-export async function GET({ url, cookies, params }) {
+export async function GET({ url, cookies, params, fetch }) {
     const formEntries = url.searchParams;
     return await handleReq({
         cookies,
         params: formEntries,
-        route: params.route
+        route: params.route,
+        fetch
     });
 }
 
 /** @type {import('./$types').RequestHandler} */
-export async function POST({ cookies, request, params }) {
+export async function POST({ cookies, request, params, fetch }) {
 
     const formEntries = (await request.formData()).entries();
     
     return await handleReq({
         cookies,
         params: formEntries,
-        route: params.route
+        route: params.route,
+        fetch
     });
 }
 
-async function handleReq({ cookies, params, route }) {
-    var backendParams = {cookies};
+async function handleReq({ cookies, params, route, fetch }) {
+    var backendParams = {cookies,fetch};
 
     for (const [key, value] of params) {
         backendParams[key] = value + '';
@@ -33,7 +35,7 @@ async function handleReq({ cookies, params, route }) {
     return await mainApi({backendParams, route: route});
 }
 
-async function mainApi({backendParams, route}) {
+async function mainApi({backendParams, route, fetch}) {
     if (Object.keys(backend).indexOf(route) == -1) {
         return new Response(JSON.stringify({success: 'route doesn\'t exist'}));
     }
diff --git a/src/routes/embed/+server.js b/src/routes/embed/+server.js
new file mode 100644
index 0000000..af70d29
--- /dev/null
+++ b/src/routes/embed/+server.js
@@ -0,0 +1,11 @@
+
+/** @type {import('./$types').RequestHandler} */
+export async function GET({ url, fetch }) {
+    const urlParam = url.searchParams.get('url');
+
+    const output = await fetch(urlParam);
+
+    return new Response(await output.blob(), {'headers': {
+        'Content-Type': output.headers.get("Content-Type")
+    }});
+}
\ No newline at end of file