From 32a55d00b2a548d5a196243e2d341563763cebe9 Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Fri, 16 Nov 2018 12:30:15 -0800
Subject: [PATCH] don't render expired uploads

---
 android/pages/home.js |  1 +
 app/ui/home.js        | 21 +++++++++++----------
 app/utils.js          | 16 ++++++++++++++--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/android/pages/home.js b/android/pages/home.js
index 7a81203d..71db6190 100644
--- a/android/pages/home.js
+++ b/android/pages/home.js
@@ -18,6 +18,7 @@ module.exports = function(state, emit) {
   }
 
   const archives = state.storage.files
+    .filter(archive => !archive.expired)
     .map(archive => archiveTile(state, emit, archive))
     .reverse();
 
diff --git a/app/ui/home.js b/app/ui/home.js
index 813c3286..8e031f09 100644
--- a/app/ui/home.js
+++ b/app/ui/home.js
@@ -5,9 +5,9 @@ const modal = require('./modal');
 const intro = require('./intro');
 
 module.exports = function(state, emit) {
-  const archives = state.storage.files.map(archive =>
-    archiveTile(state, emit, archive)
-  );
+  const archives = state.storage.files
+    .filter(archive => !archive.expired)
+    .map(archive => archiveTile(state, emit, archive));
   let left = '';
   if (state.uploading) {
     left = archiveTile.uploading(state, emit);
@@ -23,11 +23,12 @@ module.exports = function(state, emit) {
       : list(archives, 'list-reset h-full overflow-y-scroll', 'mb-3');
 
   return html`
-  <main class="main relative">
-    ${state.modal && modal(state, emit)}
-    <section class="h-full w-full p-6 md:flex md:flex-row z-10">
-      <div class="md:mr-6 md:w-1/2">${left}</div>
-      <div class="md:w-1/2 mt-6 md:mt-0">${right}</div>
-    </section>
-  </main>`;
+    <main class="main relative">
+      ${state.modal && modal(state, emit)}
+      <section class="h-full w-full p-6 md:flex md:flex-row z-10">
+        <div class="md:mr-6 md:w-1/2">${left}</div>
+        <div class="md:w-1/2 mt-6 md:mt-0">${right}</div>
+      </section>
+    </main>
+  `;
 };
diff --git a/app/utils.js b/app/utils.js
index 761477ca..174cd238 100644
--- a/app/utils.js
+++ b/app/utils.js
@@ -184,8 +184,17 @@ async function streamToArrayBuffer(stream, size) {
 }
 
 function list(items, ulStyle = '', liStyle = '') {
-  const lis = items.map(i => html`<li class="${liStyle}">${i}</li>`);
-  return html`<ul class="${ulStyle}">${lis}</ul>`;
+  const lis = items.map(
+    i =>
+      html`
+        <li class="${liStyle}">${i}</li>
+      `
+  );
+  return html`
+    <ul class="${ulStyle}">
+      ${lis}
+    </ul>
+  `;
 }
 
 function secondsToL10nId(seconds) {
@@ -199,6 +208,9 @@ function secondsToL10nId(seconds) {
 }
 
 function timeLeft(milliseconds) {
+  if (milliseconds < 1) {
+    return { id: 'linkExpiredAlt' };
+  }
   const minutes = Math.floor(milliseconds / 1000 / 60);
   const hours = Math.floor(minutes / 60);
   const days = Math.floor(hours / 24);