From 3562fe2d24c7b81e6d957a6c132680738f9d7fbf Mon Sep 17 00:00:00 2001
From: Joe Ma <rikkaneko23@gmail.com>
Date: Thu, 13 Oct 2022 01:32:29 +0800
Subject: [PATCH] Update paste info formatting

Update paste.html style

Signed-off-by: Joe Ma <rikkaneko23@gmail.com>
---
 paste.html   | 8 ++++----
 src/index.ts | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/paste.html b/paste.html
index 8c6d9a8..3e30194 100644
--- a/paste.html
+++ b/paste.html
@@ -51,15 +51,15 @@
     <div>
       <h4>Settings</h4>
       <label for="pass_input">Password: </label>
-      <input id="pass_input" type="password" name="pass">
+      <input id="pass_input" type="password" name="pass" style="margin-left: 7px;">
       <input id="show_pass_button" type="checkbox">
       <label for="show_pass_button">Show</label>
     </div>
-    <div>
+    <div style="margin-top: 1px;">
       <label for="read_limit_input">Read limit: </label>
-      <input id="read_limit_input" type="number" name="read-limit" min="1" style="width: 3em">
+      <input id="read_limit_input" type="number" name="read-limit" min="1" style="margin-left: 2px; width: 3em">
     </div>
-    <div>
+    <div style="margin-top: 2px;">
       <input id="show_qr_checkbox" type="checkbox" name="qrcode" checked>
       <label for="show_qr_checkbox">Show QR code on sumbitted</label>
     </div>
diff --git a/src/index.ts b/src/index.ts
index 209b704..68b22af 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -512,19 +512,21 @@ export default {
 };
 
 async function get_paste_info(uuid: string, descriptor: PasteIndexEntry, env: Env, use_html: boolean = true, need_qr: boolean = false): Promise<Response> {
-  const date = new Date(descriptor.last_modified);
+  const created = new Date(descriptor.last_modified);
+  const expired = new Date(descriptor.last_modified + 2419200000);
   const link = `https://${SERVICE_URL}/${uuid}`;
   let content = dedent`
     id: ${uuid}
     link: ${link}
-    title: ${descriptor.title || '<empty>'}
+    title: ${descriptor.title?.trim() || '-'}
     mime-type: ${descriptor.mime_type ?? '-'}
     size: ${descriptor.size} bytes (${to_human_readable_size(descriptor.size)})
     password: ${(!!descriptor.password)}
     editable: ${descriptor.editable ? descriptor.editable : true}
     remaining read count: ${descriptor.read_count_remain !== undefined ?
       descriptor.read_count_remain ? descriptor.read_count_remain : `0 (expired)` : '-'}
-    created at ${date.toISOString()}
+    created at ${created.toISOString()}
+    expired at ${expired.toISOString()}
     `;
 
   // Browser response