Fix: Remove unneeded method

GunmaRamens · Nov 9, 2023 · 7c1779c · 7c1779c
1 parent 9d5e652
commit 7c1779c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/class/StorageTool/index.ts b/src/class/StorageTool/index.ts
@@ -4,7 +4,7 @@
 
 import Browser from "webextension-polyfill";
 
-import { WebsiteIds, Websites } from "@/data/websites";
+import { WebsiteIds } from "@/data/websites";
 
 import IsTrue from "../../utils/isTrue";
 
@@ -19,20 +19,15 @@ export type StorageKeys =
 export type StorageIds = WebsiteIds | "other";
 
 export default class StorageTool {
-    id: string;
-    constructor(id: string) {
+    id: StorageIds;
+    constructor(id: StorageIds) {
         this.id = id;
     }
 
     static getChromeStorage() {
         return Browser.storage ? Browser.storage.sync : null;
     }
 
-    static getStorage(id: StorageIds) {
-        if (id == "other") return new StorageTool(id);
-        return Websites.get(id)?.class.storage;
-    }
-
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async set(key: StorageKeys, value: any) {
         let newData = { [key]: value };

diff --git a/src/components/ToggleWithStorage.tsx b/src/components/ToggleWithStorage.tsx
@@ -17,10 +17,9 @@ interface ToggleProps {
 
 export function ToggleWithStorage({ dataId, color, dataKey, readonly }: ToggleProps) {
     const [enabled, setEnabled] = useState(false);
+    const storage = new StorageTool(dataId);
 
     useEffect(() => {
-        const storage = StorageTool.getStorage(dataId);
-        if (storage === undefined) return;
         storage.get(dataKey).then((value) => {
             const istrue = IsTrue(value);
             if (istrue !== undefined) setEnabled(istrue);
@@ -31,8 +30,6 @@ export function ToggleWithStorage({ dataId, color, dataKey, readonly }: TogglePr
         if (readonly) return;
         return (e: React.ChangeEvent<HTMLInputElement>) => {
             setEnabled(e.target.checked);
-            const storage = StorageTool.getStorage(dataId);
-            if (storage === undefined) return;
             storage.set(dataKey, e.target.checked.toString());
             sendMsgToAllTab<string>("reload");
         };