From be2747e4d4b820ca0f1f988d3b77a628da26fe7b Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Thu, 8 Jul 2021 22:09:00 +0800 Subject: =?UTF-8?q?=F0=9F=94=96=E2=99=BB=EF=B8=8F=F0=9F=90=9B=F0=9F=94=A7?= =?UTF-8?q?=F0=9F=94=A5=F0=9F=93=9D=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=9AYHN-001-A03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔖 更新版本至：YHN-001-A03 ✨ 新增插件： - 涩图 - 闲聊（文爱 ♻️ 重构： - Service - 所有插件 🐛 修复部分小bug 🔧 暂时移除部分设置 🔥 删除： - 插件：nsfw、wife。日后加回 - 插件 essential 中部分内容 📝 更新README --- ATRI/rule.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'ATRI/rule.py') 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 -- cgit v1.2.3