reuse getHost + code cosmetics

openstyles · Dec 17, 2024 · 9e30433 · 9e30433
1 parent 4e0c42d
commit 9e30433
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/background/sw/index.js b/src/background/sw/index.js
@@ -78,7 +78,7 @@ bgPreInit.push(
 
 /**
  * This ensures that SW starts even before our page makes a clientData request inside.
- * The actual listener may be invoked after `onfetch`, but is may depend on implementation.
+ * The actual listener is usually invoked after `onfetch`, but there's no guarantee.
  */
 chrome.webRequest.onBeforeRequest.addListener(req => {
   clientUrls[req.url] = true;

diff --git a/src/background/token-manager.js b/src/background/token-manager.js
@@ -3,7 +3,7 @@ import {DNR_ID_IDENTITY, updateDynamicRules} from '/js/dnr';
 import {chromeLocal} from '/js/storage-util';
 import {FIREFOX} from '/js/ua';
 import * as URLS from '/js/urls';
-import {clamp} from '/js/util';
+import {clamp, getHost} from '/js/util';
 import {browserWindows} from '/js/util-webext';
 import launchWebAuthFlow from 'webext-launch-web-auth-flow';
 import {isVivaldi} from './common';
@@ -227,7 +227,7 @@ async function authUserMV3(url, interactive, redirectUri) {
         type: 'redirect',
         redirect: {
           transform: {
-            host: apiUrl.split('/')[2],
+            host: getHost(apiUrl),
           },
         },
       },

diff --git a/src/background/usercss-install-helper.js b/src/background/usercss-install-helper.js
@@ -3,7 +3,7 @@ import {kContentType, kMainFrame} from '/js/consts';
 import {DNR_ID_INSTALLER, updateDynamicRules} from '/js/dnr';
 import * as prefs from '/js/prefs';
 import * as URLS from '/js/urls';
-import {RX_META} from '/js/util';
+import {getHost, RX_META} from '/js/util';
 import {FIREFOX} from '/js/ua';
 import {bgBusy, safeTimeout} from './common';
 import download from './download';
@@ -44,7 +44,7 @@ function toggle(key, val) {
           : /^.*\.user\.css$/).source,
         requestDomains: val
           ? undefined
-          : [...new Set(urls.map(u => u.split('/')[2]))],
+          : [...new Set(urls.map(getHost))],
         resourceTypes: [kMainFrame],
         responseHeaders: [{
           header: kContentType,

diff --git a/src/js/themer.js b/src/js/themer.js
@@ -14,7 +14,7 @@ import {MF_ICON_EXT, MF_ICON_PATH} from './util-webext';
 import '/css/global.css';
 import '/css/global-dark.css';
 
-export const isDarkChanged = new Set();
+export const onDarkChanged = new Set();
 export const MEDIA_ON = 'screen';
 export const MEDIA_OFF = 'not all';
 const MEDIA_NAME = 'dark';
@@ -51,5 +51,5 @@ function updateDOM() {
       m.mediaText = `${isDark ? MEDIA_ON : MEDIA_OFF},${MEDIA_NAME}`;
     }
   });
-  for (const fn of isDarkChanged) fn(isDark);
+  for (const fn of onDarkChanged) fn(isDark);
 }
diff --git a/src/popup/index.js b/src/popup/index.js
@@ -5,7 +5,7 @@ import {getEventKeyName, setupLivePrefs} from '/js/dom-util';
 import {t, template} from '/js/localization';
 import {API, onExtension} from '/js/msg';
 import * as prefs from '/js/prefs';
-import {isDark, isDarkChanged} from '/js/themer';
+import {isDark, onDarkChanged} from '/js/themer';
 import {CHROME, FIREFOX, MOBILE, OPERA} from '/js/ua';
 import {ownRoot} from '/js/urls';
 import {capitalize, clamp, clipString, isEmptyObj, sleep, stringAsRegExpStr} from '/js/util';
@@ -38,7 +38,7 @@ export const $entry = styleOrId => $(`#${ENTRY_ID_PREFIX_RAW}${styleOrId.id || s
 onExtension(onRuntimeMessage);
 
 updateStateIcon(isDark);
-isDarkChanged.add(val => updateStateIcon(val, null));
+onDarkChanged.add(val => updateStateIcon(val, null));
 
 prefs.subscribe('popup.stylesFirst', (key, stylesFirst) => {
   $.rootCL.toggle('styles-first', stylesFirst);