add isFirefox function

hanydd · Dec 5, 2024 · 65d37a8 · 65d37a8
1 parent 1cc0842
commit 65d37a8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
@@ -1,8 +1,7 @@
 import * as React from "react";
 import { createRoot, Root } from "react-dom/client";
+import { isFirefox } from "../utils/";
 import { ButtonListener } from "./component-types";
-import { isFirefoxOrSafari } from "../utils/";
-import { isSafari } from "../config/config";
 
 export interface TooltipProps {
     text?: string;
@@ -67,7 +66,7 @@ export class GenericTooltip {
         if (props.positionRealtive) this.container.style.position = "relative";
         if (props.containerAbsolute) this.container.style.position = "absolute";
         if (props.center) {
-            if (isFirefoxOrSafari() && !isSafari()) {
+            if (isFirefox()) {
                 this.container.style.width = "-moz-available";
             } else {
                 this.container.style.width = "-webkit-fill-available";

diff --git a/src/config/config.ts b/src/config/config.ts
@@ -1,4 +1,4 @@
-import { isFirefoxOrSafari } from "../utils/";
+import { isFirefox } from "../utils/";
 
 export interface SyncStorage {
     invidiousInstances: string[];
@@ -177,7 +177,7 @@ export class ProtoConfig<T extends SyncStorage, U extends LocalStorage> {
                                 `${chrome.i18n.getMessage("syncDisabledWarning")}${
                                     this.inDeArrow ? `\n\n${chrome.i18n.getMessage("syncDisabledWarningDeArrow")}` : ``
                                 }${
-                                    isFirefoxOrSafari() && !isSafari()
+                                    isFirefox()
                                         ? `\n\n${chrome.i18n.getMessage("syncDisabledFirefoxSuggestions")}`
                                         : ``
                                 }`
@@ -234,9 +234,6 @@ export class ProtoConfig<T extends SyncStorage, U extends LocalStorage> {
     }
 }
 
-export function isSafari(): boolean {
-    return typeof navigator !== "undefined" && navigator.vendor === "Apple Computer, Inc.";
-}
 
 export function keybindEquals(first: Keybind, second: Keybind): boolean {
     if (

diff --git a/src/content.ts b/src/content.ts
@@ -1,6 +1,6 @@
 import SkipNoticeComponent from "./components/SkipNoticeComponent";
 import Config from "./config";
-import { isSafari, Keybind, keybindEquals, keybindToString, StorageChangesObject } from "./config/config";
+import { Keybind, keybindEquals, keybindToString, StorageChangesObject } from "./config/config";
 import PreviewBar, { PreviewBarSegment } from "./js-components/previewBar";
 import { SkipButtonControlBar } from "./js-components/skipButtonControlBar";
 import { Message, MessageResponse, VoteResponse } from "./messageTypes";
@@ -35,7 +35,7 @@ import {
     VideoInfo,
 } from "./types";
 import Utils from "./utils";
-import { isFirefoxOrSafari, sleep, waitFor } from "./utils/";
+import { isFirefox, isFirefoxOrSafari, isSafari, sleep, waitFor } from "./utils/";
 import { AnimationUtils } from "./utils/animationUtils";
 import { addCleanupListener, cleanPage } from "./utils/cleanup";
 import { defaultPreviewTime } from "./utils/constants";
@@ -705,9 +705,9 @@ async function startSponsorSchedule(
         await skippingFunction(currentTime);
     } else {
         let delayTime = timeUntilSponsor * 1000 * (1 / getVideo().playbackRate);
-        if (delayTime < (isFirefoxOrSafari() && !isSafari() ? 750 : 300)) {
+        if (delayTime < (isFirefox() ? 750 : 300)) {
             let forceStartIntervalTime: number | null = null;
-            if (isFirefoxOrSafari() && !isSafari() && delayTime > 300) {
+            if (isFirefox() && delayTime > 300) {
                 forceStartIntervalTime = await waitForNextTimeChange();
             }
 
@@ -755,7 +755,7 @@ async function startSponsorSchedule(
         } else {
             logDebug(`Starting timeout to skip ${getVideo().currentTime} to skip at ${skipTime[0]}`);
 
-            const offset = isFirefoxOrSafari() && !isSafari() ? 600 : 150;
+            const offset = isFirefox() ? 600 : 150;
             // Schedule for right before to be more precise than normal timeout
             currentSkipSchedule = setTimeout(skippingFunction, Math.max(0, delayTime - offset));
         }

diff --git a/src/utils.ts b/src/utils.ts
@@ -8,8 +8,8 @@ import {
     SponsorTime,
     VideoID,
 } from "./types";
+import { isSafari } from "./utils/index";
 
-import { isSafari } from "./config/config";
 import { findValidElementFromSelector } from "./utils/dom";
 import { getHash, getVideoIDHash, HashedValue } from "./utils/hash";
 

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -79,3 +79,11 @@ export function isFirefoxOrSafari(): boolean {
     // @ts-ignore
     return typeof browser !== "undefined";
 }
+
+export function isSafari(): boolean {
+    return typeof navigator !== "undefined" && navigator.vendor === "Apple Computer, Inc.";
+}
+
+export function isFirefox(): boolean {
+    return isFirefoxOrSafari() && !isSafari();
+}