From f49cf1f65b8e144df1fcd1821a65b660add13ac9 Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Sun, 2 May 2021 18:12:03 +0100
Subject: [PATCH] fix: quote packs, add preset settings to sidebar (WIP)

---
 .../modals/main/tabs/Marketplace.jsx          |  1 +
 .../modals/main/tabs/backend/Tab.jsx          |  1 +
 src/components/widgets/quote/Quote.jsx        | 38 +++++++++----------
 src/modules/helpers/marketplace.js            |  6 +--
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/components/modals/main/tabs/Marketplace.jsx b/src/components/modals/main/tabs/Marketplace.jsx
index fb4f5844..d75cfef7 100644
--- a/src/components/modals/main/tabs/Marketplace.jsx
+++ b/src/components/modals/main/tabs/Marketplace.jsx
@@ -11,6 +11,7 @@ export default function Marketplace() {
     <Tabs>
       <div label={marketplace.photo_packs}><MarketplaceTab type='photo_packs'/></div>
       <div label={marketplace.quote_packs}><MarketplaceTab type='quote_packs'/></div>
+      <div label={marketplace.preset_settings}><MarketplaceTab type='preset_settings'/></div>
     </Tabs>
   );
 }
diff --git a/src/components/modals/main/tabs/backend/Tab.jsx b/src/components/modals/main/tabs/backend/Tab.jsx
index 8f96ca9b..58febf06 100644
--- a/src/components/modals/main/tabs/backend/Tab.jsx
+++ b/src/components/modals/main/tabs/backend/Tab.jsx
@@ -67,6 +67,7 @@ function Tab(props) {
     // Store
     case marketplace.photo_packs: icon = <Background/>; break;
     case marketplace.quote_packs: icon = <Quote/>; break;
+    case marketplace.preset_settings: icon = <Advanced/>; break;
     case addons.added: icon = <Added/>; break;
     case addons.sideload: icon = <Sideload/>; break;
 
diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx
index 640c0d63..25a08951 100644
--- a/src/components/widgets/quote/Quote.jsx
+++ b/src/components/widgets/quote/Quote.jsx
@@ -41,26 +41,6 @@ export default class Quote extends React.PureComponent {
     });
   }
 
-  getQuotePack() {
-    let quotePack = localStorage.getItem('quote_packs');
-
-    if (quotePack === 'undefined') {
-      return this.doOffline();
-    }
-
-    quotePack = JSON.parse(quotePack);
-
-    if (quotePack) {
-      const data = quotePack[Math.floor(Math.random() * quotePack.length)];
-      return this.setState({
-        quote: '"' + data.quote + '"',
-        author: data.author
-      });
-    } else {
-      this.doOffline();
-    }
-  }
-
   async getQuote() {
     const favouriteQuote = localStorage.getItem('favouriteQuote');
     if (favouriteQuote) {
@@ -91,7 +71,23 @@ export default class Quote extends React.PureComponent {
           author: quotePackAPI.author || data.author
         });
       } catch (e) {
-        return this.getQuotePack();
+        return this.doOffline();
+      }
+    }
+
+    let quotePack = localStorage.getItem('quote_packs');
+
+    if (quotePack !== null) {
+      quotePack = JSON.parse(quotePack);
+
+      if (quotePack) {
+        const data = quotePack[Math.floor(Math.random() * quotePack.length)];
+        return this.setState({
+          quote: '"' + data.quote + '"',
+          author: data.author
+        });
+      } else {
+        return this.doOffline();
       }
     }
 
diff --git a/src/modules/helpers/marketplace.js b/src/modules/helpers/marketplace.js
index 188d7944..059503c6 100644
--- a/src/modules/helpers/marketplace.js
+++ b/src/modules/helpers/marketplace.js
@@ -18,12 +18,11 @@ export default class MarketplaceFunctions {
           localStorage.setItem(item.name, item.value);
         });
         break;
-      case 'quote_packs':
+      case 'quotes':
         localStorage.removeItem('quote_packs');
         localStorage.removeItem('quoteAPI');
         break;
       case 'photos':
-      case 'photo_packs':
         localStorage.removeItem('photo_packs');
         localStorage.setItem('backgroundType', localStorage.getItem('oldBackgroundType'));
         localStorage.removeItem('oldBackgroundType');
@@ -68,14 +67,13 @@ export default class MarketplaceFunctions {
         break;
 
       case 'photos':
-      case 'photo_packs':
         localStorage.setItem('photo_packs', JSON.stringify(input.photos));
         localStorage.setItem('oldBackgroundType', localStorage.getItem('backgroundType'));
         localStorage.setItem('backgroundType', 'photo_pack');
         EventBus.dispatch('refresh', 'background');
         break;
 
-      case 'quote_packs':
+      case 'quotes':
         if (input.quote_api) {
           localStorage.setItem('quoteAPI', JSON.stringify(input.quote_api));
         }