refactor: remove notsamedomain code, needs work to migrate properly

Author: louix

src/background/isolation.ts

@@ -635,20 +635,20 @@ export class Isolation {
         return true;
 
       case 'notsamedomainexact':
-        if (target !== origin) {
-          this.debug(
-            '[checkIsolationPreferenceAgainstUrl] isolating based on "notsamedomainexact"'
-          );
-          return true;
-        }
+      // if (target !== origin) {
+      //   this.debug(
+      //     '[checkIsolationPreferenceAgainstUrl] isolating based on "notsamedomainexact"'
+      //   );
+      //   return true;
+      // }
 
       case 'notsamedomain':
-        if (!this.utils.sameDomain(origin, target)) {
-          this.debug(
-            '[checkIsolationPreferenceAgainstUrl] isolating based on "notsamedomain"'
-          );
-          return true;
-        }
+      // if (!this.utils.sameDomain(origin, target)) {
+      //   this.debug(
+      //     '[checkIsolationPreferenceAgainstUrl] isolating based on "notsamedomain"'
+      //   );
+      //   return true;
+      // }
     }
     return false;
   }

src/background/mouseclick.ts

@@ -10,6 +10,7 @@ import {
   ClickType,
   ClickMessage,
   WebRequestOnBeforeRequestDetails,
+  IsolationDomain,
 } from '~/types';
 
 export class MouseClick {
@@ -100,7 +101,7 @@ export class MouseClick {
   ): boolean => {
     if (preferences.action === 'always') {
       this.debug(
-        '[checkClick] click handled based on preference "always"',
+        '[checkClickPreferences] click handled based on preference "always"',
         preferences
       );
       return true;
@@ -117,46 +118,46 @@ export class MouseClick {
     }
 
     if (preferences.action === 'notsamedomainexact') {
-      if (parsedSenderTabURL.hostname !== parsedClickedURL.hostname) {
-        this.debug(
-          '[checkClickPreferences] click handled based on preference "notsamedomainexact"',
-          preferences,
-          parsedClickedURL,
-          parsedSenderTabURL
-        );
-        return true;
-      } else {
-        this.debug(
-          '[checkClickPreferences] click not handled based on preference "notsamedomainexact"',
-          preferences,
-          parsedClickedURL,
-          parsedSenderTabURL
-        );
-        return false;
-      }
+      // if (parsedSenderTabURL.hostname !== parsedClickedURL.hostname) {
+      //   this.debug(
+      //     '[checkClickPreferences] click handled based on preference "notsamedomainexact"',
+      //     preferences,
+      //     parsedClickedURL,
+      //     parsedSenderTabURL
+      //   );
+      //   return true;
+      // } else {
+      //   this.debug(
+      //     '[checkClickPreferences] click not handled based on preference "notsamedomainexact"',
+      //     preferences,
+      //     parsedClickedURL,
+      //     parsedSenderTabURL
+      //   );
+      //   return false;
+      // }
     }
 
     if (preferences.action === 'notsamedomain') {
-      if (
-        this.utils.sameDomain(
-          parsedSenderTabURL.hostname,
-          parsedClickedURL.hostname
-        )
-      ) {
-        this.debug(
-          '[checkClickPreferences] click not handled from preference "notsamedomain"',
-          parsedClickedURL,
-          parsedSenderTabURL
-        );
-        return false;
-      } else {
-        this.debug(
-          '[checkClickPreferences] click handled from preference "notsamedomain"',
-          parsedClickedURL,
-          parsedSenderTabURL
-        );
-        return true;
-      }
+      // if (
+      //   this.utils.sameDomain(
+      //     parsedSenderTabURL.hostname,
+      //     parsedClickedURL.hostname
+      //   )
+      // ) {
+      //   this.debug(
+      //     '[checkClickPreferences] click not handled from preference "notsamedomain"',
+      //     parsedClickedURL,
+      //     parsedSenderTabURL
+      //   );
+      //   return false;
+      // } else {
+      //   this.debug(
+      //     '[checkClickPreferences] click handled from preference "notsamedomain"',
+      //     parsedClickedURL,
+      //     parsedSenderTabURL
+      //   );
+      //   return true;
+      // }
     }
 
     this.debug('[checkClickPreferences] this should never happen');

src/types.ts

@@ -51,8 +51,8 @@ export interface TmpTabOptions {
 
 export type IsolationAction =
   | 'never'
-  | 'notsamedomain'
-  | 'notsamedomainexact'
+  | 'notsamedomain' // legacy
+  | 'notsamedomainexact' // legacy
   | 'always'
   | 'global';
 

src/ui/components/isolation/settings.vue

@@ -53,12 +53,12 @@ export default mixins(mixin).extend({
       <option value="never">
         {{ t('optionsIsolationSettingsNever') }}
       </option>
-      <option value="notsamedomain">
-        {{ t('optionsIsolationSettingsNotSameDomain') }}
-      </option>
-      <option value="notsamedomainexact">
-        {{ t('optionsIsolationSettingsNotSameDomainExact') }}
-      </option>
+      <!--      <option value="notsamedomain">-->
+      <!--        {{ t('optionsIsolationSettingsNotSameDomain') }}-->
+      <!--      </option>-->
+      <!--      <option value="notsamedomainexact">-->
+      <!--        {{ t('optionsIsolationSettingsNotSameDomainExact') }}-->
+      <!--      </option>-->
       <option value="always">
         {{ t('optionsIsolationSettingsAlways') }}
       </option>