From cbf4900c5c3b1de65e55ce480d4b453091528e84 Mon Sep 17 00:00:00 2001
From: Kyomotoi <1172294279@qq.com>
Date: Sun, 11 Apr 2021 15:03:35 +0800
Subject: =?UTF-8?q?=F0=9F=9A=80=E2=9C=A8=E2=9A=A1=EF=B8=8F=F0=9F=8E=A8?=
 =?UTF-8?q?=F0=9F=90=9B=20=E6=AD=A3=E5=BC=8F=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ATRI/plugins/curse/__init__.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'ATRI/plugins/curse')

diff --git a/ATRI/plugins/curse/__init__.py b/ATRI/plugins/curse/__init__.py
index 6db80cc..ee4ea58 100644
--- a/ATRI/plugins/curse/__init__.py
+++ b/ATRI/plugins/curse/__init__.py
@@ -1,11 +1,7 @@
 from nonebot.adapters.cqhttp import Bot, MessageEvent
 
 from ATRI.service import Service as sv
-from ATRI.rule import (
-    is_block,
-    is_in_dormant,
-    is_in_service
-)
+from ATRI.rule import is_in_service
 from ATRI.utils.list import count_list, del_list_aim
 from ATRI.utils.request import get_text
 from ATRI.exceptions import RequestTimeOut
@@ -15,20 +11,25 @@ URL = "https://zuanbot.com/api.php?level=min&lang=zh_cn"
 sick_list = []
 
 
-__plugin_name__ = 'curse'
+__doc__ = """
+口臭一下
+权限组：所有人
+用法：
+  口臭，口臭一下，骂我
+"""
 
-curse = sv.on_command(
-    cmd="口臭一下",
-    docs="口臭",
-    aliases={"口臭", "骂我"},
-    rule=is_block() & is_in_dormant()
-    & is_in_service(__plugin_name__)
-)
+curse = sv.on_message(rule=is_in_service('口臭'))
+sv.manual_reg_service('口臭', __doc__)
 
 @curse.handle()
 async def _curse(bot: Bot, event: MessageEvent) -> None:
     global sick_list
+    msg = str(event.message)
     user = event.get_user_id()
+    curse_key = ['口臭', '口臭一下', '骂我']
+    
+    if msg not in curse_key:
+        return 
     
     if count_list(sick_list, user) == 3:
         sick_list.append(user)
-- 
cgit v1.2.3