From a8afa113cfef80237031916e20df44bc11df2270 Mon Sep 17 00:00:00 2001
From: Kyomotoi <0w0@imki.moe>
Date: Mon, 17 Oct 2022 23:46:00 +0800
Subject: =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E8=B7=9F=E8=BF=9B=20service=20?=
 =?UTF-8?q?=E7=9A=84=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ATRI/plugins/funny/__init__.py    | 13 +++++++++----
 ATRI/plugins/funny/data_source.py |  7 +------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ATRI/plugins/funny')

diff --git a/ATRI/plugins/funny/__init__.py b/ATRI/plugins/funny/__init__.py
index 7a0241c..094e569 100644
--- a/ATRI/plugins/funny/__init__.py
+++ b/ATRI/plugins/funny/__init__.py
@@ -5,10 +5,15 @@ from nonebot.params import ArgPlainText, CommandArg
 from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message
 from nonebot.adapters.onebot.v11.helpers import Cooldown
 
+from ATRI.service import Service
+
 from .data_source import Funny
 
 
-get_laugh = Funny().on_command("来句笑话", "隐晦的笑话...")
+plugin = Service("乐").document("乐1乐, 莫当真")
+
+
+get_laugh = plugin.on_command("来句笑话", "隐晦的笑话...")
 
 
 @get_laugh.handle()
@@ -17,7 +22,7 @@ async def _get_laugh(bot: Bot, event: MessageEvent):
     await get_laugh.finish(await Funny().idk_laugh(user_name))
 
 
-me_re_you = Funny().on_regex(r"我", "我也不懂咋解释", block=False)
+me_re_you = plugin.on_regex(r"我", "我也不懂咋解释", block=False)
 
 
 @me_re_you.handle()
@@ -32,7 +37,7 @@ async def _me_re_you(bot: Bot, event: MessageEvent):
 _fake_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~"])
 
 
-fake_msg = Funny().on_command(
+fake_msg = plugin.on_command(
     "/fakemsg", "伪造假转发内容，格式：qq-name-content\n可构造多条，使用空格隔开，仅限群聊"
 )
 
@@ -60,7 +65,7 @@ async def _deal_fake(
         await fake_msg.finish("构造失败惹...可能是被制裁了（")
 
 
-eat_what = Funny().on_regex(r"大?[今明后]天(.*?)吃[什啥]么?", "我来决定你吃什么！")
+eat_what = plugin.on_regex(r"大?[今明后]天(.*?)吃[什啥]么?", "我来决定你吃什么！")
 
 
 @eat_what.handle([Cooldown(15, prompt="慢慢吃，不要贪心哦！")])
diff --git a/ATRI/plugins/funny/data_source.py b/ATRI/plugins/funny/data_source.py
index 18e0503..d3f88cc 100644
--- a/ATRI/plugins/funny/data_source.py
+++ b/ATRI/plugins/funny/data_source.py
@@ -4,22 +4,17 @@ from pathlib import Path
 from random import choice, randint
 from nonebot.adapters.onebot.v11 import unescape
 
-from ATRI.service import Service
 from ATRI.log import log
 from ATRI.exceptions import RequestError
 from ATRI.utils import request
 from ATRI.utils import request, Translate
-from ATRI.rule import is_in_service
 
 
 FUNNY_DIR = Path(".") / "data" / "plugins" / "funny"
 FUNNY_DIR.mkdir(parents=True, exist_ok=True)
 
 
-class Funny(Service):
-    def __init__(self):
-        Service.__init__(self, "乐", "乐1乐，莫当真", rule=is_in_service("乐"))
-
+class Funny:
     @staticmethod
     async def idk_laugh(name: str) -> str:
         laugh_list = list()
-- 
cgit v1.2.3