Merge branch '7.0' into 7.0-blur

src/components/widgets/quote/Quote.jsx

@@ -291,16 +291,6 @@ export default class Quote extends PureComponent {
     toast(variables.getMessage('toasts.quote'));
   }
 
-  tweetQuote() {
-    variables.stats.postEvent('feature', 'Quote tweet');
-    window
-      .open(
-        `https://twitter.com/intent/tweet?text=${this.state.quote} - ${this.state.author} on @getmue`,
-        '_blank',
-      )
-      .focus();
-  }
-
   favourite() {
     if (localStorage.getItem('favouriteQuote')) {
       localStorage.removeItem('favouriteQuote');
@@ -353,7 +343,6 @@ export default class Quote extends PureComponent {
           this.getQuote();
           localStorage.setItem('quoteStartTime', Date.now());
         } else {
-          console.log(localStorage.getItem('quotechange'));
           try {
             this.setState(JSON.parse(localStorage.getItem('currentQuote')));
           } catch (e) {
@@ -410,6 +399,7 @@ export default class Quote extends PureComponent {
     if (this.state.noQuote === true) {
       return <></>;
     }
+
     return (
       <div className="quotediv" ref={this.quotediv}>
         <Modal

src/modules/constants.js

@@ -1,6 +1,6 @@
 // API URLs
 // export const API_URL = 'https://api.muetab.com/v2';
-export const API_URL = 'https://api.muetab.com/v2';
+export const API_URL = 'https://api.eartharoid.workers.dev/v2';
 export const MARKETPLACE_URL = 'https://marketplace.muetab.com';
 export const SPONSORS_URL = 'https://sponsors.muetab.com';
 export const GITHUB_URL = 'https://api.github.com';

src/modules/helpers/marketplace.js

@@ -43,6 +43,7 @@ export function install(type, input, sideload) {
         localStorage.setItem('oldBackgroundType', localStorage.getItem('backgroundType'));
       }
       localStorage.setItem('backgroundType', 'photo_pack');
+      localStorage.removeItem('backgroundchange');
       EventBus.dispatch('refresh', 'background');
       break;
 
@@ -57,6 +58,7 @@ export function install(type, input, sideload) {
         localStorage.setItem('oldQuoteType', localStorage.getItem('quoteType'));
       }
       localStorage.setItem('quoteType', 'quote_pack');
+      localStorage.removeItem('quotechange');
       EventBus.dispatch('refresh', 'quote');
       break;
 
@@ -92,7 +94,6 @@ export function uninstall(type, name) {
       showReminder();
       break;
 
-    // this and photos needs debugging
     case 'quotes':
       installedContents = JSON.parse(localStorage.getItem('quote_packs'));
       packContents = JSON.parse(localStorage.getItem('installed')).find(
@@ -112,6 +113,7 @@ export function uninstall(type, name) {
         localStorage.removeItem('oldQuoteType');
         localStorage.removeItem('quote_packs');
       }
+      localStorage.removeItem('quotechange');
       EventBus.dispatch('refresh', 'marketplacequoteuninstall');
       break;
 
@@ -132,6 +134,7 @@ export function uninstall(type, name) {
         localStorage.removeItem('oldBackgroundType');
         localStorage.removeItem('photo_packs');
       }
+      localStorage.removeItem('backgroundchange');
       EventBus.dispatch('refresh', 'marketplacebackgrounduninstall');
       break;