From 93299bd72fce1a9908f93236e9e3d9e88e4f29b8 Mon Sep 17 00:00:00 2001
From: codl <codl@codl.fr>
Date: Sat, 6 Oct 2018 01:30:37 +0200
Subject: [PATCH] polish archive size warning

copy, styling

lowered the threshold to 10 MB and made it not disable the form in case
someone does have a giant tweet archive
---
 assets/styles.css           | 10 ++++++++++
 components/ArchiveForm.html | 13 +++++++++----
 templates/logged_in.html    |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/assets/styles.css b/assets/styles.css
index b5fbfcb..cdaeaae 100644
--- a/assets/styles.css
+++ b/assets/styles.css
@@ -76,6 +76,16 @@ img.avatar.mastodon {
     padding-top: .6rem;
     padding-bottom: .6rem;
     margin-bottom: 1rem;
+    padding-left: 1rem;
+    padding-right: 1rem;
+}
+
+.banner p {
+    margin: .3rem 0;
+}
+
+.banner p ~ p {
+    margin-top: 1.3rem;
 }
 
 body > section > .banner,
diff --git a/components/ArchiveForm.html b/components/ArchiveForm.html
index ca0c483..a242a4d 100644
--- a/components/ArchiveForm.html
+++ b/components/ArchiveForm.html
@@ -1,13 +1,18 @@
 <form action={action} method='post' enctype='multipart/form-data'>
     {#if file_too_big}
         <div class="banner warning">
-            The file you've selected is too large to upload.
-            blah
+            <p>The file you have selected is very large.</p>
+
+            <p>Twitter has two types of archives, <b>Forget does not support
+                "Your Twitter data" archives, only "Tweet archives"</b>
+            available from
+            <a href="https://twitter.com/settings/account#export_request">your account settings</a>.
+            Please make sure you have the right type of archive.</p>
         </div>
     {/if}
     <input type="file" name="file" accept="application/zip,.zip"
         on:change="take_file(this.files)">
-    <input type="submit" value="Upload" disabled={file_too_big}>
+    <input type="submit" value="Upload">
     <input type='hidden' name='csrf-token' value={csrf_token}>
 </form>
 
@@ -38,7 +43,7 @@ export default {
     },
 
     computed: {
-        file_too_big: ({file_size}) => file_size > 20000000, // 20 MB
+        file_too_big: ({file_size}) => file_size > 10000000, // 10 MB
     },
 }
 </script>
diff --git a/templates/logged_in.html b/templates/logged_in.html
index 3d20e80..616337f 100644
--- a/templates/logged_in.html
+++ b/templates/logged_in.html
@@ -139,8 +139,8 @@
 
     <h2 id='tweet_archive_import'>Tweet archive import</h2>
     <p>
-    Twitter's API only lets us access up to 3200 of your most recent tweets. If you have more tweets than that, you can request a zip archive of your tweets from
-    <a href="https://twitter.com/settings/account">Twitter's settings page</a>,
+    Twitter's API only lets us access up to 3200 of your most recent tweets. If you have more tweets than that, you can request a tweet archive from
+    <a href="https://twitter.com/settings/account#export_request">your account settings</a>,
     and upload it here.
     </p>