refactor: cleanup redirectortab method

stoically · Nov 28, 2019 · 54d41d5 · 54d41d5
1 parent 5542633
commit 54d41d5
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/src/background/tabs.ts b/src/background/tabs.ts
@@ -213,30 +213,33 @@ export class Tabs {
     }
   }
 
-  maybeCloseRedirectorTab(
+  async maybeCloseRedirectorTab(
     tab: Tab,
     changeInfo: browser.tabs.TabsOnUpdatedEventChangeInfo
-  ): void {
+  ): Promise<void> {
     if (
-      this.pref.closeRedirectorTabs.active &&
-      changeInfo.status &&
-      changeInfo.status === 'complete'
+      !this.pref.closeRedirectorTabs.active ||
+      changeInfo.status !== 'complete'
     ) {
-      const url = new URL(tab.url);
-      if (this.pref.closeRedirectorTabs.domains.includes(url.hostname)) {
-        delay(this.pref.closeRedirectorTabs.delay).then(async () => {
-          // check the tab url again to make sure the tab didn't change its url
-          const redirTab = (await browser.tabs.get(tab.id)) as Tab;
-          const redirUrl = new URL(redirTab.url);
-          if (
-            this.pref.closeRedirectorTabs.domains.includes(redirUrl.hostname)
-          ) {
-            this.debug('[onUpdated] removing redirector tab', changeInfo, tab);
-            this.remove(tab);
-          }
-        });
-      }
+      return;
+    }
+
+    const url = new URL(tab.url);
+    if (!this.pref.closeRedirectorTabs.domains.includes(url.hostname)) {
+      return;
+    }
+
+    await delay(this.pref.closeRedirectorTabs.delay);
+
+    // check the tab url again to make sure the tab didn't change its url
+    const redirTab = (await browser.tabs.get(tab.id)) as Tab;
+    const redirUrl = new URL(redirTab.url);
+    if (!this.pref.closeRedirectorTabs.domains.includes(redirUrl.hostname)) {
+      return;
     }
+
+    this.debug('[onUpdated] removing redirector tab', changeInfo, redirTab);
+    this.remove(redirTab);
   }
 
   async maybeMoveTab(tab: Tab): Promise<void> {