🚚 插件 重命名为

4 files changed, 56 insertions, 112 deletions

diff --git a/ATRI/plugins/chat/__init__.py b/ATRI/plugins/kimo/__init__.py
index 3cb5dbb..b1c5698 100644
--- a/ATRI/plugins/chat/__init__.py
+++ b/ATRI/plugins/kimo/__init__.py
@@ -6,27 +6,27 @@ from nonebot.adapters.onebot.v11 import MessageEvent, Message
 from nonebot.adapters.onebot.v11.helpers import Cooldown
 
 from ATRI.utils.apscheduler import scheduler
-from .data_source import Chat
+from .data_source import Kimo
 
 
 _chat_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~", "我开始为你以后的伴侣担心了..."])
 
 
-chat = Chat().on_message("文爱", "闲聊（文爱")
+kimo = Kimo().on_message("文爱", "闲聊（文爱")
 
 
[email protected]([Cooldown(3, prompt=_chat_flmt_notice)])
[email protected]([Cooldown(3, prompt=_chat_flmt_notice)])
 async def _chat(event: MessageEvent):
     user_id = event.get_user_id()
     msg = str(event.message)
-    repo = await Chat().deal(msg, user_id)
+    repo = await Kimo().deal(msg, user_id)
     try:
-        await chat.finish(repo)
+        await kimo.finish(repo)
     except Exception:
         return
 
 
-my_name_is = Chat().on_command("叫我", "更改闲聊（文爱）时的称呼", aliases={"我是"}, priority=1)
+my_name_is = Kimo().on_command("叫我", "更改kimo时的称呼", aliases={"我是"}, priority=1)
 
 
 @my_name_is.handle([Cooldown(3, prompt=_chat_flmt_notice)])
@@ -47,28 +47,13 @@ async def _deal_name(event: MessageEvent, new_name: str = ArgPlainText("name")):
             "很不错的称呼呢w",
         ]
     )
-    Chat().name_is(user_id, new_name)
+    Kimo().name_is(user_id, new_name)
     await my_name_is.finish(repo)
 
 
-say = Chat().on_command("说", "别人让我说啥就说啥（", priority=1)
-
-
[email protected]([Cooldown(3, prompt=_chat_flmt_notice)])
-async def _ready_say(matcher: Matcher, args: Message = CommandArg()):
-    msg = args.extract_plain_text()
-    if msg:
-        matcher.set_arg("say", args)
-
-
[email protected]("say", "想要咱复读啥呢...")
-async def _deal_say(msg: str = ArgPlainText("say")):
-    await say.finish(msg)
-
-
[email protected]_job("interval", name="闲聊词库检查更新", hours=3, misfire_grace_time=60)  # type: ignore
[email protected]_job("interval", name="kimo词库检查更新", hours=3, misfire_grace_time=60)  # type: ignore
 async def _check_kimo():
     try:
-        await Chat().update_data()
+        await Kimo().update_data()
     except BaseException:
         pass
diff --git a/ATRI/plugins/chat/data_source.py b/ATRI/plugins/kimo/data_source.py
index 70c6345..6dd448a 100644
--- a/ATRI/plugins/chat/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -11,15 +11,15 @@ from ATRI.utils import request
 from ATRI.exceptions import ReadFileError, WriteError
 
 
-CHAT_PATH = Path(".") / "data" / "database" / "chat"
+CHAT_PATH = Path(".") / "data" / "database" / "kimo"
 os.makedirs(CHAT_PATH, exist_ok=True)
 KIMO_URL = "https://cdn.jsdelivr.net/gh/Kyomotoi/AnimeThesaurus/data.json"
 
 
-class Chat(Service):
+class Kimo(Service):
     def __init__(self):
         Service.__init__(
-            self, "闲聊", "好像有点涩？", rule=to_bot() & is_in_service("闲聊"), priority=5
+            self, "kimo", "好像有点涩？", rule=to_bot() & is_in_service("kimo"), priority=5
         )
 
     @staticmethod
