From da888ff020805a38a17e5f83705aeb42ffa992ba Mon Sep 17 00:00:00 2001 From: Kyomotoi <1172294279@qq.com> Date: Sun, 7 Mar 2021 15:24:17 +0800 Subject: =?UTF-8?q?=E2=99=BB=EF=B8=8F=E2=9A=A1=EF=B8=8F=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=20Service=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/rule.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'ATRI/rule.py') diff --git a/ATRI/rule.py b/ATRI/rule.py index abc90f8..3b9c403 100644 --- a/ATRI/rule.py +++ b/ATRI/rule.py @@ -1,3 +1,19 @@ +#!/usr/bin/env python3 +# -*- coding:utf-8 -*- +''' +File: rule.py +Created Date: 2021-02-03 15:33:57 +Author: Kyomotoi +Email: Kyomotoiowo@gmail.com +License: GPLv3 +Project: https://github.com/Kyomotoi/ATRI +-------- +Last Modified: Sunday, 7th March 2021 2:58:18 pm +Modified By: Kyomotoi (kyomotoiowo@gmail.com) +-------- +Copyright (c) 2021 Kyomotoi +''' + import datetime from random import choice @@ -6,9 +22,7 @@ from nonebot.adapters.cqhttp.event import Event from nonebot.adapters.cqhttp import GroupMessageEvent, PokeNotifyEvent from .config import config -from .service.limit import Limit -from .service.banlist import BanSystem -from .service import Service +from .service import Service as sv from .utils.list import count_list, del_list_aim from .utils.apscheduler import scheduler, DateTrigger @@ -16,22 +30,23 @@ from .utils.apscheduler import scheduler, DateTrigger def is_in_service(service: str) -> Rule: async def _is_in_service(bot, event, state) -> bool: if isinstance(event, GroupMessageEvent): - return await Limit.auth_service(service, event.group_id) - return await Limit.auth_service(service) + return sv.auth_service(service, event.group_id) + else: + return sv.auth_service(service, None) return Rule(_is_in_service) def is_in_banlist() -> Rule: async def _is_in_banlist(bot, event, state) -> bool: - return BanSystem.is_in_list(str(event.get_user_id())) + 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 Service.is_dormant() + return sv.Dormant.is_dormant() return Rule(_is_in_dormant) -- cgit v1.2.3