From 0616b4f221b3eddbd2894031598db8c314c9a065 Mon Sep 17 00:00:00 2001
From: Gabe Yuan <gabe@zq.com>
Date: Thu, 10 Aug 2023 13:41:55 +0800
Subject: [PATCH] modify entry func

---
 src/content.js         | 7 ++-----
 src/libs/translator.js | 4 +++-
 src/userscript.js      | 6 ++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/content.js b/src/content.js
index b2cab77..794d15e 100644
--- a/src/content.js
+++ b/src/content.js
@@ -6,19 +6,16 @@ import {
 } from "./config";
 import { getRules, matchRule } from "./libs";
 import { getSetting } from "./libs";
-import { fetchUpdate } from "./libs/fetch";
 import { Translator } from "./libs/translator";
 
 /**
  * 入口函数
  */
 (async () => {
-  const { fetchInterval, fetchLimit } = await getSetting();
-  fetchUpdate(fetchInterval, fetchLimit);
-
+  const setting = await getSetting();
   const rules = await getRules();
   const rule = matchRule(rules, document.location.href);
-  const translator = new Translator(rule);
+  const translator = new Translator(rule, setting);
 
   // 监听消息
   browser?.runtime.onMessage.addListener(async ({ action, args }) => {
diff --git a/src/libs/translator.js b/src/libs/translator.js
index a89b8f0..8554d49 100644
--- a/src/libs/translator.js
+++ b/src/libs/translator.js
@@ -9,6 +9,7 @@ import {
 import { StoragesProvider } from "../hooks/Storage";
 import { queryEls } from ".";
 import Content from "../views/Content";
+import { fetchUpdate } from "./fetch";
 
 /**
  * 翻译类
@@ -44,7 +45,8 @@ export class Translator {
     });
   });
 
-  constructor(rule) {
+  constructor(rule, { fetchInterval, fetchLimit }) {
+    fetchUpdate(fetchInterval, fetchLimit);
     this.rule = rule;
     if (rule.transOpen === "true") {
       this._register();
diff --git a/src/userscript.js b/src/userscript.js
index cf6de63..35f2e53 100644
--- a/src/userscript.js
+++ b/src/userscript.js
@@ -3,7 +3,6 @@ import ReactDOM from "react-dom/client";
 import Action from "./views/Action";
 import createCache from "@emotion/cache";
 import { CacheProvider } from "@emotion/react";
-import { fetchUpdate } from "./libs/fetch";
 import { getRules, matchRule } from "./libs";
 import { getSetting } from "./libs";
 import { Translator } from "./libs/translator";
@@ -33,11 +32,10 @@ import { Translator } from "./libs/translator";
   }
 
   // 翻译页面
-  const { fetchInterval, fetchLimit } = await getSetting();
-  fetchUpdate(fetchInterval, fetchLimit);
+  const setting = await getSetting();
   const rules = await getRules();
   const rule = matchRule(rules, document.location.href);
-  const translator = new Translator(rule);
+  const translator = new Translator(rule, setting);
 
   // 浮球按钮
   const $action = document.createElement("div");