1 files changed, 14 insertions, 14 deletions
diff --git a/ATRI/rule.py b/ATRI/rule.py
index 907a65d..3d75f84 100644
--- a/ATRI/rule.py
+++ b/ATRI/rule.py
@@ -1,17 +1,24 @@
+from nonebot.adapters.cqhttp.event import PrivateMessageEvent
 from nonebot.rule import Rule
-from nonebot.adapters.cqhttp import GroupMessageEvent, PokeNotifyEvent
+from nonebot.adapters.cqhttp import MessageEvent, GroupMessageEvent
 
-from .service import Service as sv
+from .service import ServiceTools
 
 
 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, user, str(event.group_id))
+        if isinstance(event, PrivateMessageEvent):
+            user_id = event.get_user_id()
+            result = ServiceTools().auth_service(service, user_id)
+            return result
+        elif isinstance(event, GroupMessageEvent):
+            user_id = event.get_event_name()
+            group_id = str(event.group_id)
+            result = ServiceTools().auth_service(service, user_id, group_id)
+            return result
         else:
-            return sv.auth_service(service, user, None)
-
+            return True
+    
     return Rule(_is_in_service)
 
 
@@ -20,10 +27,3 @@ def to_bot() -> Rule:
         return event.is_tome()
 
     return Rule(_to_bot)
-
-
-def poke(bot, event: PokeNotifyEvent, state):
-    if event.is_tome():
-        return True
-    else:
-        return False