From f9a1fcc6a786e29b457cf47293a608f888bac4b8 Mon Sep 17 00:00:00 2001
From: infinite-persistence <inf.persistence@gmail.com>
Date: Wed, 9 Feb 2022 20:11:05 +0800
Subject: [PATCH] Bump thumbnail size to 5MB & check size before upload.

- The previous 2MB was a CDN limit (more of a mistake). That has been increased to a far greater number, so we're setting a more reasonable 5MB limit.
- The previous code checks/shows the "size exceeded" message after the file has been uploaded ... in the `catch` block. This will not work since the CDN now allows a 5MB file.
    - Fixed by checking the size before actually uploading.
---
 .env.defaults                     |  2 +-
 ui/component/selectAsset/view.jsx | 38 +++++++++++++++++++------------
 ui/redux/actions/publish.js       | 12 +++++-----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.env.defaults b/.env.defaults
index 76ef4411e..e3ced5c94 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -21,7 +21,7 @@ THUMBNAIL_CARDS_CDN_URL=https://cards.odycdn.com/
 THUMBNAIL_HEIGHT=220
 THUMBNAIL_WIDTH=390
 THUMBNAIL_QUALITY=85
-THUMBNAIL_CDN_SIZE_LIMIT_BYTES=2097152
+THUMBNAIL_CDN_SIZE_LIMIT_BYTES=5242880
 WELCOME_VERSION=1.0
 
 # STRIPE
diff --git a/ui/component/selectAsset/view.jsx b/ui/component/selectAsset/view.jsx
index 5c4c7e463..e9dfff3bd 100644
--- a/ui/component/selectAsset/view.jsx
+++ b/ui/component/selectAsset/view.jsx
@@ -25,15 +25,22 @@ function SelectAsset(props: Props) {
   const { onUpdate, onDone, assetName, currentValue, recommended, title, inline } = props;
   const [pathSelected, setPathSelected] = React.useState('');
   const [fileSelected, setFileSelected] = React.useState<any>(null);
-  const [fileSize, setFileSize] = React.useState(0);
   const [uploadStatus, setUploadStatus] = React.useState(STATUS.READY);
   const [useUrl, setUseUrl] = usePersistedState('thumbnail-upload:mode', false);
   const [url, setUrl] = React.useState(currentValue);
-  const [error, setError] = React.useState();
+  const [uploadErrorMsg, setUploadErrorMsg] = React.useState();
+
+  React.useEffect(() => {
+    if (useUrl) {
+      setUploadErrorMsg('');
+      setFileSelected(null);
+      setPathSelected('');
+    }
+  }, [useUrl]);
 
   function doUploadAsset() {
     const uploadError = (error = '') => {
-      setError(error);
+      setUploadErrorMsg(error);
     };
 
     const onSuccess = (thumbnailUrl) => {
@@ -71,15 +78,7 @@ function SelectAsset(props: Props) {
             );
       })
       .catch((err) => {
-        if (fileSize >= THUMBNAIL_CDN_SIZE_LIMIT_BYTES) {
-          uploadError(
-            __('Thumbnail size over %max_size%MB, please edit and reupload.', {
-              max_size: THUMBNAIL_CDN_SIZE_LIMIT_BYTES / (1024 * 1024),
-            })
-          );
-        } else {
-          uploadError(err.message);
-        }
+        uploadError(err.message);
         setUploadStatus(STATUS.READY);
       });
   }
@@ -99,7 +98,7 @@ function SelectAsset(props: Props) {
   const formBody = (
     <>
       <fieldset-section>
-        {error && <div className="error__text">{error}</div>}
+        {uploadErrorMsg && <div className="error__text">{uploadErrorMsg}</div>}
         {useUrl ? (
           <FormField
             autoFocus
@@ -123,10 +122,17 @@ function SelectAsset(props: Props) {
             onFileChosen={(file) => {
               if (file.name) {
                 setFileSelected(file);
-                setFileSize(file.size);
                 // what why? why not target=WEB this?
                 // file.path is undefined in web but available in electron
                 setPathSelected(file.name || file.path);
+                setUploadErrorMsg('');
+
+                if (file.size >= THUMBNAIL_CDN_SIZE_LIMIT_BYTES) {
+                  const maxSizeMB = THUMBNAIL_CDN_SIZE_LIMIT_BYTES / (1024 * 1024);
+                  setUploadErrorMsg(
+                    __('Thumbnail size over %max_size%MB, please edit and reupload.', { max_size: maxSizeMB })
+                  );
+                }
               }
             }}
             accept={accept}
@@ -140,7 +146,9 @@ function SelectAsset(props: Props) {
             button="primary"
             type="submit"
             label={useUrl ? __('Done') : __('Upload')}
-            disabled={!useUrl && (uploadStatus === STATUS.UPLOADING || !pathSelected || !fileSelected)}
+            disabled={
+              !useUrl && (uploadStatus === STATUS.UPLOADING || !pathSelected || !fileSelected || uploadErrorMsg)
+            }
             onClick={() => {
               if (!useUrl) {
                 doUploadAsset();
diff --git a/ui/redux/actions/publish.js b/ui/redux/actions/publish.js
index cbeeced2d..02c2bb011 100644
--- a/ui/redux/actions/publish.js
+++ b/ui/redux/actions/publish.js
@@ -477,12 +477,6 @@ export const doUploadThumbnail = (
         }
 
         const userInput = [fileName, fileExt, fileType, thumbnail, size];
-        if (size >= THUMBNAIL_CDN_SIZE_LIMIT_BYTES) {
-          message = __('Thumbnail size over %max_size%MB, please edit and reupload.', {
-            max_size: THUMBNAIL_CDN_SIZE_LIMIT_BYTES / (1024 * 1024),
-          });
-        }
-
         uploadError({ message, cause: `${userInput.join(' | ')}` });
       });
   };
@@ -521,6 +515,12 @@ export const doUploadThumbnail = (
       return null;
     }
 
+    if (size && size >= THUMBNAIL_CDN_SIZE_LIMIT_BYTES) {
+      const maxSizeMB = THUMBNAIL_CDN_SIZE_LIMIT_BYTES / (1024 * 1024);
+      uploadError(__('Thumbnail size over %max_size%MB, please edit and reupload.', { max_size: maxSizeMB }));
+      return;
+    }
+
     const data = new FormData();
     const file = thumbnailBlob || (thumbnail && new File([thumbnail], fileName, { type: fileType }));
     // $FlowFixMe