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/rule.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'ATRI/rule.py')

diff --git a/ATRI/rule.py b/ATRI/rule.py
index 109d644..00a4c21 100644
--- a/ATRI/rule.py
+++ b/ATRI/rule.py
@@ -1,34 +1,20 @@
 from nonebot.rule import Rule
 from nonebot.adapters.cqhttp import GroupMessageEvent, PokeNotifyEvent
 
-from .config import config
 from .service import Service as sv
 
 
 def is_in_service(service: str) -> Rule:
     async def _is_in_service(bot, event, state) -> bool:
+        user = str(event.user_id)
         if isinstance(event, GroupMessageEvent):
-            return sv.auth_service(service, event.group_id)
+            return sv.auth_service(service, user, str(event.group_id))
         else:
-            return sv.auth_service(service, None)
+            return sv.auth_service(service, user, None)
     
     return Rule(_is_in_service)
 
 
-def is_block() -> Rule:
-    async def _is_in_banlist(bot, event, state) -> bool:
-        return sv.BlockSystem.auth_user(int(event.get_user_id()))
-    
-    return Rule(_is_in_banlist)
-
-
-def is_in_dormant() -> Rule:
-    async def _is_in_dormant(bot, event, state) -> bool:
-        return sv.Dormant.is_dormant()
-    
-    return Rule(_is_in_dormant)
-
-
 def to_bot() -> Rule:
     async def _to_bot(bot, event, state) -> bool:
         return event.is_tome()
-- 
cgit v1.2.3