From a77097a7fa17d79a8708b42c9496b17ce511a788 Mon Sep 17 00:00:00 2001
From: alexsparkes <alexsparkes@gmail.com>
Date: Sat, 29 Oct 2022 21:28:04 +0100
Subject: [PATCH] fix: background marketplace interval

---
 .../widgets/background/Background.jsx         | 79 ++++++++++---------
 src/components/widgets/quote/Quote.jsx        | 49 ++++++------
 2 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx
index 5d53f889..643b6563 100644
--- a/src/components/widgets/background/Background.jsx
+++ b/src/components/widgets/background/Background.jsx
@@ -250,14 +250,17 @@ export default class Background extends PureComponent {
           }
         });
         if (photoPack) {
-          const randomNumber = Math.floor(Math.random() * photoPack.length)
+          const randomNumber = Math.floor(Math.random() * photoPack.length);
           const randomPhoto = photoPack[randomNumber];
           if (
-            localStorage.getItem('backgroundchange') === 'refresh' ||
-            localStorage.getItem('backgroundchange') === null
+            (localStorage.getItem('backgroundchange') === 'refresh' && this.state.firstTime === true) ||
+            (localStorage.getItem('backgroundchange') === null && this.state.firstTime === true)
           ) {
-            localStorage.setItem('marketplaceNumber', randomNumber)
-            return this.setState({
+            localStorage.setItem('marketplaceNumber', randomNumber);
+            console.log("APPLE BOTTOM JEANS")
+            console.log(this.state.firstTime)
+            this.setState({ firstTime: false })
+            this.setState({
               url: randomPhoto.url.default,
               type: 'photo_pack',
               photoInfo: {
@@ -267,38 +270,40 @@ export default class Background extends PureComponent {
               },
             });
           } else {
-            if (
-              Number(
-                Number(localStorage.getItem('backgroundStartTime')) +
-                  Number(localStorage.getItem('backgroundchange')) >=
-                  Number(Date.now()),
-              )
-            ) {
-              {/*}
-            const randomPhoto = photoPack[localStorage.getItem('marketplaceNumber')];
-              return this.setState({
-                url: randomPhoto.url.default,
-                type: 'photo_pack',
-                photoInfo: {
-                  hidden: false,
-                  credit: randomPhoto.photographer,
-                  location: randomPhoto.location || 'N/A',
-                },
-              });
-            */}
-            break;
-            } else {
-              localStorage.setItem('marketplaceNumber', randomNumber)
-              return this.setState({
-                url: randomPhoto.url.default,
-                type: 'photo_pack',
-                photoInfo: {
-                  hidden: false,
-                  credit: randomPhoto.photographer,
-                  location: randomPhoto.location || 'N/A',
-                },
-              });
-            }
+              if (
+                Number(
+                  Number(localStorage.getItem('backgroundStartTime')) +
+                    Number(localStorage.getItem('backgroundchange')) >=
+                    Number(Date.now()),
+                )
+              ) {
+                const randomPhoto = photoPack[localStorage.getItem('marketplaceNumber')];
+                if (this.state.firstTime !== true) {
+                  this.setState({
+                    url: randomPhoto.url.default,
+                    type: 'photo_pack',
+                    photoInfo: {
+                      hidden: false,
+                      credit: randomPhoto.photographer,
+                      location: randomPhoto.location || 'N/A',
+                    },
+                  });
+                } else {
+                  this.setState({ firstTime: true });
+                }
+                this.setState({ firstTime: true });
+              } else {
+                localStorage.setItem('marketplaceNumber', randomNumber);
+                return this.setState({
+                  url: randomPhoto.url.default,
+                  type: 'photo_pack',
+                  photoInfo: {
+                    hidden: false,
+                    credit: randomPhoto.photographer,
+                    location: randomPhoto.location || 'N/A',
+                  },
+                });
+              }
           }
         }
         break;
diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx
index 85f517dd..5d5c791b 100644
--- a/src/components/widgets/quote/Quote.jsx
+++ b/src/components/widgets/quote/Quote.jsx
@@ -335,6 +335,30 @@ export default class Quote extends PureComponent {
   }
 
   componentDidMount() {
+    const test = localStorage.getItem('quotechange')
+
+    this.interval = setInterval(() => {
+      if (test !== null ) {
+      const targetTime = Number(
+        Number(localStorage.getItem('quoteStartTime')) +
+          Number(localStorage.getItem('quotechange')),
+      );
+      const currentTime = Number(Date.now());
+      if (currentTime >= targetTime) {
+        this.setZoom();
+        this.getQuote();
+        localStorage.setItem('quoteStartTime', Date.now());
+      } else {
+        console.log(localStorage.getItem('quotechange'));
+        try {
+          this.setState(JSON.parse(localStorage.getItem('currentQuote')));
+        } catch (e) {
+          this.setZoom();
+          this.getQuote();
+        }
+      }
+    }
+    });
     EventBus.on('refresh', (data) => {
       if (data === 'quote') {
         if (localStorage.getItem('quote') === 'false') {
@@ -367,31 +391,6 @@ export default class Quote extends PureComponent {
       this.getQuote();
       localStorage.setItem('quoteStartTime', Date.now());
     }
-
-    const test = localStorage.getItem('quotechange')
-
-    this.interval = setInterval(() => {
-      if (test !== null ) {
-      const targetTime = Number(
-        Number(localStorage.getItem('quoteStartTime')) +
-          Number(localStorage.getItem('quotechange')),
-      );
-      const currentTime = Number(Date.now());
-      if (currentTime >= targetTime) {
-        this.setZoom();
-        this.getQuote();
-        localStorage.setItem('quoteStartTime', Date.now());
-      } else {
-        console.log(localStorage.getItem('quotechange'));
-        try {
-          this.setState(JSON.parse(localStorage.getItem('currentQuote')));
-        } catch (e) {
-          this.setZoom();
-          this.getQuote();
-        }
-      }
-    }
-    });
   }
 
   componentWillUnmount() {