2 files changed, 47 insertions, 50 deletions

diff --git a/ATRI/plugins/util/__init__.py b/ATRI/plugins/util/__init__.py
index 19fdcaf..26ef570 100644
--- a/ATRI/plugins/util/__init__.py
+++ b/ATRI/plugins/util/__init__.py
@@ -3,13 +3,18 @@ from random import choice, random
 
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg, ArgPlainText
-from nonebot.adapters.onebot.v11 import MessageEvent, Message
+from nonebot.adapters.onebot.v11 import Message
 from nonebot.adapters.onebot.v11.helpers import Cooldown
 
-from .data_source import Encrypt, Utils, Yinglish
+from ATRI.service import Service
 
+from .data_source import Encrypt, Yinglish, roll_dice
 
-roll = Utils().on_command("/roll", "骰子~用法：1d10 或 2d10+2d10+more")
+
+utils = Service("小工具").document("非常实用(?)的工具们!")
+
+
+roll = utils.on_command("/roll", "骰子~用法: 1d10 或 2d10+2d10+more")
 
 
 @roll.handle()
@@ -19,18 +24,18 @@ async def _ready_roll(matcher: Matcher, args: Message = CommandArg()):
         matcher.set_arg("roll", args)
 
 
[email protected]("roll", "参数呢？！格式：1d10 或 2d10+2d10+more")
[email protected]("roll", "参数呢?! 格式: 1d10 或 2d10+2d10+more")
 async def _deal_roll(roll_msg: str = ArgPlainText("roll")):
     match = re.match(r"^([\dd+\s]+?)$", roll_msg)
 
     if not match:
-        await roll.finish("阿——！参数不对！格式：1d10 或 2d10+2d10+more")
+        await roll.finish("阿——! 参数不对! 格式: 1d10 或 2d10+2d10+more")
 
-    msg = Utils().roll_dice(roll_msg)
+    msg = roll_dice(roll_msg)
     await roll.finish(msg)
 
 
-encrypt_en = Utils().on_command("加密", "我们之间的秘密❤")
+encrypt_en = utils.on_command("加密", "我们之间的秘密❤")
 
 
 @encrypt_en.handle()
@@ -50,7 +55,7 @@ async def _deal_en(text: str = ArgPlainText("encr_en_text")):
     await encrypt_en.finish(result)
 
 
-encrypt_de = Utils().on_command("解密", "解开我们的秘密❤")
+encrypt_de = utils.on_command("解密", "解开我们的秘密❤")
 
 
 @encrypt_de.handle()
@@ -67,7 +72,7 @@ async def _deal_de(text: str = ArgPlainText("encr_de_text")):
     await encrypt_de.finish(result)
 
 
-sepi = Utils().on_command("涩批一下", "将正常的句子涩一涩~")
+sepi = utils.on_command("涩批一下", "将正常的句子涩一涩~")
 
 
 _sepi_flmt_notice = choice(["涩批爬", "✌🥵✌"])
@@ -81,10 +86,9 @@ async def _ready_sepi(matcher: Matcher, args: Message = CommandArg()):
 
 
 @sepi.got("sepi_text", "内容呢？！")
-async def _deal_sepi(event: MessageEvent, msg: str = ArgPlainText("sepi_text")):
-    user_id = event.get_user_id()
+async def _deal_sepi(msg: str = ArgPlainText("sepi_text")):
     if len(msg) < 4:
         await sepi.finish("这么短？涩不起来！")
 
-    result = Yinglish.deal(msg, random())
+    result = Yinglish(msg).deal(random())
     await sepi.finish(result)
diff --git a/ATRI/plugins/util/data_source.py b/ATRI/plugins/util/data_source.py
index 4a73c26..5245518 100644
--- a/ATRI/plugins/util/data_source.py
+++ b/ATRI/plugins/util/data_source.py
@@ -4,48 +4,40 @@ import jieba.posseg as pseg
 from typing import Union, Optional
 from random import random, choice, randint
 
-from ATRI.service import Service
-from ATRI.rule import is_in_service
 
+def roll_dice(par: str) -> str:
+    result = 0
+    proc = ""
+    proc_list = []
+    p = par.split("+")
 
-class Utils(Service):
-    def __init__(self):
-        Service.__init__(self, "小工具", "非常实用（？）的工具们！", rule=is_in_service("小工具"))
+    for i in p:
+        args = re.findall(r"(\d{0,10})(?:(d)(\d{1,10}))", i)
+        args = list(args[0])
 
-    @staticmethod
-    def roll_dice(par: str) -> str:
-        result = 0
-        proc = ""
-        proc_list = []
-        p = par.split("+")
+        args[0] = args[0] or 1
+        if int(args[0]) >= 5000 or int(args[2]) >= 5000:
+            return "阿...好大......"
 
-        for i in p:
-            args = re.findall(r"(\d{0,10})(?:(d)(\d{1,10}))", i)
-            args = list(args[0])
+        for a in range(1, int(args[0]) + 1):
+            rd = randint(1, int(args[2]))
+            result = result + rd
 
-            args[0] = args[0] or 1
-            if int(args[0]) >= 5000 or int(args[2]) >= 5000:
-                return "阿...好大......"
+            if len(proc_list) <= 10:
+                proc_list.append(rd)
 
-            for a in range(1, int(args[0]) + 1):
-                rd = randint(1, int(args[2]))
-                result = result + rd
+    if len(proc_list) <= 10:
+        proc += "+".join(map(str, proc_list))
+    elif len(proc_list) > 10:
+        proc += "太长了不展示了就酱w"
+    else:
+        proc += str(result)
 
-                if len(proc_list) <= 10:
-                    proc_list.append(rd)
+    result = f"{par}=({proc})={result}"
+    return result
 
-        if len(proc_list) <= 10:
-            proc += "+".join(map(str, proc_list))
-        elif len(proc_list) > 10:
-            proc += "太长了不展示了就酱w"
-        else:
-            proc += str(result)
-
-        result = f"{par}=({proc})={result}"
-        return result
 
-
-class Encrypt(Utils):
+class Encrypt:
     """
     某nb改的（逃
     总之就是非常nb
@@ -183,8 +175,10 @@ class Encrypt(Utils):
             raise ValueError("Decoding failed")
 
 
-class Yinglish(Utils):
-    @staticmethod
+class Yinglish:
+    def __init__(self, context: str):
+        self.context = context
+
     def _to_ying(x, y, ying) -> str:
         if random() > ying:
             return x
@@ -208,6 +202,5 @@ class Yinglish(Utils):
                 x = "〇" * len(x)
             return str(choice([f"...{x}", f"....{x}", f".....{x}", f"......{x}"]))
 
-    @classmethod
-    def deal(cls, text, ying: Optional[float] = 0.5) -> str:
-        return "".join([cls._to_ying(x, y, ying) for x, y in pseg.cut(text)])
+    def deal(self, ying: Optional[float] = 0.5) -> str:
+        return "".join([self._to_ying(x, y, ying) for x, y in pseg.cut(self.context)])