@@ -69,7 +69,7 @@ class Chat(Service):
 
         with open(path, "w", encoding="utf-8") as w:
             w.write(json.dumps(data, indent=4))
-        log.info("闲聊词库更新完成")
+        log.info("kimo词库更新完成")
 
     @staticmethod
     def name_is(user_id: str, new_name: str):
diff --git a/test/test_plugin_chat.py b/test/test_plugin_chat.py
deleted file mode 100644
index e04f1d3..0000000
--- a/test/test_plugin_chat.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import pytest
-from nonebug import App
-from nonebot.adapters.onebot.v11 import MessageSegment
-
-from .utils import make_fake_message, make_fake_event
-
-
[email protected]
-async def test_chat(app: App):
-    from ATRI.plugins.chat import chat
-
-    Message = make_fake_message()
-
-    async with app.test_matcher(chat) as ctx:
-        bot = ctx.create_bot()
-
-        msg = Message("爱你")
-        event = make_fake_event(_message=msg, _to_me=True)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "是…是嘛(脸红）呐，其实咱也……", True)
-
-
[email protected]
-async def test_my_name_is(app: App):
-    from ATRI.plugins.chat import my_name_is
-
-    Message = make_fake_message()
-
-    async with app.test_matcher(my_name_is) as ctx:
-        bot = ctx.create_bot()
-
-        msg = Message("叫我")
-        event = make_fake_event(_message=msg, _to_me=True)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "欧尼酱想让咱如何称呼呢！0w0", True)
-
-        msg = Message("欧尼酱")
-        event = make_fake_event(_message=msg)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "好~w 那咱以后就称呼你为欧尼酱！", True)
-
-
[email protected]
-async def test_say(app: App):
-    from ATRI.plugins.chat import say
-
-    Message = make_fake_message()
-
-    async with app.test_matcher(say) as ctx:
-        bot = ctx.create_bot()
-
-        msg = Message("说")
-        event = make_fake_event(_message=msg, _to_me=True)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "想要咱复读啥呢...", True)
-
-        msg = Message("nya~")
-        event = make_fake_event(_message=msg)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "nya~", True)
-
-    async with app.test_matcher(say) as ctx:
-        bot = ctx.create_bot()
-
-        msg = Message("说")
-        event = make_fake_event(_message=msg, _to_me=True)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "想要咱复读啥呢...", True)
-
-        msg = Message(
-            MessageSegment.image(
-                "https://cdn.jsdelivr.net/gh/Kyomotoi/CDN@master/noting/88674944_p0.png"
-            )
-        )
-        event = make_fake_event(_message=msg, _to_me=True)()
-
-        ctx.receive_event(bot, event)
-        ctx.should_call_send(event, "不要...", True)
diff --git a/test/test_plugin_kimo.py b/test/test_plugin_kimo.py
new file mode 100644
index 0000000..ad6ff0b
--- /dev/null
+++ b/test/test_plugin_kimo.py
@@ -0,0 +1,43 @@
+import pytest
+from nonebug import App
+from nonebot.adapters.onebot.v11 import MessageSegment
+
+from .utils import make_fake_message, make_fake_event
+
+
[email protected]
+async def test_chat(app: App):
+    from ATRI.plugins.kimo import kimo
+
+    Message = make_fake_message()
+
+    async with app.test_matcher(kimo) as ctx:
+        bot = ctx.create_bot()
+
+        msg = Message("爱你")
+        event = make_fake_event(_message=msg, _to_me=True)()
+
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "是…是嘛(脸红）呐，其实咱也……", True)
+
+
[email protected]
+async def test_my_name_is(app: App):
+    from ATRI.plugins.kimo import my_name_is
+
+    Message = make_fake_message()
+
+    async with app.test_matcher(my_name_is) as ctx:
+        bot = ctx.create_bot()
+
+        msg = Message("叫我")
+        event = make_fake_event(_message=msg, _to_me=True)()
+
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "欧尼酱想让咱如何称呼呢！0w0", True)
+
+        msg = Message("欧尼酱")
+        event = make_fake_event(_message=msg)()
+
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "好~w 那咱以后就称呼你为欧尼酱！", True)