Fix: Close any type of modal

Geczy · Feb 10, 2021 · b10630d · b10630d
1 parent 63c410e
commit b10630d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/manifest.json b/manifest.json
diff --git a/src/automations/Swiper.js b/src/automations/Swiper.js
@@ -55,7 +55,7 @@ class Swiper {
   matchFound = () => {
     const found = document.querySelectorAll('button[aria-label="Close"]');
 
-    if (!found || !found.length) {
+    if (typeof found?.click !== 'function') {
       return false;
     }
 
@@ -84,12 +84,12 @@ class Swiper {
       }, 100);
     }
 
-    if (this.interactions.closeInstructions(this.run)) {
-      return;
+    if (this.interactions.closeInstructions()) {
+      return setTimeout(this.run, generateRandomNumber());
     }
 
-    if (this.interactions.closeSuperLike(this.run)) {
-      return;
+    if (this.interactions.closeModal()) {
+      return setTimeout(this.run, generateRandomNumber());
     }
 
     if (!this.canSwipe()) {

diff --git a/src/misc/Interactions.js b/src/misc/Interactions.js
@@ -25,7 +25,7 @@ class Interactions {
     }
   };
 
-  closeInstructions = (cb) => {
+  closeInstructions = () => {
     // Homescreen modal blocks us
     try {
       if (document.querySelector('[data-testid="addToHomeScreen"]')) {
@@ -40,12 +40,12 @@ class Interactions {
     } catch (e) {}
   };
 
-  closeSuperLike = (cb) => {
-    // "Upgrade your like" modal blocks us
+  closeModal = () => {
     try {
-      if (document.querySelector('#modal-manager [aria-label="⭐"]')) {
-        document.querySelector('#modal-manager button:nth-of-type(2)').click();
-        logger('Closing upgrade super like modal');
+      const modal = document.querySelector('#modal-manager');
+      if (modal) {
+        document.querySelector('#modal-manager > div').click();
+        logger('Closing modal');
         cb();
         return true;
       }