♻️ 跟进 service 的变化

2 files changed, 8 insertions, 10 deletions

diff --git a/ATRI/plugins/kimo/__init__.py b/ATRI/plugins/kimo/__init__.py
index aedf36b..ef9e073 100644
--- a/ATRI/plugins/kimo/__init__.py
+++ b/ATRI/plugins/kimo/__init__.py
@@ -5,14 +5,19 @@ from nonebot.params import ArgPlainText, CommandArg
 from nonebot.adapters.onebot.v11 import MessageEvent, Message
 from nonebot.adapters.onebot.v11.helpers import Cooldown
 
+from ATRI.service import Service
+from ATRI.rule import to_bot
 from ATRI.utils.apscheduler import scheduler
+
 from .data_source import Kimo
 
 
+plugin = Service("kimo").document("好像有点涩?").rule(to_bot()).priority(5)
+
 _chat_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~", "我开始为你以后的伴侣担心了..."])
 
 
-kimo = Kimo().on_message("文爱", "闲聊（文爱", priority=10, block=False)
+kimo = plugin.on_message("文爱", "闲聊（文爱", priority=10, block=False)
 
 
 @kimo.handle([Cooldown(3, prompt=_chat_flmt_notice)])
@@ -27,7 +32,7 @@ async def _chat(event: MessageEvent):
         return
 
 
-my_name_is = Kimo().on_command("叫我", "更改kimo时的称呼", aliases={"我是"}, priority=1)
+my_name_is = plugin.on_command("叫我", "更改kimo时的称呼", aliases={"我是"}, priority=1)
 
 
 @my_name_is.handle([Cooldown(3, prompt=_chat_flmt_notice)])
diff --git a/ATRI/plugins/kimo/data_source.py b/ATRI/plugins/kimo/data_source.py
index 3e4f56b..26272e5 100644
--- a/ATRI/plugins/kimo/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -3,8 +3,6 @@ from pathlib import Path
 from jieba import posseg
 from random import choice, shuffle
 
-from ATRI.service import Service
-from ATRI.rule import to_bot, is_in_service
 from ATRI.log import log
 from ATRI.utils import request
 from ATRI.exceptions import ReadFileError, WriteFileError
@@ -15,12 +13,7 @@ CHAT_PATH.mkdir(parents=True, exist_ok=True)
 KIMO_URL = "https://jsd.imki.moe/gh/Kyomotoi/AnimeThesaurus/data.json"
 
 
-class Kimo(Service):
-    def __init__(self):
-        Service.__init__(
-            self, "kimo", "好像有点涩？", rule=to_bot() & is_in_service("kimo"), priority=5
-        )
-
+class Kimo:
     @staticmethod
     async def _request(url: str) -> dict:
         res = await request.get(url)