From 1a0d85cc6c1c4f8441df2bf63e7551ea9dd7e8cf Mon Sep 17 00:00:00 2001
From: Bobby Wibowo <bobbywibowo98@gmail.com>
Date: Mon, 9 Sep 2019 01:21:01 +0700
Subject: [PATCH] Updated

---
 config.sample.js   |  7 ++++++-
 public/js/home.js  |  2 +-
 views/_globals.njk |  2 +-
 views/faq.njk      | 20 +++++++++++---------
 views/home.njk     |  7 ++++++-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/config.sample.js b/config.sample.js
index 981e493..0801679 100644
--- a/config.sample.js
+++ b/config.sample.js
@@ -219,7 +219,12 @@ module.exports = {
       6, // 6 hours
       12, // 12 hours
       24, // 24 hours (1 day)
-      168 // 168 hours (7 days)
+      24 * 2, // 48 hours (2 days)
+      24 * 3, // 72 hours (3 days)
+      24 * 4, // 96 hours (4 days)
+      24 * 5, // 120 hours (5 days)
+      24 * 6, // 144 hours (6 days)
+      24 * 7 // 168 hours (7 days)
     ],
 
     /*
diff --git a/public/js/home.js b/public/js/home.js
index 7fd9447..06809a5 100644
--- a/public/js/home.js
+++ b/public/js/home.js
@@ -648,7 +648,7 @@ page.getPrettyUploadAge = function (hours) {
   } else if (hours < 1) {
     const minutes = hours * 60
     return `${minutes} minute${minutes === 1 ? '' : 's'}`
-  } else if (hours > 24) {
+  } else if (hours >= 24) {
     const days = hours / 24
     return `${days} day${days === 1 ? '' : 's'}`
   } else {
diff --git a/views/_globals.njk b/views/_globals.njk
index 67c9389..9a5d675 100644
--- a/views/_globals.njk
+++ b/views/_globals.njk
@@ -16,7 +16,7 @@
   v3: CSS and JS files (libs such as bulma, lazyload, etc).
   v4: Renders in /public/render/* directories (to be used by render.js).
 #}
-{% set v1 = "NtoADODipl" %}
+{% set v1 = "o59f6p3y1F" %}
 {% set v2 = "hiboQUzAzp" %}
 {% set v3 = "tWLiAlAX5i" %}
 {% set v4 = "S3TAWpPeFS" %}
diff --git a/views/faq.njk b/views/faq.njk
index d3b4bdf..f2f8835 100644
--- a/views/faq.njk
+++ b/views/faq.njk
@@ -21,7 +21,9 @@
     <h2 class='subtitle'>Will you keep my files forever?</h2>
     <article class="message">
       <div class="message-body">
-        Unless I receive a copyright complain or some other bullshit, I will.
+        Unless I receive a copyright complain, or some other bullshit, I will.<br>
+        However, we also have temporary uploads feature which will automatically delete your files after a certain period of time.<br>
+        You can configure the feature through our homepage's config tab.
       </div>
     </article>
 
@@ -36,9 +38,9 @@
     <article class="message">
       <div class="message-body">
         Albums are a simple way of sorting uploads together.<br>
-        As long as you are logged in, you can create albums through the homepage or the dashboard,<br>
+        As long as you are logged in, you can create albums through our homepage or dashboard,<br>
         then afterwards you can use them with our <a href="https://addons.mozilla.org/en-US/firefox/addon/lolisafe/" target="_blank" rel="noopener">Firefox extension</a> or <a href="https://chrome.google.com/webstore/detail/loli-safe-uploader/enkkmplljfjppcdaancckgilmgoiofnj" target="_blank" rel="noopener">Chrome extension</a>,<br>
-        which will enable you to <strong>right click -> send file to safe</strong> or to a desired album if you have any.<br>
+        which will enable you to <strong>right click -> send file to safe</strong>, or to a desired album if you have any.<br>
         You will have to set the domain in the extension's settings to <strong>https://safe.fiery.me</strong> though.
       </div>
     </article>
@@ -69,7 +71,7 @@
     <article class="message">
       <div class="message-body">
         Paris, France.<br>
-        We are using Cloudflare though, so you can expect your uploads to be delivered quickly all over the world after they have been cached.
+        We are using <a href="https://www.cloudflare.com/cdn/" target="_blank" rel="noopener">Cloudflare</a> though, so you can expect your uploads to be delivered quickly all over the world after they have been cached.
       </div>
     </article>
 
@@ -99,11 +101,11 @@
     {%- endif %}
 
     {% if chunkSize -%}
-    <h2 class='subtitle'>Does your API support chunked uploads?</h2>
+    <h2 class='subtitle'>So your API supports chunked uploads?</h2>
     <article class="message">
       <div class="message-body">
-        Yes, the homepage uploader is hard-coded to chunk uploads into {{ chunkSize }} MB pieces by default.<br>
-        If you want to chunk your API uploads, feel free to read the source code to see how it works.
+        Yes, the homepage uploader was coded to chunk uploads into {{ chunkSize }} MB pieces by default (chunk size is configurable through the config tab).<br>
+        If you want to chunk your API uploads, feel free to read the <a href="https://github.com/BobbyWibowo/lolisafe" target="_blank" rel="noopener">source code</a> to see how it works.
       </div>
     </article>
     {%- endif %}
@@ -113,9 +115,9 @@
       <div class="message-body">
         {% if extensionsFilter.length -%}
           {%- if whitelist -%}
-          We support any file extensions except the following: {{ extensionsFilter | join(', ') }}.
-          {%- else -%}
           We only support the following extensions:
+          {%- else -%}
+          We support any file extensions, except the following:
           {%- endif -%}<br>
           {% set comma = joiner(' ') -%}
           {%- for extension in extensionsFilter -%}
diff --git a/views/home.njk b/views/home.njk
index 7545805..03ec4fc 100644
--- a/views/home.njk
+++ b/views/home.njk
@@ -131,6 +131,7 @@
                     </select>
                   </div>
                 </div>
+                <p class="help">This will be used in our homepage, dashboard, and album public pages.</p>
               </div>
               <div id="fileLengthDiv" class="field" style="display: none">
                 <label class="label">File identifier length</label>
@@ -147,6 +148,7 @@
                     <select id="uploadAge"></select>
                   </div>
                 </div>
+                <p class="help">This allows your files to automatically be deleted after a certain period of time.</p>
               </div>
               {%- endif %}
               <div id="chunkSizeDiv" class="field">
@@ -172,7 +174,10 @@
                     <span>Save & reload</span>
                   </button>
                 </p>
-                <p class="help">This configuration will only be used in this browser.</p>
+                <p class="help">
+                  This configuration will only be used in this browser.<br>
+                  After reloading the page, some of them will also be applied to the ShareX config that you can download by clicking on the ShareX icon below.
+                </p>
               </div>
             </form>
           </div>